From 22d5ba0f77a7c19188ef5d16c4fee89a88ea0407 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 19 Mar 2020 16:02:12 +0000 Subject: [PATCH] DEV: Load plugin stylesheets before theme stylesheets (#9240) This is a more logical order, since themes are more lightweight than plugins, and are often used to augment plugin styles --- app/views/common/_discourse_stylesheet.html.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb index 2312fa4da7..2992572d0d 100644 --- a/app/views/common/_discourse_stylesheet.html.erb +++ b/app/views/common/_discourse_stylesheet.html.erb @@ -8,10 +8,11 @@ <%= discourse_stylesheet_link_tag(:admin) %> <%- end %> +<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %> + <%= discourse_stylesheet_link_tag(file) %> +<%- end %> + <%- if theme_ids.present? %> <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %> <%- end %> -<%- Discourse.find_plugin_css_assets(include_official: allow_plugins?, include_unofficial: allow_third_party_plugins?, mobile_view: mobile_view?, desktop_view: !mobile_view?, request: request).each do |file| %> - <%= discourse_stylesheet_link_tag(file) %> -<%- end %>