Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-06-12 13:17:21 +00:00
parent 34f1fd2a62 6151308c47
commit 4d8d1fa129
58 changed files with 837 additions and 188 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4555,7 +4555,7 @@ a.status-card {
    height: 100%;
    z-index: 4;
    border: 0;
-    background: $base-shadow-color;
+    background: $base-overlay-background;
    color: $darker-text-color;
    transition: none;
    pointer-events: none;