Merge branch 'MDL-62807-master' of git://github.com/damyon/moodle

course/ajax/management.php

@@ -156,4 +156,4 @@ echo $OUTPUT->footer();
 // Thats all folks.
 // Don't ever even consider putting anything after this. It just wouldn't make sense.
 // But you already knew that, you smart developer you.
-exit;
+exit;

course/classes/management_renderer.php

@@ -247,8 +247,7 @@ class core_course_management_renderer extends plugin_renderer_base {
                 'i/empty',
                 '',
                 'moodle',
-                array('class' => 'tree-icon', 'title' => get_string('showcategory', 'moodle', $text))
-            );
+                array('class' => 'tree-icon'));
             $icon = html_writer::span($icon, 'float-left');
         }
         $actions = \core_course\management\helper::get_category_listitem_actions($category);
@@ -288,7 +287,7 @@ class core_course_management_renderer extends plugin_renderer_base {
         $html .= html_writer::end_div();
         if ($isexpanded) {
             $html .= html_writer::start_tag('ul',
-                array('class' => 'ml-1', 'role' => 'group', 'id' => 'subcategoryof'.$category->id));
+                array('class' => 'ml', 'role' => 'group', 'id' => 'subcategoryof'.$category->id));
             $catatlevel = \core_course\management\helper::get_expanded_categories($category->path);
             $catatlevel[] = array_shift($selectedcategories);
             $catatlevel = array_unique($catatlevel);

theme/boost/classes/output/core_course/management/renderer.php

@@ -317,8 +317,7 @@ class renderer extends \core_course_management_renderer {
                 'i/empty',
                 '',
                 'moodle',
-                array('class' => 'tree-icon', 'title' => get_string('showcategory', 'moodle', $text))
-            );
+                array('class' => 'tree-icon'));
             $icon = html_writer::span($icon, 'float-left');
         }
         $actions = \core_course\management\helper::get_category_listitem_actions($category);

theme/bootstrapbase/less/moodle/core.less

@@ -118,6 +118,8 @@ a.dimmed_text:visited,
 }
 .unlist,
 .unlist li,
+.list-unstyled,
+.list-unstyled li,
 .inline-list,
 .inline-list li,
 .block .list,

theme/bootstrapbase/style/moodle.css

@@ -2420,6 +2420,8 @@ a.dimmed_text:visited,
 }
 .unlist,
 .unlist li,
+.list-unstyled,
+.list-unstyled li,
 .inline-list,
 .inline-list li,
 .block .list,