diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 371df3a61fa..b4309482ade 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -115,12 +115,6 @@ module ApplicationHelper [asset_path("#{target}.css"), customization_disabled? ? nil : SiteCustomization.custom_stylesheet_path(session[:preview_style], target)].compact end - def stylesheet_links(target=:desktop) - stylesheet_filenames(target).map do |f| - "" - end.join("\n") - end - def customization_disabled? controller.class.name.split("::").first == "Admin" || session[:disable_customization] end diff --git a/app/views/common/_discourse_stylesheet.html.erb b/app/views/common/_discourse_stylesheet.html.erb index e5507f27ef3..afdab8627ef 100644 --- a/app/views/common/_discourse_stylesheet.html.erb +++ b/app/views/common/_discourse_stylesheet.html.erb @@ -2,16 +2,32 @@ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 94770605c90..3e6fafac3cb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -31,19 +31,14 @@
-