summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Tang <dtang@gitlab.com>2018-03-12 15:22:30 +0100
committerDennis Tang <dtang@gitlab.com>2018-03-12 15:22:30 +0100
commit76372bfeafe8bbdd8fcdd05be400614837692a25 (patch)
tree6a660b7247bc97ac26085d0af9e1c4a14d8d35a3
parent20f4cc7dc67ef9f8308490c560c3df1f72dae927 (diff)
parent348929764844c37e636d9ddeec8d5ad34eaee71a (diff)
downloadgitlab-ce-43273-fix-double-scrollbar-dropdowns.tar.gz
Merge branch '43273-fix-double-scrollbar-dropdowns' of gitlab.com:gitlab-org/gitlab-ce into 43273-fix-double-scrollbar-dropdowns43273-fix-double-scrollbar-dropdowns
-rw-r--r--app/assets/stylesheets/pages/labels.scss6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index f13ed3326fb..b0852adb459 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -26,6 +26,12 @@
}
}
+.dropdown-menu-labels {
+ .dropdown-content {
+ max-height: 135px;
+ }
+}
+
.dropdown-new-label {
.dropdown-content {
max-height: 136px;