diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-17 11:28:32 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-17 11:28:32 +0000 |
| commit | 4be30572fe8db43ac67b0e6626f27259cad67c24 (patch) | |
| tree | cc81c168791fe9a96d5ddfca0ed2c4d0c0647ca1 | |
| parent | ad5ce890488edb136bb193eff0ffb9513d4a6798 (diff) | |
| parent | cf95fef198e72fad13297e614a96d9a74bd30b77 (diff) | |
| download | gitlab-ce-4be30572fe8db43ac67b0e6626f27259cad67c24.tar.gz | |
Merge branch '42035-projects-dropdown-scroll' into 'master'
Resolve "Projects dropdown width and height shrinked, causes scrollbars wrapping around"
Closes #42035
See merge request gitlab-org/gitlab-ce!16507
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 1d2303a3a2b..4c6b32630e1 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -30,7 +30,7 @@ @include set-visible; min-height: $dropdown-min-height; max-height: $dropdown-max-height; - overflow: auto; + overflow-y: auto; @media (max-width: $screen-xs-max) { width: 100%; diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 3b7256f3000..634593aefd0 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -303,6 +303,8 @@ .projects-dropdown-menu { padding: 0; + overflow-y: initial; + max-height: initial; } .dropdown-chevron { |