From 0e3dfd2925688ffad136d8a54d1def0ac970d60e 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb index b6f64114e70..d2bd91af06c 100644 --- a/app/views/common/_discourse_stylesheet.html.erb +++ b/app/views/common/_discourse_stylesheet.html.erb @@ -8,10 +8,10 @@ <%= discourse_stylesheet_link_tag(:admin) %> <%- 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?).each do |file| %> <%= discourse_stylesheet_link_tag(file) %> <%- end %> + +<%- if theme_ids.present? %> + <%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %> +<%- end %>