diff options
author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-05 01:49:36 +0000 |
---|---|---|
committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-05 01:49:36 +0000 |
commit | f2560340fd23d59ec7414dcf699a0b479e1d0a76 (patch) | |
tree | 1980ea38646352de7f5235a41980005d074becf9 | |
parent | 6db04d49dd3033e93b14c10f20d75205274deec4 (diff) | |
parent | 2f29b31d7d2808c2e76593cb1143ed8173bec5c7 (diff) | |
download | gitlab-ce-f2560340fd23d59ec7414dcf699a0b479e1d0a76.tar.gz |
Merge branch '47158-bs4-nav-projects-dropdown-overflow' into 'master'
Resolve "Projects \/ menu displays scrolls bar for short period of time"
Closes #47158
See merge request gitlab-org/gitlab-ce!19404
-rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/header.scss | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index b91d579cae6..74475daae14 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -35,6 +35,12 @@ @include media-breakpoint-down(xs) { width: 100%; } + + &.projects-dropdown-menu { + padding: 0; + overflow-y: initial; + max-height: initial; + } } .dropdown-toggle, diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 2085e5646ef..094134b63b0 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -297,12 +297,6 @@ display: flex; margin: 0 0 0 6px; - .projects-dropdown-menu { - padding: 0; - overflow-y: initial; - max-height: initial; - } - .dropdown-chevron { position: relative; top: -1px; |