From 2db0506226d0de38115e912a632d7a30afeb651e Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Thu, 4 Apr 2019 19:38:48 +0200 Subject: [PATCH] Load custom CSS rules after standard ones Fixes #933 Due to glitch-soc's theming system, JS and CSS files are imported in a slightly different order, and custom CSS rules were loaded *before* everything else. They will now be loaded *after* everything else, which is a bit different from upstream but should work better overall. --- app/views/layouts/application.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7d3daf6c9e8..34c25a7d1a3 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -28,14 +28,14 @@ = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags - - if Setting.custom_css.present? - = stylesheet_link_tag custom_css_path, media: 'all' - = yield :header_tags -# These must come after :header_tags to ensure our initial state has been defined. = render partial: 'layouts/theme', object: @core = render partial: 'layouts/theme', object: @theme + - if Setting.custom_css.present? + = stylesheet_link_tag custom_css_path, media: 'all' + %body{ class: body_classes } = content_for?(:content) ? yield(:content) : yield