Merge branch 'wip-MDL-57616-master' of git://github.com/marinaglancy/…

…moodle
rboyatt · Apr 11, 2017 · 1ad2ff0 · 1ad2ff0
2 parents 9b18c0e + 4cf6871
commit 1ad2ff0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/filter/mediaplugin/styles.css b/filter/mediaplugin/styles.css
@@ -14,7 +14,6 @@
     width: 100vw;
     max-width: 100%;
     height: auto;
-    min-height: 32px;
 }
 
 .mediaplugin > div {

diff --git a/media/player/videojs/styles.css b/media/player/videojs/styles.css
@@ -1330,3 +1330,7 @@ video::-webkit-media-text-track-display {
 .video-js.vjs-error {
   height: 150px;
 }
+/* Minimum height for videos should not be less than the size of play button. */
+.mediaplugin_videojs video {
+  min-height: 32px;
+}