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

This commit is contained in:
Dan Poltawski
2013-08-20 15:13:02 +08:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -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'));
}
}
+1
View File
@@ -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,