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

2019-03-30 12:36:24 +01:00
parent b6fa500806 51625d3423
commit 4444d8f9b3
29 changed files with 454 additions and 182 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5308,6 +5308,7 @@ noscript {
      margin-left: -2px;

      .account__avatar {
+        background: darken($ui-base-color, 8%);
        border: 2px solid lighten($ui-base-color, 4%);
      }
    }