Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Open sidebar
Tiger Ton
mastodon
Commits
7aa749ab
Commit
7aa749ab
authored
6 years ago
by
ThibG
Committed by
Eugen Rochko
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Fix transition: all (#10699)
parent
56880fa7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/javascript/styles/mastodon/admin.scss
+2
-0
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
+4
-2
app/javascript/styles/mastodon/components.scss
with
6 additions
and
2 deletions
+6
-2
app/javascript/styles/mastodon/admin.scss
+
2
-
0
View file @
7aa749ab
...
...
@@ -50,6 +50,7 @@ $content-width: 840px;
color
:
$darker-text-color
;
text-decoration
:
none
;
transition
:
all
200ms
linear
;
transition-property
:
color
,
background-color
;
border-radius
:
4px
0
0
4px
;
i
.fa
{
...
...
@@ -60,6 +61,7 @@ $content-width: 840px;
color
:
$primary-text-color
;
background-color
:
darken
(
$ui-base-color
,
5%
);
transition
:
all
100ms
linear
;
transition-property
:
color
,
background-color
;
}
&
.selected
{
...
...
This diff is collapsed.
Click to expand it.
app/javascript/styles/mastodon/components.scss
+
4
-
2
View file @
7aa749ab
...
...
@@ -1972,6 +1972,7 @@ a.account__display-name {
font-weight
:
500
;
border-bottom
:
2px
solid
lighten
(
$ui-base-color
,
8%
);
transition
:
all
50ms
linear
;
transition-property
:
border-bottom
,
background
,
color
;
.fa
{
font-weight
:
400
;
...
...
@@ -2137,7 +2138,7 @@ a.account__display-name {
padding
:
0
;
border-radius
:
30px
;
background-color
:
$ui-base-color
;
transition
:
all
0
.2s
ease
;
transition
:
background-color
0
.2s
ease
;
}
.react-toggle
:hover:not
(
.react-toggle--disabled
)
.react-toggle-track
{
...
...
@@ -2190,7 +2191,6 @@ a.account__display-name {
}
.react-toggle-thumb
{
transition
:
all
0
.5s
cubic-bezier
(
0
.23
,
1
,
0
.32
,
1
)
0ms
;
position
:
absolute
;
top
:
1px
;
left
:
1px
;
...
...
@@ -2201,6 +2201,7 @@ a.account__display-name {
background-color
:
darken
(
$simple-background-color
,
2%
);
box-sizing
:
border-box
;
transition
:
all
0
.25s
ease
;
transition-property
:
border-color
,
left
;
}
.react-toggle--checked
.react-toggle-thumb
{
...
...
@@ -3552,6 +3553,7 @@ a.status-card.compact:hover {
display
:
inline-block
;
opacity
:
0
;
transition
:
all
100ms
linear
;
transition-property
:
transform
,
opacity
;
font-size
:
18px
;
width
:
18px
;
height
:
18px
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment