kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Move highlight themes to subfolder

Browse source
This commit is contained in:
Simon Knox 2019-02-22 11:58:37 +11:00
parent 5996fd145f
commit a1e0f387bf
10 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/highlight/dark.scss → app/assets/stylesheets/highlight/themes/dark.scss
View file

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

2
app/assets/stylesheets/highlight/monokai.scss → app/assets/stylesheets/highlight/themes/monokai.scss
View file

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

2
app/assets/stylesheets/highlight/none.scss → app/assets/stylesheets/highlight/themes/none.scss
View file

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

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

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

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

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

3
app/assets/stylesheets/highlight/themes/white.scss Normal file
View file

@ -0,0 +1,3 @@
.code.white {
@import "../white_base";
}

3
app/assets/stylesheets/highlight/white.scss
View file

@ -1,3 +0,0 @@
.code.white {
@import "white_base";
}

2
app/views/layouts/_head.html.haml
View file

@ -38,7 +38,7 @@
= stylesheet_link_tag 'performance_bar' if performance_bar_enabled? = stylesheet_link_tag 'performance_bar' if performance_bar_enabled?
= stylesheet_link_tag 'csslab' if Feature.enabled?(:csslab) = 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 = Gon::Base.render_data

7
config/application.rb
View file

@ -147,12 +147,7 @@ module Gitlab
config.assets.precompile << "errors.css" config.assets.precompile << "errors.css"
config.assets.precompile << "csslab.css" config.assets.precompile << "csslab.css"
config.assets.precompile << "highlight/dark.css" config.assets.precompile << "highlight/themes/*.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 # Import gitlab-svgs directly from vendored directory
config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist"

2
spec/views/layouts/_head.html.haml_spec.rb
View file

@ -67,7 +67,7 @@ describe 'layouts/_head' do
render 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 end
def stub_helper_with_safe_string(method) def stub_helper_with_safe_string(method)