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

2017-04-25 22:39:21 +10:00
parent b3d798eeee b499622eb8
commit 3756476809
9 changed files with 410 additions and 654 deletions
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@ -250,6 +250,11 @@
        background: @plyr-captions-bg;
        box-decoration-break: clone;
        line-height: 150%;
+
+        // Firefox adds a <div> when using getCueAsHTML()
+        div {
+            display: inline;
+        }
    }
    span:empty {
        display: none;