Skip to content

Commit 7148335

Browse files
ClearlyClaireGargron
authored andcommitted
Fix transition: all (mastodon#10699)
1 parent ac2dd3e commit 7148335

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

app/javascript/styles/mastodon/admin.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ $content-width: 840px;
5050
color: $darker-text-color;
5151
text-decoration: none;
5252
transition: all 200ms linear;
53+
transition-property: color, background-color;
5354
border-radius: 4px 0 0 4px;
5455

5556
i.fa {
@@ -60,6 +61,7 @@ $content-width: 840px;
6061
color: $primary-text-color;
6162
background-color: darken($ui-base-color, 5%);
6263
transition: all 100ms linear;
64+
transition-property: color, background-color;
6365
}
6466

6567
&.selected {

app/javascript/styles/mastodon/components.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,6 +1972,7 @@ a.account__display-name {
19721972
font-weight: 500;
19731973
border-bottom: 2px solid lighten($ui-base-color, 8%);
19741974
transition: all 50ms linear;
1975+
transition-property: border-bottom, background, color;
19751976

19761977
.fa {
19771978
font-weight: 400;
@@ -2137,7 +2138,7 @@ a.account__display-name {
21372138
padding: 0;
21382139
border-radius: 30px;
21392140
background-color: $ui-base-color;
2140-
transition: all 0.2s ease;
2141+
transition: background-color 0.2s ease;
21412142
}
21422143

21432144
.react-toggle:hover:not(.react-toggle--disabled) .react-toggle-track {
@@ -2190,7 +2191,6 @@ a.account__display-name {
21902191
}
21912192

21922193
.react-toggle-thumb {
2193-
transition: all 0.5s cubic-bezier(0.23, 1, 0.32, 1) 0ms;
21942194
position: absolute;
21952195
top: 1px;
21962196
left: 1px;
@@ -2201,6 +2201,7 @@ a.account__display-name {
22012201
background-color: darken($simple-background-color, 2%);
22022202
box-sizing: border-box;
22032203
transition: all 0.25s ease;
2204+
transition-property: border-color, left;
22042205
}
22052206

22062207
.react-toggle--checked .react-toggle-thumb {
@@ -3552,6 +3553,7 @@ a.status-card.compact:hover {
35523553
display: inline-block;
35533554
opacity: 0;
35543555
transition: all 100ms linear;
3556+
transition-property: transform, opacity;
35553557
font-size: 18px;
35563558
width: 18px;
35573559
height: 18px;

0 commit comments

Comments
 (0)