From: Jenkins Date: Sun, 24 Dec 2017 15:17:12 +0000 (+0000) Subject: Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f77c47d01b9584b5f429e2bbf56ed602593b7a8a;p=mastodon.git Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master --- f77c47d01b9584b5f429e2bbf56ed602593b7a8a diff --cc app/views/layouts/application.html.haml index 20603678b,c0e01da30..5b9e652cb --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@@ -28,12 -26,9 +28,13 @@@ = 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 + - body_classes += current_account&.user&.setting_reduce_motion ? ' reduce-motion' : ' no-reduce-motion' %body{ class: add_rtl_body_class(body_classes) } = content_for?(:content) ? yield(:content) : yield