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

2022-08-15 14:33:05 +02:00
parent 3f15326a05 113dd90aa3
commit e2a7a458d6
159 changed files with 1537 additions and 1316 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5939,6 +5939,13 @@ a.status-card.compact:hover {
    height: 100%;
  }

+  &.inactive {
+    audio,
+    .video-player__controls {
+      visibility: hidden;
+    }
+  }
+
  .video-player__volume::before,
  .video-player__seek::before {
    background: currentColor;