summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-29 14:21:43 +0000
committerPhil Hughes <me@iamphill.com>2017-08-29 14:21:43 +0000
commit2a8dec2c27726cd0af995de97e596eab78e6efbf (patch)
treebfe83d9a13c23d6259c39db24440debb701f279d
parent0ed5ee33c1ff8dcd6ae5ebc1a5deef4f8b0d6b42 (diff)
parent770cf11d8612096c8cb85284c1605e229b72719b (diff)
downloadgitlab-ce-2a8dec2c27726cd0af995de97e596eab78e6efbf.tar.gz
Merge branch 'winh-file-encoding-dropdown' into 'master'
Make file encoding dropdown consistent See merge request !13585
-rw-r--r--app/assets/stylesheets/framework/selects.scss4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss
index d93722e2174..9fccc68b5b6 100644
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -266,7 +266,9 @@
}
// TODO: change global style
-.ajax-project-dropdown {
+.ajax-project-dropdown,
+body[data-page="projects:blob:new"] #select2-drop,
+body[data-page="projects:blob:edit"] #select2-drop {
&.select2-drop {
color: $gl-text-color;
}