Move highlight themes to subfolder

app/assets/stylesheets/highlight/dark.scss → app/assets/stylesheets/highlight/themes/dark.scss

 /* https://github.com/MozMorris/tomorrow-pygments */
 
-@import "./common";
+@import "../common";
 
 /*
 * Dark syntax colors

app/assets/stylesheets/highlight/monokai.scss → app/assets/stylesheets/highlight/themes/monokai.scss

 /* https://github.com/richleland/pygments-css/blob/master/monokai.css */
 
-@import "./common";
+@import "../common";
 
 /*
 * Monokai Colors

app/assets/stylesheets/highlight/none.scss → app/assets/stylesheets/highlight/themes/none.scss

@@ -2,7 +2,7 @@
 * None Syntax Colors
 */
 
-@import "./common";
+@import "../common";
 
 @mixin match-line {
   color: $black-transparent;

app/assets/stylesheets/highlight/solarized-dark.scss → app/assets/stylesheets/highlight/themes/solarized-dark.scss

 /* https://gist.github.com/qguv/7936275 */
 
-@import "./common";
+@import "../common";
 
 /*
 * Solarized dark colors

app/assets/stylesheets/highlight/solarized-light.scss → app/assets/stylesheets/highlight/themes/solarized-light.scss

 /* https://gist.github.com/qguv/7936275 */
 
-@import "./common";
+@import "../common";
 
 /*
 * Solarized light syntax colors

app/assets/stylesheets/highlight/white.scss → app/assets/stylesheets/highlight/themes/white.scss

 .code.white {
-  @import "white_base";
+  @import "../white_base";
 }

app/views/layouts/_head.html.haml

@@ -38,7 +38,7 @@
   = stylesheet_link_tag 'performance_bar' if performance_bar_enabled?
   = stylesheet_link_tag 'csslab' if Feature.enabled?(:csslab)
 
-  = stylesheet_link_tag "highlight/#{user_color_scheme}", media: "all"
+  = stylesheet_link_tag "highlight/themes/#{user_color_scheme}", media: "all"
 
   = Gon::Base.render_data
 

config/application.rb

@@ -147,12 +147,7 @@ module Gitlab
     config.assets.precompile << "errors.css"
     config.assets.precompile << "csslab.css"
 
-    config.assets.precompile << "highlight/dark.css"
-    config.assets.precompile << "highlight/monokai.css"
-    config.assets.precompile << "highlight/solarized-dark.css"
-    config.assets.precompile << "highlight/solarized-light.css"
-    config.assets.precompile << "highlight/white.css"
-    config.assets.precompile << "highlight/none.css"
+    config.assets.precompile << "highlight/themes/*.css"
 
     # Import gitlab-svgs directly from vendored directory
     config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist"

spec/views/layouts/_head.html.haml_spec.rb

@@ -67,7 +67,7 @@ describe 'layouts/_head' do
 
     render
 
-    expect(rendered).to match('<link rel="stylesheet" media="all" href="/stylesheets/highlight/solarised-light.css" />')
+    expect(rendered).to match('<link rel="stylesheet" media="all" href="/stylesheets/highlight/themes/solarised-light.css" />')
   end
 
   def stub_helper_with_safe_string(method)