diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-12-06 17:44:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-06 17:44:07 -0500 |
| commit | 81b01457598459c42a7b14d9aa14f91ba60dcae1 (patch) | |
| tree | 7d3e6dadb75f3be95e5a5ed8b7ecfe90e7711831 /app/views/layouts/application.html.haml | |
| parent | f1cbea77a4a52929244198dcbde26d63d837489a (diff) | |
| parent | 017fc81caf8f265e5c5543186877437485625795 (diff) | |
Merge pull request #229 from glitch-soc/glitch-theme
Advanced Next-Level Flavours And Skins For Mastodon™
Diffstat (limited to 'app/views/layouts/application.html.haml')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 24b74c787..99ae7d90d 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -18,16 +18,16 @@ = ' - ' = title - = stylesheet_pack_tag 'common', media: 'all' - = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous' = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags - - if controller_name != 'home' - = stylesheet_pack_tag 'application', integrity: true, media: 'all' - = yield :header_tags + -# These must come after :header_tags to ensure our initial state has been defined. + = render partial: 'layouts/theme', object: @core + = render partial: 'layouts/theme', object: @theme + - body_classes ||= @body_classes || '' - body_classes += ' system-font' if current_account&.user&.setting_system_font_ui |