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

moodle · May 14, 2018 · 3558897 · 3558897
2 parents 62b94b4 + 04b1bea
commit 3558897
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
@@ -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',

diff --git a/theme/boost/classes/output/core_course/management/renderer.php b/theme/boost/classes/output/core_course/management/renderer.php
@@ -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))

diff --git a/theme/boost/classes/output/core_renderer.php b/theme/boost/classes/output/core_renderer.php
@@ -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));