Merge branch 'winh-file-encoding-dropdown' into 'master'

Make file encoding dropdown consistent See merge request !13585

Merge branch 'winh-file-encoding-dropdown' into 'master'
2a8dec2c · Phil Hughes · 0ed5ee33 · 770cf11d · 2a8dec2c
Commit 2a8dec2c authored Aug 29, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

selects.scss app/assets/stylesheets/framework/selects.scss +3 -1

No files found.
--- 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;
  }