Merge branch 'MDL-42858' of git://github.com/rwijaya/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css

course/classes/management/helper.php

@@ -622,10 +622,6 @@ class helper {
         if (!$category->can_change_visibility()) {
             throw new \moodle_exception('permissiondenied', 'error', '', null, 'coursecat::can_change_visbility');
         }
-        if ((int)$category->get_parent_coursecat()->visible === 0) {
-            // You cannot mark a category visible if its parent is hidden.
-            return false;
-        }
         $category->show();
         return true;
     }

theme/base/style/course.css

@@ -461,14 +461,11 @@ input.titleeditor { vertical-align: text-bottom; }
 .dir-rtl #course-category-listings .listitem > div > .float-right {float:left;text-align:left;}
 
 #course-category-listings .listitem[data-visible="0"],
-#course-category-listings .listitem[data-visible="0"] a.categoryname,
 #course-category-listings .listitem[data-visible="0"] > div > a {color:#AAA;}
 #course-category-listings .listitem > div .item-actions .action-hide,
 #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-show {display:inline;}
 #course-category-listings .listitem > div .item-actions .action-show,
 #course-category-listings .listitem[data-visible="0"] > div .item-actions .action-hide,
-#course-category-listings .listitem[data-visible="0"] > ul .item-actions.category-item-actions .action-hide,
-#course-category-listings .listitem[data-visible="0"] > ul .item-actions.category-item-actions .action-show,
 
 #category-listing .listitem:first-child > div .item-actions .action-moveup,
 #category-listing .listitem:last-child > div .item-actions .action-movedown,

theme/bootstrapbase/less/moodle/course.less

@@ -978,9 +978,6 @@ span.editinstructions {
         // The category or course is hidden.
         &[data-visible="0"] {
             .muted;
-            a.categoryname {
-                .muted;
-            }
             > div {
                 > a {
                     .muted;
@@ -994,13 +991,6 @@ span.editinstructions {
                     }
                 }
             }
-            > ul .item-actions.category-item-actions {
-                // If the category is hidden hide both show and hide icons for sub categories.
-                .action-hide,
-                .action-show {
-                    display: none;
-                }
-            }
         }
         &.highlight {
             background-color:transparent;