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

Merge branch '42035-projects-dropdown-scroll' into 'master'
4be30572 · Tim Zallmann · ad5ce890 · cf95fef1 · 4be30572 · 4be30572
Commit 4be30572 authored Jan 17, 2018 by Tim Zallmann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

dropdowns.scss app/assets/stylesheets/framework/dropdowns.scss +1 -1

header.scss app/assets/stylesheets/framework/header.scss +2 -0

No files found.
--- 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%;

--- 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 {