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

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/views/layouts/application.html.haml
index 20603678b41c8bf947a88364555509f268eff4f3,c0e01da30fc038bc31ab17c94f7f85b5b449b929..5b9e652cb9cd0f09abc8fcbc6f0023ed680aa5b8
--- 1/app/views/layouts/application.html.haml
--- 2/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