mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-29 07:18:48 +09:00
Code

Reduce motion for boost animation (#5871)

Browse Source 
* Reduce motion for boost animation

Fixes #5833

* Fix ternary expression
This commit is contained in:
Nolan Lawson 2017-12-23 19:48:31 -08:00 committed by Eugen Rochko
parent 35fdf561be
commit a8eb0bf44f
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/javascript/styles/mastodon/components.scss
View File

@ -2149,7 +2149,8 @@
@import 'boost'; @import 'boost';
button.icon-button i.fa-retweet { .no-reduce-motion button.icon-button i.fa-retweet {
background-position: 0 0; background-position: 0 0;
height: 19px; height: 19px;
transition: background-position 0.9s steps(10); transition: background-position 0.9s steps(10);
@ -2160,13 +2161,23 @@ button.icon-button i.fa-retweet {
&::before { &::before {
display: none !important; display: none !important;
} }
} }
button.icon-button.active i.fa-retweet { .no-reduce-motion button.icon-button.active i.fa-retweet {
transition-duration: 0.9s; transition-duration: 0.9s;
background-position: 0 100%; background-position: 0 100%;
} }
.reduce-motion button.icon-button i.fa-retweet {
color: $ui-base-lighter-color;
transition: color 100ms ease-in;
}
.reduce-motion button.icon-button.active i.fa-retweet {
color: $ui-highlight-color;
}
.status-card { .status-card {
display: flex; display: flex;
cursor: pointer; cursor: pointer;

1
app/views/layouts/application.html.haml
View File

@ -28,6 +28,7 @@
- body_classes ||= @body_classes || '' - body_classes ||= @body_classes || ''
- body_classes += ' system-font' if current_account&.user&.setting_system_font_ui - 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: add_rtl_body_class(body_classes) }
= content_for?(:content) ? yield(:content) : yield = content_for?(:content) ? yield(:content) : yield