summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwinh <winnie@gitlab.com>2017-08-16 15:12:15 +0200
committerwinh <winnie@gitlab.com>2017-08-30 12:12:23 +0200
commit76441216af5c86846d79a2313b4b44c126ac6374 (patch)
tree6517d5ea35b672f88efa2bb744860d78eab7bed8
parent499b640679c0dca5b5d93da945da0ca26db8e58e (diff)
downloadgitlab-ce-winh-member-permission-dropdown.tar.gz
Make member permission dropdowns consistentwinh-member-permission-dropdown
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss1
-rw-r--r--app/assets/stylesheets/pages/members.scss8
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index a45d5a6dca0..35f6b0bc991 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -729,6 +729,7 @@
#{$selector}.dropdown-menu,
#{$selector}.dropdown-menu-nav {
li {
+ display: block;
padding: 0 1px;
&:hover {
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index 3fb02e9964f..b3bab082a35 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -55,6 +55,10 @@
display: -webkit-flex;
display: flex;
}
+
+ .dropdown-menu.dropdown-menu-align-right {
+ margin-top: -2px;
+ }
}
.form-horizontal {
@@ -306,3 +310,7 @@
}
}
}
+
+.member-form-control {
+ @include new-style-dropdown;
+}