diff options
| author | Sam Potts <sam@potts.es> | 2020-02-14 16:53:55 +0000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-02-14 16:53:55 +0000 |
| commit | 7954c92c0be2e06db489c1bcd367377d61fd48cb (patch) | |
| tree | a8ffbdb9cb62bc67fcbadff2d90a8fa18b6e38be /src | |
| parent | 426280f90cfb4328055255bab3ae55df3f3d4786 (diff) | |
| parent | 5afb14283a40abdf46afae8a34fd5fe66114446e (diff) | |
| download | plyr-7954c92c0be2e06db489c1bcd367377d61fd48cb.tar.lz plyr-7954c92c0be2e06db489c1bcd367377d61fd48cb.tar.xz plyr-7954c92c0be2e06db489c1bcd367377d61fd48cb.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/ui.js | 5 | ||||
| -rw-r--r-- | src/sass/components/volume.scss | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/js/ui.js b/src/js/ui.js index b443766b..32db6ae7 100644 --- a/src/js/ui.js +++ b/src/js/ui.js @@ -172,6 +172,11 @@ const ui = { // Set property synchronously to respect the call order this.media.setAttribute('poster', poster); + // HTML5 uses native poster attribute + if (this.isHTML5) { + return Promise.resolve(poster); + } + // Wait until ui is ready return ( ready diff --git a/src/sass/components/volume.scss b/src/sass/components/volume.scss index 8afd76b0..7e59b992 100644 --- a/src/sass/components/volume.scss +++ b/src/sass/components/volume.scss @@ -5,7 +5,10 @@ .plyr__volume { align-items: center; display: flex; + max-width: 110px; + min-width: 80px; position: relative; + width: 20%; input[type='range'] { margin-left: ($plyr-control-spacing / 2); @@ -13,12 +16,4 @@ position: relative; z-index: 2; } - - @media (min-width: $plyr-bp-sm) { - max-width: 90px; - } - - @media (min-width: $plyr-bp-md) { - max-width: 110px; - } } |