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

2019-05-04 19:15:50 +02:00
parent bc97fd641f 7aa749ab46
commit 52a4284fe5
5 changed files with 11 additions and 6 deletions
--- 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 {