diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-07-17 23:10:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-17 23:10:31 +0200 |
commit | ab1488a6ad93f572e1d184cb9653f76fd408474f (patch) | |
tree | f1dd126f4745eb99243f390169fb957a72f5acc6 /app/views/layouts | |
parent | 325ebb76b19bd20e1b76d8bc26c11cab02f6571c (diff) | |
parent | 6c0d73a675d62f676b005c06593fd69e9a7bc0e5 (diff) |
Merge pull request #1804 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts')
-rwxr-xr-x | app/views/layouts/application.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index ee444c070..40c38cecb 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -43,8 +43,7 @@ = render partial: 'layouts/theme', object: @core = render partial: 'layouts/theme', object: @theme - - if Setting.custom_css.present? - = stylesheet_link_tag custom_css_path, host: request.host, media: 'all' + = stylesheet_link_tag custom_css_path, host: request.host, media: 'all' %body{ class: body_classes } = content_for?(:content) ? yield(:content) : yield |