Merge branch 'master' into develop

This commit is contained in:
Sam Potts 2020-02-14 16:53:55 +00:00
commit 7954c92c0b
2 changed files with 8 additions and 8 deletions

View File

@ -172,6 +172,11 @@ const ui = {
// Set property synchronously to respect the call order // Set property synchronously to respect the call order
this.media.setAttribute('poster', poster); this.media.setAttribute('poster', poster);
// HTML5 uses native poster attribute
if (this.isHTML5) {
return Promise.resolve(poster);
}
// Wait until ui is ready // Wait until ui is ready
return ( return (
ready ready

View File

@ -5,7 +5,10 @@
.plyr__volume { .plyr__volume {
align-items: center; align-items: center;
display: flex; display: flex;
max-width: 110px;
min-width: 80px;
position: relative; position: relative;
width: 20%;
input[type='range'] { input[type='range'] {
margin-left: ($plyr-control-spacing / 2); margin-left: ($plyr-control-spacing / 2);
@ -13,12 +16,4 @@
position: relative; position: relative;
z-index: 2; z-index: 2;
} }
@media (min-width: $plyr-bp-sm) {
max-width: 90px;
}
@media (min-width: $plyr-bp-md) {
max-width: 110px;
}
} }