monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

This commit is contained in:
Thibaut Girka 2020-07-22 22:53:46 +02:00
parent 855ada7e93 e93efc0309
commit c03d1a9ac8
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/styles/mastodon/boost.scss
View File

File diff suppressed because one or more lines are too long

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

@ -2990,7 +2990,7 @@ a.account__display-name {
} }
} }
.no-reduce-motion button.icon-button i.fa-retweet { 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);
@ -3004,18 +3004,14 @@ a.account__display-name {
} }
.no-reduce-motion button.icon-button.active i.fa-retweet { 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 { .reduce-motion button.icon-button i.fa-retweet,
color: $action-button-color;
transition: color 100ms ease-in;
}
.reduce-motion button.icon-button.active i.fa-retweet { .reduce-motion button.icon-button.active i.fa-retweet {
color: $highlight-text-color; transition: none;
} }
.status-card { .status-card {