summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-05 07:48:24 +0000
committerPhil Hughes <me@iamphill.com>2017-09-05 07:48:24 +0000
commitd4dd6b08b24a1e3d1e8c12e5eb13701c7832e608 (patch)
treea9610f031db216a11765c2c436d010e8e56a2f11
parent25600b1981a097af0e29afdac31146823a97e6d1 (diff)
parent3c1dfcc0323bac1a932b1a7b3fd5df63c259d5cc (diff)
downloadgitlab-ce-d4dd6b08b24a1e3d1e8c12e5eb13701c7832e608.tar.gz
Merge branch 'winh-issue-form-dropdowns' into 'master'
Make dropdowns on new issue page consistent See merge request !13584
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss2
-rw-r--r--app/assets/stylesheets/pages/issues.scss8
2 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index b1638fe8b61..336ac096d60 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -737,6 +737,8 @@
@mixin new-style-dropdown($selector: '') {
#{$selector}.dropdown-menu,
#{$selector}.dropdown-menu-nav {
+ margin-bottom: 24px;
+
li {
display: block;
padding: 0 1px;
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index 0213e7aa9d9..e8ca5cedaee 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -143,8 +143,12 @@ ul.related-merge-requests > li {
}
}
-.issue-form .select2-container {
- width: 250px !important;
+.issue-form {
+ @include new-style-dropdown;
+
+ .select2-container {
+ width: 250px !important;
+ }
}
.issues-footer {