Merge branch 'main' into glitch-soc/merge-upstream

2021-03-24 10:53:50 +01:00
parent d7c1c41859 88d69d3261
commit f60c99a8fb
53 changed files with 684 additions and 404 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -39,7 +39,7 @@
    = render partial: 'layouts/theme', object: @theme

    - if Setting.custom_css.present?
-      = stylesheet_link_tag custom_css_path, media: 'all'
+      = stylesheet_link_tag custom_css_path, host: request.host, media: 'all'

  %body{ class: body_classes }
    = content_for?(:content) ? yield(:content) : yield