github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-14 22:44:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Load plugin stylesheets before theme stylesheets (#9240)

Browse Source 
This is a more logical order, since themes are more lightweight than plugins, and are often used to augment plugin styles
This commit is contained in:
David Taylor 2020-03-19 16:02:12 +00:00
parent 4eb4293e66
commit 0e3dfd2925
No known key found for this signature in database
GPG Key ID: 46904C18B1D3F434
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/common/_discourse_stylesheet.html.erb
View File

@ -8,10 +8,10 @@
<%= discourse_stylesheet_link_tag(:admin) %> <%= discourse_stylesheet_link_tag(:admin) %>
<%- end %> <%- 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.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) %> <%= discourse_stylesheet_link_tag(file) %>
<%- end %> <%- end %>
<%- if theme_ids.present? %>
<%= discourse_stylesheet_link_tag(mobile_view? ? :mobile_theme : :desktop_theme) %>
<%- end %>