Merge branch '39582-nestingdepth-6' into 'master'

Enable NestingDepth (level 6) on scss-lint

Closes #39582

See merge request gitlab-org/gitlab-ce!15073

.scss-lint.yml

@@ -121,7 +121,8 @@ linters:
 
   # Avoid nesting selectors too deeply.
   NestingDepth:
-    enabled: false
+    enabled: true
+    max_depth: 6
 
   # Always use placeholder selectors in @extend.
   PlaceholderInExtend:

app/assets/stylesheets/framework/gitlab-theme.scss

@@ -216,15 +216,12 @@ body {
             color: $theme-gray-900;
           }
 
-          &.active > a {
-            color: $white-light;
-
-            &:hover {
+          &.active > a,
+          &.active > a:hover {
             color: $white-light;
           }
         }
       }
-      }
 
       .container-fluid {
         .navbar-toggle,

app/assets/stylesheets/framework/header.scss

@@ -239,13 +239,11 @@
             fill: currentColor;
           }
 
-          &.header-user-dropdown-toggle {
-            .header-user-avatar {
+          &.header-user-dropdown-toggle .header-user-avatar {
             border-color: $white-light;
           }
         }
       }
-      }
 
       .header-new-dropdown-toggle {
         margin-right: 0;

app/assets/stylesheets/pages/notes.scss

@@ -269,7 +269,7 @@ ul.notes {
           display: none;
         }
 
-        &.system-note-commit-list {
+        &.system-note-commit-list:not(.hide-shade) {
           max-height: 70px;
           overflow: hidden;
           display: block;
@@ -291,16 +291,6 @@ ul.notes {
             bottom: 0;
             background: linear-gradient(rgba($white-light, 0.1) -100px, $white-light 100%);
           }
-
-          &.hide-shade {
-            max-height: 100%;
-            overflow: auto;
-
-            &::after {
-              display: none;
-              background: transparent;
-            }
-          }
         }
       }
     }

changelogs/unreleased/39582-nestingdepth-6.yml

+---
+title: Enable NestingDepth (level 6) on scss-lint
+merge_request: 15073
+author: Takuya Noguchi
+type: other