Merge branch 'wip-MDL-40974-m26' of git://github.com/samhemelryk/moodle

diff --git a/course/lib.php b/course/lib.php
index e3f02be..c85ee00 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1951,7 +1951,7 @@ function course_get_cm_edit_actions(cm_info $mod, $indent = -1, $sr = null) {
                 array('class' => 'editing_'. $actionname, 'data-action' => $actionname, 'data-nextgroupmode' => $nextgroupmode)
             );
         } else {
-            $actions[$actionname] = new pix_icon($groupimage, $forcedgrouptitle, 'moodle', array('title' => '', 'class' => 'iconsmall'));
+            $actions[$actionname] = new pix_icon($groupimage, $forcedgrouptitle, 'moodle', array('class' => 'iconsmall'));
         }
     }
 

diff --git a/theme/base/style/course.css b/theme/base/style/course.css
index 1435b42..61b66e3 100644 (file)
--- a/theme/base/style/course.css
+++ b/theme/base/style/course.css
@@ -29,6 +29,7 @@
 .sitetopic .section .activity .commands,
 .course-content .section .activity .commands { white-space: nowrap; display: inline-block; }
 .section .activity .moodle-actionmenu .menubar > li > * {display:inline-block;min-height:16px;padding: 0.2em;}
+.section .activity .moodle-actionmenu .menubar > li > img {margin: 0.2em;vertical-align: text-bottom;padding:0 3px 0 0;}
 .section .activity .moodle-actionmenu .iconsmall {vertical-align: baseline;width:16px;height:16px;}
 
 .sitetopic .section li.activity,