From 5996fd145ff8d774573e5a0ef22c3b4f0611196f Mon Sep 17 00:00:00 2001 From: Simon Knox Date: Thu, 14 Feb 2019 17:54:34 +1100 Subject: Only load selected syntax highlight CSS Compile highlight CSS separately Move highlight-specific mixins out of mixins.scss Rename solarized themes to match theme name as this was a smaller change than changing all instances to snake_case --- config/application.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config/application.rb') diff --git a/config/application.rb b/config/application.rb index 49e7f5836e4..67942ae116b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -147,6 +147,13 @@ 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" + # Import gitlab-svgs directly from vendored directory config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" config.assets.precompile << "icons.svg" -- cgit v1.2.3 From a1e0f387bfc7c01e41c487b598c3828fa89da397 Mon Sep 17 00:00:00 2001 From: Simon Knox Date: Fri, 22 Feb 2019 11:58:37 +1100 Subject: Move highlight themes to subfolder --- config/application.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'config/application.rb') diff --git a/config/application.rb b/config/application.rb index 67942ae116b..1c11e347281 100644 --- a/config/application.rb +++ b/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" -- cgit v1.2.3