Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/application.scss

@@ -39,16 +39,6 @@
  */
 @import "components/**/*";
 
-/*
- * Code highlight
- */
-@import "highlight/dark";
-@import "highlight/monokai";
-@import "highlight/solarized_dark";
-@import "highlight/solarized_light";
-@import "highlight/white";
-@import "highlight/none";
-
 /*
  * Styles for JS behaviors.
  */

app/assets/stylesheets/framework/mixins.scss

@@ -113,11 +113,6 @@
   }
 }
 
-@mixin dark-diff-match-line {
-  color: $dark-diff-match-bg;
-  background: $dark-diff-match-color;
-}
-
 @mixin webkit-prefix($property, $value) {
   #{'-webkit-' + $property}: $value;
   #{$property}: $value;

app/assets/stylesheets/highlight/common.scss

+@import "../framework/variables";
+
+@mixin diff-background($background, $idiff, $border) {
+  background: $background;
+
+  &.line_content span.idiff {
+    background: $idiff;
+  }
+
+  &.diff-line-num {
+    border-color: $border;
+  }
+}
+
+@mixin dark-diff-match-line {
+  color: $dark-diff-match-bg;
+  background: $dark-diff-match-color;
+}

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

 /* https://github.com/MozMorris/tomorrow-pygments */
 
+@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";
+
 /*
 * Monokai Colors
 */

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

@@ -2,7 +2,7 @@
 * None Syntax Colors
 */
 
-
+@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";
+
 /*
 * 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";
+
 /*
 * 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/assets/stylesheets/highlight/white_base.scss

 /* https://github.com/aahan/pygments-github-style */
 
+@import "./common";
+
 /*
 * White Syntax Colors
 */

app/assets/stylesheets/pages/diff.scss

@@ -602,18 +602,6 @@
   }
 }
 
-@mixin diff-background($background, $idiff, $border) {
-  background: $background;
-
-  &.line_content span.idiff {
-    background: $idiff;
-  }
-
-  &.diff-line-num {
-    border-color: $border;
-  }
-}
-
 .files {
   .diff-file:last-child {
     margin-bottom: 0;

app/views/layouts/_head.html.haml

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

changelogs/unreleased/56873-only-load-syntax-highlighting-css-when-selected.yml

+---
+title: Only load syntax highlight CSS of selected theme
+merge_request: 25232
+author:
+type: performance

config/application.rb

@@ -164,6 +164,8 @@ module Gitlab
     config.assets.precompile << "errors.css"
     config.assets.precompile << "csslab.css"
 
+    config.assets.precompile << "highlight/themes/*.css"
+
     # Import gitlab-svgs directly from vendored directory
     config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist"
     config.assets.precompile << "icons.svg"