Merge pull request #3032 from awesomerobot/master

adding max-height for embedded video
2014-12-08 21:48:19 +01:00 · 2014-12-08 21:48:19 +01:00 · 63d4932549
parent 5fd3f2547c 448acc627b
commit 63d4932549
2 changed files with 5 additions and 0 deletions
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@ -277,6 +277,7 @@
      cursor: default;
      video {
        max-width: 100%;
+        max-height: 500px;
        height: auto;
      }
      audio {
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@ -510,6 +510,10 @@ iframe {
  max-width: 100%;
 }

+video {
+  max-height: 500px;
+}
+
@keyframes fadein {
    from {opacity: 0;}
    to {opacity: 1;}