summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-16 15:07:42 -0700
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-01-16 15:07:42 -0700
commitcf95fef198e72fad13297e614a96d9a74bd30b77 (patch)
tree4c4bae39ed1473b4e7fe607a9bf8a39bfebf8cf1
parentf17d7a4beef61d0156865f1a9070fb53c8f05c99 (diff)
downloadgitlab-ce-42035-projects-dropdown-scroll.tar.gz
Restore custom height for projects dropdown42035-projects-dropdown-scroll
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss2
-rw-r--r--app/assets/stylesheets/framework/header.scss2
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 {