Merge branch 'fix-dropdown' into 'master'

Remove not selector increasing specificity of rules Closes #38958 See merge request gitlab-org/gitlab-ce!14789

Merge branch 'fix-dropdown' into 'master'
fe11c5fd · Annabel Dunstone Gray · b90a9cff · ad80db97 · fe11c5fd · fe11c5fd
Commit fe11c5fd authored Oct 10, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

dropdowns.scss app/assets/stylesheets/framework/dropdowns.scss +1 -1

header.scss app/assets/stylesheets/framework/header.scss +2 -1

No files found.
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -749,7 +749,7 @@
      margin-bottom: $dropdown-vertical-offset;
    }

-    li:not(.dropdown-bold-header) {
+    li {
      display: block;
      padding: 0 1px;


--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -161,9 +161,10 @@
    }
  }

-  .dropdown-bold-header {
+  li.dropdown-bold-header {
    color: $gl-text-color-secondary;
    font-size: 12px;
+    padding: 0 16px;
  }

  .navbar-collapse {