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

2019-07-24 16:23:53 +02:00
parent e3a551cbd1 94f5c714f1
commit 2d35e4460a
11 changed files with 146 additions and 119 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2015,6 +2015,10 @@ a.account__display-name {

  .scrollable {
    overflow: visible;
+
+    @supports(display: grid) {
+      contain: content;
+    }
  }

  @media screen and (min-width: $no-gap-breakpoint) {