diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-10 18:23:39 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-10 18:23:39 +0000 |
| commit | fe11c5fde7c0c748eb370f09715114fd5a7d8577 (patch) | |
| tree | b1023846d74ed22d9e0d3c71e743a96ce37ecde5 | |
| parent | b90a9cff9e8a9a7988ad066d4d2cce9d4cce3323 (diff) | |
| parent | ad80db9799a65814be836aaa4b219b87d93aa433 (diff) | |
| download | gitlab-ce-fe11c5fde7c0c748eb370f09715114fd5a7d8577.tar.gz | |
Merge branch 'fix-dropdown' into 'master'
Remove not selector increasing specificity of rules
Closes #38958
See merge request gitlab-org/gitlab-ce!14789
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 5b950ae0ba0..9dcf332eee2 100644 --- 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; diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 22945e935ef..d79444fad79 100644 --- 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 { |