summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-05 13:53:57 +0000
committerPhil Hughes <me@iamphill.com>2017-09-05 13:53:57 +0000
commitd316a8c0b39652d6053238d6a14983c51714faa0 (patch)
tree8797df0128020bf07ae9cd27e0ebbcf9af5a73de /app
parent6bd1f234595d18f21d05d4de2fcd1cf06aae5042 (diff)
parent396e262c428c87906f298ca1aae71c4952b6bb95 (diff)
downloadgitlab-ce-d316a8c0b39652d6053238d6a14983c51714faa0.tar.gz
Merge branch 'winh-admin-group-role-dropdown' into 'master'
Make role dropdown on group admin area consistent See merge request !14049
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/selects.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss
index e4f82fe091a..9acdf8730af 100644
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -272,6 +272,7 @@ body[data-page="projects:new"] #select2-drop,
body[data-page="projects:merge_requests:edit"] #select2-drop,
body[data-page="projects:blob:new"] #select2-drop,
body[data-page="profiles:show"] #select2-drop,
+body[data-page="admin:groups:show"] #select2-drop,
body[data-page="projects:issues:show"] #select2-drop,
body[data-page="projects:blob:edit"] #select2-drop {
&.select2-drop {