aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2020-02-14 16:55:56 +0000
committerGitHub <noreply@github.com>2020-02-14 16:55:56 +0000
commit924049aa14414b5c4b06a6a2a7ac290e3f3a0f4b (patch)
tree05458f4c38564a7e83d5fa38e919b6bba612c25b /src
parent2e2c5ad72a00e9f85b11e29e0ead9f7c9db8ea5c (diff)
parent442427ebd53175ed47cdaa22ffc47cd1d11f4c89 (diff)
downloadplyr-924049aa14414b5c4b06a6a2a7ac290e3f3a0f4b.tar.lz
plyr-924049aa14414b5c4b06a6a2a7ac290e3f3a0f4b.tar.xz
plyr-924049aa14414b5c4b06a6a2a7ac290e3f3a0f4b.zip
Merge pull request #1691 from sampotts/develop
v3.5.9
Diffstat (limited to 'src')
-rw-r--r--src/js/ui.js5
-rw-r--r--src/sass/components/progress.scss9
-rw-r--r--src/sass/components/volume.scss11
-rw-r--r--src/sass/types/audio.scss5
-rw-r--r--src/sass/types/video.scss5
5 files changed, 16 insertions, 19 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/progress.scss b/src/sass/components/progress.scss
index 04c83516..f28bec8c 100644
--- a/src/sass/components/progress.scss
+++ b/src/sass/components/progress.scss
@@ -67,15 +67,6 @@ $plyr-progress-offset: $plyr-range-thumb-height;
}
}
-.plyr--video .plyr__progress__buffer {
- box-shadow: 0 1px 1px rgba(#000, 0.15);
- color: $plyr-video-progress-buffered-bg;
-}
-
-.plyr--audio .plyr__progress__buffer {
- color: $plyr-audio-progress-buffered-bg;
-}
-
// Loading state
.plyr--loading .plyr__progress__buffer {
animation: plyr-progress 1s linear infinite;
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;
- }
}
diff --git a/src/sass/types/audio.scss b/src/sass/types/audio.scss
index 5d779a61..cd9a91fc 100644
--- a/src/sass/types/audio.scss
+++ b/src/sass/types/audio.scss
@@ -54,3 +54,8 @@
}
}
}
+
+// Progress
+.plyr--audio .plyr__progress__buffer {
+ color: $plyr-audio-progress-buffered-bg;
+}
diff --git a/src/sass/types/video.scss b/src/sass/types/video.scss
index cf3ee9c8..9a9bd01c 100644
--- a/src/sass/types/video.scss
+++ b/src/sass/types/video.scss
@@ -152,6 +152,7 @@ $embed-padding: ((100 / 16) * 9);
}
}
-.plyr--video .plyr__time {
- text-shadow: 0 1px 1px rgba(#000, 0.15);
+// Progress
+.plyr--video .plyr__progress__buffer {
+ color: $plyr-video-progress-buffered-bg;
}