Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-24 15:17:12 +00:00
parent 6d00ca1c71 cafe27fb29
commit f77c47d01b
15 changed files with 311 additions and 207 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -34,6 +34,7 @@

  - 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