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

2020-04-25 15:19:32 +02:00
parent 60f8a63a76 be637146f3
commit 8b2823b7b6
15 changed files with 89 additions and 91 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5575,6 +5575,13 @@ a.status-card.compact:hover {
  }
 }

+.gifv {
+  video {
+    max-width: 100vw;
+    max-height: 80vh;
+  }
+}
+
 .directory {
  &__list {
    width: 100%;