diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-26 19:12:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 19:12:07 +0200 |
| commit | af934b90710a2ce1099d3ceda5de7bcf0e94595c (patch) | |
| tree | 71e25690e6300d0235d515ccd0241d082c8d1abe /app/views/layouts/application.html.haml | |
| parent | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (diff) | |
| parent | be20eb4b2f4e55c472263a98a2c07b4e805d9bd5 (diff) | |
Merge pull request #674 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts/application.html.haml')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 21713f72e..36b4e9cae 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -30,9 +30,5 @@ = 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 - - body_classes += current_account&.user&.setting_reduce_motion ? ' reduce-motion' : ' no-reduce-motion' - - %body{ class: add_rtl_body_class(body_classes) } + %body{ class: body_classes } = content_for?(:content) ? yield(:content) : yield |