Merge branch 'master' of github.com:selz/plyr

# Conflicts: # src/js/plyr.js
2016-02-21 14:04:13 +11:00
parent b18ed03384 6a0b3dc823
commit cad142fe85
9 changed files with 110 additions and 95 deletions
--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@ -167,6 +167,11 @@ $plyr-bp-captions-large:             768px !default; // When captions jump to th
        vertical-align: middle;
    }

+    // Hide default captions
+    video::-webkit-media-text-track-container {
+        display: none;
+    }
+
    // For embeds
    &__video-embed {
        padding-bottom: 56.25%; /* 16:9 */