about summary refs log tree commit diff
path: root/app/javascript/styles/mastodon/admin.scss
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-05-04 19:15:50 +0200
committerThibaut Girka <thib@sitedethib.com>2019-05-04 19:15:50 +0200
commit52a4284fe5bb2b2a167a35eabe4f1607ac3957ca (patch)
treecb4696c66b62698386b676eec8c59359e6d8ba8d /app/javascript/styles/mastodon/admin.scss
parentbc97fd641f1f075e45f920fdc214f355ce16f53d (diff)
parent7aa749ab46b53bc5b234332ac35acc09a636fc28 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/styles/mastodon/admin.scss')
-rw-r--r--app/javascript/styles/mastodon/admin.scss2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 05c7821e4..74f91599a 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -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 {