Merge branch 'develop' of github.com:sampotts/plyr into develop

# Conflicts: # src/sass/components/video.scss
2020-01-21 22:15:38 +00:00
parent 7883792ccc b6d94e000f
commit 89136bc2e6
2 changed files with 24 additions and 8 deletions
--- a/src/sass/base.scss
+++ b/src/sass/base.scss
@ -11,6 +11,7 @@
    font-family: $plyr-font-family;
    font-variant-numeric: tabular-nums; // Force monosace-esque number widths
    font-weight: $plyr-font-weight-regular;
+    height: 100%;
    line-height: $plyr-line-height;
    max-width: 100%;
    min-width: 200px;
@ -22,7 +23,7 @@
    video,
    audio {
        border-radius: inherit;
-        height: auto;
+        height: 100%;
        vertical-align: middle;
        width: 100%;
    }