-
- Downloads
Merge branch 'rs-remove-user-color-scheme-class' into 'master'
Apply syntax highlighting to fenced code blocks client-side Instead of applying the syntax highlighting scheme class to these blocks server-side, we use Javascript and Gon to apply the user's color scheme (or the default) client-side. This will make it easier to cache these blocks in the future because they're no longer state-dependent. See merge request !1203
No related branches found
No related tags found
Showing
- app/assets/javascripts/syntax_highlight.coffee 9 additions, 0 deletionsapp/assets/javascripts/syntax_highlight.coffee
- app/assets/stylesheets/generic/common.scss 0 additions, 4 deletionsapp/assets/stylesheets/generic/common.scss
- app/assets/stylesheets/highlight/dark.scss 6 additions, 0 deletionsapp/assets/stylesheets/highlight/dark.scss
- app/assets/stylesheets/highlight/monokai.scss 6 additions, 0 deletionsapp/assets/stylesheets/highlight/monokai.scss
- app/assets/stylesheets/highlight/solarized_dark.scss 5 additions, 0 deletionsapp/assets/stylesheets/highlight/solarized_dark.scss
- app/assets/stylesheets/highlight/solarized_light.scss 5 additions, 0 deletionsapp/assets/stylesheets/highlight/solarized_light.scss
- app/assets/stylesheets/highlight/white.scss 5 additions, 0 deletionsapp/assets/stylesheets/highlight/white.scss
- app/controllers/application_controller.rb 5 additions, 4 deletionsapp/controllers/application_controller.rb
- app/helpers/gitlab_markdown_helper.rb 1 addition, 1 deletionapp/helpers/gitlab_markdown_helper.rb
- app/helpers/preferences_helper.rb 3 additions, 24 deletionsapp/helpers/preferences_helper.rb
- app/views/profiles/preferences/show.html.haml 4 additions, 4 deletionsapp/views/profiles/preferences/show.html.haml
- app/views/search/results/_blob.html.haml 1 addition, 1 deletionapp/views/search/results/_blob.html.haml
- app/views/search/results/_snippet_blob.html.haml 1 addition, 1 deletionapp/views/search/results/_snippet_blob.html.haml
- app/views/search/results/_wiki_blob.html.haml 1 addition, 1 deletionapp/views/search/results/_wiki_blob.html.haml
- app/views/shared/_file_highlight.html.haml 1 addition, 1 deletionapp/views/shared/_file_highlight.html.haml
- lib/gitlab/color_schemes.rb 67 additions, 0 deletionslib/gitlab/color_schemes.rb
- lib/gitlab/themes.rb 18 additions, 0 deletionslib/gitlab/themes.rb
- lib/redcarpet/render/gitlab_html.rb 2 additions, 3 deletionslib/redcarpet/render/gitlab_html.rb
- spec/features/markdown_spec.rb 2 additions, 6 deletionsspec/features/markdown_spec.rb
- spec/helpers/events_helper_spec.rb 2 additions, 3 deletionsspec/helpers/events_helper_spec.rb
Loading
Please register or sign in to comment