diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-04 16:40:22 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-04 16:40:22 +0000 |
| commit | 25911e080c959693ef765cbbfe011d7637a72d87 (patch) | |
| tree | 71cda096ac0d2e2d4f11945ec0a326375cd505f8 | |
| parent | 154a55cfd745a1c2db229458a2fd486651b4fb9b (diff) | |
| parent | a1be8bb8afbe77814888a6c3cba6534b950f51a5 (diff) | |
| download | gitlab-ce-25911e080c959693ef765cbbfe011d7637a72d87.tar.gz | |
Merge branch 'winh-new-dropdown-dividers' into 'master'
Make dividers of new dropdown style full width
Closes #35784
See merge request !13276
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/new_nav.scss | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index bd4bd541c3a..02e0ba74158 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -728,6 +728,10 @@ @mixin new-style-dropdown { .dropdown-menu, .dropdown-menu-nav { + .divider { + margin: 6px 0; + } + li { padding: 0 1px; diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss index 1c4a84de7ec..795ee91af8b 100644 --- a/app/assets/stylesheets/new_nav.scss +++ b/app/assets/stylesheets/new_nav.scss @@ -312,6 +312,10 @@ header.navbar-gitlab-new { // TODO: fallback to global style .dropdown-menu { + .divider { + margin: 6px 0; + } + li { padding: 0 1px; |