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

This commit is contained in:
Sam Potts
2017-11-19 23:35:23 +11:00
3 changed files with 4 additions and 3 deletions
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -26,8 +26,8 @@
padding: 0.2em 0.5em;
background: @plyr-captions-bg;
box-decoration-break: clone;
line-height: 170%;
white-space: pre-wrap;
line-height: 185%;
white-space: pre;
// Firefox adds a <div> when using getCueAsHTML()
div {
+1
View File
@@ -177,6 +177,7 @@
display: flex;
align-items: center;
margin-left: auto;
margin-right: -@plyr-control-padding;
padding-left: ceil(@plyr-control-padding * 3.5);
pointer-events: none;
overflow: hidden;