diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-05 01:49:36 +0000 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-05 11:54:50 +0200 |
| commit | b8ab159a930958f919938055b1dd46147610b79b (patch) | |
| tree | d9d7cb8fd016c9e66e0a9df47f266c2d5ec8b6fb | |
| parent | aac3b46444ce5c9b1efa61f390d37ec1dc865313 (diff) | |
| download | gitlab-ce-b8ab159a930958f919938055b1dd46147610b79b.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; |