IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Order outputted theme stylesheets (#14133)

Browse Source
This commit is contained in:
Penar Musaraj 2021-08-24 21:37:07 -04:00 committed by GitHub
parent d88c9d8cd1
commit 1167b16913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/site_settings.yml
View File

@ -365,9 +365,6 @@ basic:
default: "arial" default: "arial"
enum: "BaseFontSetting" enum: "BaseFontSetting"
refresh: true refresh: true
order_stylesheets:
default: false
hidden: true
login: login:
invite_only: invite_only:

2
lib/stylesheet/manager.rb
View File

@ -231,7 +231,7 @@ class Stylesheet::Manager
stylesheets << data stylesheets << data
end end
if SiteSetting.order_stylesheets && stylesheets.size > 1 if stylesheets.size > 1
stylesheets = stylesheets.sort_by do |s| stylesheets = stylesheets.sort_by do |s|
[ [
s[:remote] ? 0 : 1, s[:remote] ? 0 : 1,

4
spec/components/stylesheet/manager_spec.rb
View File

@ -152,10 +152,6 @@ describe Stylesheet::Manager do
end end
end end
before do
SiteSetting.order_stylesheets = true
end
it 'output remote child, then sort children alphabetically, then local parent' do it 'output remote child, then sort children alphabetically, then local parent' do
theme.add_relative_theme!(:child, z_child_theme) theme.add_relative_theme!(:child, z_child_theme)
theme.add_relative_theme!(:child, child_remote) theme.add_relative_theme!(:child, child_remote)