Merge remote-tracking branch 'origin/master' into gs-master

2018-03-27 10:44:12 -05:00
parent 49c957bc3b 3523aa440b
commit d2cdc2b5a3
18 changed files with 261 additions and 111 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -3436,6 +3436,19 @@ a.status-card {
  width: 100%;
  height: 100%;
  position: relative;
+
+  .extended-video-player {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    video {
+      max-width: $media-modal-media-max-width;
+      max-height: $media-modal-media-max-height;
+    }
+  }
 }

 .media-modal__closer {
@ -4411,8 +4424,8 @@ a.status-card {
  border-radius: 4px;

  video {
-    height: 100%;
-    width: 100%;
+    max-width: 100vw;
+    max-height: 80vh;
    z-index: 1;
  }