about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorYuto Tokunaga <yuntan.sub1@gmail.com>2018-03-12 11:52:05 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-03-12 03:52:05 +0100
commitfa5c867e0ec426fc01653e9022ba29783b2a826f (patch)
treefa93c68e68496df73d76d54b016e78a8c126cda3 /app/javascript/styles
parent641abe2db7ac482dceffc8307af411e01c540951 (diff)
Avoid using JS to set height in MediaModal (#6750)
avoid using JS to set height of ReactSwipeableViews component
reduce max-height of <img/> to 80% to avoid the screen covered by image
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon/components.scss13
1 files changed, 6 insertions, 7 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 93faff8b6..587fe62da 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3422,8 +3422,12 @@ a.status-card {
   img,
   canvas,
   video {
-    max-width: 100vw;
-    max-height: 100vh;
+    max-width: 100%;
+    /*
+    put margins on top and bottom of image to avoid the screen coverd by
+    image.
+     */
+    max-height: 80%;
     width: auto;
     height: auto;
     margin: auto;
@@ -3435,11 +3439,6 @@ a.status-card {
     background: url('../images/void.png') repeat;
     object-fit: contain;
   }
-
-  .react-swipeable-view-container {
-    width: 100vw;
-    height: 100%;
-  }
 }
 
 .media-modal__closer {