Permalink
Browse files

Merge branch 'MDL-62365-master' of git://github.com/bmbrands/moodle

  • Loading branch information...
dmonllao committed May 14, 2018
2 parents 62b94b4 + 04b1bea commit 3558897fc3f46ef448171c80c3ba1b4f320abb01
@@ -255,7 +255,7 @@ public function get_core_icon_map() {
'core:i/mnethost' => 'fa-external-link',
'core:i/moodle_host' => 'fa-graduation-cap',
'core:i/move_2d' => 'fa-arrows',
'core:i/navigationitem' => 'fa-circle-thin',
'core:i/navigationitem' => 'fa-fw',
'core:i/ne_red_mark' => 'fa-remove',
'core:i/new' => 'fa-bolt',
'core:i/news' => 'fa-newspaper-o',
@@ -314,7 +314,7 @@ public function category_listitem(coursecat $category, array $subcategories, $to
);
} else {
$icon = $this->output->pix_icon(
'i/navigationitem',
'i/empty',
'',
'moodle',
array('class' => 'tree-icon', 'title' => get_string('showcategory', 'moodle', $text))
@@ -678,7 +678,7 @@ protected function build_action_menu_from_navigation(action_menu $menu,
$link = new action_link(new moodle_url('#'), $menuitem->text, null, ['disabled' => true], $menuitem->icon);
}
if ($indent) {
$link->add_class('ml-2');
$link->add_class('ml-4');
}
if (!empty($menuitem->classes)) {
$link->add_class(implode(" ", $menuitem->classes));

0 comments on commit 3558897

Please sign in to comment.