From 2e40b91ec1aabf33e945cba66fbcdd9b7aa53ba7 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Thu, 20 Jun 2019 23:50:46 +1000 Subject: Styling tweaks for demo --- src/sass/components/control.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/sass/components') diff --git a/src/sass/components/control.scss b/src/sass/components/control.scss index 1c9aab2b..f849d135 100644 --- a/src/sass/components/control.scss +++ b/src/sass/components/control.scss @@ -63,9 +63,9 @@ a.plyr__control { // Video control .plyr--video .plyr__control { - svg { + /* svg { filter: drop-shadow(0 1px 1px rgba(#000, 0.15)); - } + } */ // Hover and tab focus &.plyr__tab-focus, @@ -81,7 +81,6 @@ a.plyr__control { background: rgba($plyr-video-control-bg-hover, 0.8); border: 0; border-radius: 100%; - box-shadow: 0 1px 1px rgba(#000, 0.15); color: $plyr-video-control-color; display: none; left: 50%; -- cgit v1.2.3 From c4b3e0672e86f2a2786f315bf8f54250cd1f7f78 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Fri, 21 Jun 2019 00:10:57 +1000 Subject: Clean up --- src/sass/components/control.scss | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/sass/components') diff --git a/src/sass/components/control.scss b/src/sass/components/control.scss index f849d135..0022d17b 100644 --- a/src/sass/components/control.scss +++ b/src/sass/components/control.scss @@ -63,10 +63,6 @@ a.plyr__control { // Video control .plyr--video .plyr__control { - /* svg { - filter: drop-shadow(0 1px 1px rgba(#000, 0.15)); - } */ - // Hover and tab focus &.plyr__tab-focus, &:hover, -- cgit v1.2.3 From 2488299d7b91dd4face0fa0521b1af4bbde3ba52 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Fri, 21 Jun 2019 12:34:49 +1000 Subject: Edge fix --- src/sass/components/controls.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sass/components') diff --git a/src/sass/components/controls.scss b/src/sass/components/controls.scss index f4559bba..8abee204 100644 --- a/src/sass/components/controls.scss +++ b/src/sass/components/controls.scss @@ -12,11 +12,11 @@ align-items: center; display: flex; justify-content: flex-end; - min-width: 0; // Fix for Edge issue where content would overflow text-align: center; .plyr__progress__container { flex: 1; + min-width: 0; // Fix for Edge issue where content would overflow } // Spacing -- cgit v1.2.3 From a2498acf7c1ea3d7e77fecc524a9130777ef9508 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 14 Jan 2020 07:44:59 +0000 Subject: Manually merge PR #1629 --- src/sass/components/controls.scss | 8 -------- src/sass/components/volume.scss | 16 ++-------------- 2 files changed, 2 insertions(+), 22 deletions(-) (limited to 'src/sass/components') diff --git a/src/sass/components/controls.scss b/src/sass/components/controls.scss index 8abee204..cc07ef7f 100644 --- a/src/sass/components/controls.scss +++ b/src/sass/components/controls.scss @@ -41,14 +41,6 @@ &.plyr__time + .plyr__time { padding-left: 0; } - - &.plyr__volume { - padding-right: ($plyr-control-spacing / 2); - } - - &.plyr__volume:first-child { - padding-right: 0; - } } // Hide empty controls diff --git a/src/sass/components/volume.scss b/src/sass/components/volume.scss index 82a6dd36..76fb6229 100644 --- a/src/sass/components/volume.scss +++ b/src/sass/components/volume.scss @@ -5,11 +5,12 @@ .plyr__volume { align-items: center; display: flex; - flex: 1; + // flex: 1; position: relative; input[type='range'] { margin-left: ($plyr-control-spacing / 2); + margin-right: ($plyr-control-spacing / 2); position: relative; z-index: 2; } @@ -22,16 +23,3 @@ max-width: 110px; } } - -// Hide sound controls on iOS -// It's not supported to change volume using JavaScript: -// https://developer.apple.com/library/safari/documentation/AudioVideo/Conceptual/Using_HTML5_Audio_Video/Device-SpecificConsiderations/Device-SpecificConsiderations.html -.plyr--is-ios .plyr__volume { - display: none !important; -} - -// Vimeo has no toggle mute method so hide mute button -// https://github.com/vimeo/player.js/issues/236#issuecomment-384663183 -.plyr--is-ios.plyr--vimeo [data-plyr='mute'] { - display: none !important; -} -- cgit v1.2.3 From def366803021ecf2d80ec7ce555c60cd8edf5700 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 14 Jan 2020 22:32:45 +0000 Subject: Fix issues with fixed ratios and 100% height/width --- src/sass/components/video.scss | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/sass/components') diff --git a/src/sass/components/video.scss b/src/sass/components/video.scss index fdcf4f2d..c94e1424 100644 --- a/src/sass/components/video.scss +++ b/src/sass/components/video.scss @@ -15,8 +15,10 @@ .plyr__video-wrapper { background: #000; border-radius: inherit; + margin: auto; overflow: hidden; position: relative; + width: 100%; // Require z-index to force border-radius z-index: 0; } -- cgit v1.2.3 From fb704b945d95a53d4fbb5b616e2f0bcc9f0a278b Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Tue, 21 Jan 2020 22:29:00 +0000 Subject: Presentation fixes --- src/sass/components/video.scss | 4 +--- src/sass/components/volume.scss | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/sass/components') diff --git a/src/sass/components/video.scss b/src/sass/components/video.scss index c94e1424..ef70c104 100644 --- a/src/sass/components/video.scss +++ b/src/sass/components/video.scss @@ -15,6 +15,7 @@ .plyr__video-wrapper { background: #000; border-radius: inherit; + height: 100%; margin: auto; overflow: hidden; position: relative; @@ -35,12 +36,9 @@ $embed-padding: ((100 / 16) * 9); .plyr__video-embed iframe, .plyr__video-wrapper--fixed-ratio video { border: 0; - height: 100%; left: 0; position: absolute; top: 0; - user-select: none; - width: 100%; } // If the full custom UI is supported diff --git a/src/sass/components/volume.scss b/src/sass/components/volume.scss index 76fb6229..8afd76b0 100644 --- a/src/sass/components/volume.scss +++ b/src/sass/components/volume.scss @@ -5,7 +5,6 @@ .plyr__volume { align-items: center; display: flex; - // flex: 1; position: relative; input[type='range'] { -- cgit v1.2.3 From f8a28b632cf12a2c557a766010252b9edd4cdb8e Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Sun, 26 Jan 2020 22:05:21 +0000 Subject: Audio style fix --- src/sass/components/audio.scss | 7 +++++++ src/sass/components/video.scss | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 src/sass/components/audio.scss (limited to 'src/sass/components') diff --git a/src/sass/components/audio.scss b/src/sass/components/audio.scss new file mode 100644 index 00000000..285d34f9 --- /dev/null +++ b/src/sass/components/audio.scss @@ -0,0 +1,7 @@ +// -------------------------------------------------------------- +// Audio styles +// -------------------------------------------------------------- + +.plyr--audio { + display: block; +} diff --git a/src/sass/components/video.scss b/src/sass/components/video.scss index ef70c104..e5f6fe87 100644 --- a/src/sass/components/video.scss +++ b/src/sass/components/video.scss @@ -14,14 +14,10 @@ .plyr__video-wrapper { background: #000; - border-radius: inherit; height: 100%; margin: auto; overflow: hidden; - position: relative; width: 100%; - // Require z-index to force border-radius - z-index: 0; } // Default to 16:9 ratio but this is set by JavaScript based on config -- cgit v1.2.3 From 5837c2d5f0bdbf156bb591a6e0e02ba62e973e29 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Mon, 10 Feb 2020 11:23:57 +0000 Subject: SASS orginasation clean up and flex-direction added --- src/sass/components/audio.scss | 7 ---- src/sass/components/control.scss | 56 ------------------------------ src/sass/components/controls.scss | 34 ------------------ src/sass/components/sliders.scss | 72 +-------------------------------------- src/sass/components/times.scss | 4 --- src/sass/components/video.scss | 51 --------------------------- 6 files changed, 1 insertion(+), 223 deletions(-) delete mode 100644 src/sass/components/audio.scss delete mode 100644 src/sass/components/video.scss (limited to 'src/sass/components') diff --git a/src/sass/components/audio.scss b/src/sass/components/audio.scss deleted file mode 100644 index 285d34f9..00000000 --- a/src/sass/components/audio.scss +++ /dev/null @@ -1,7 +0,0 @@ -// -------------------------------------------------------------- -// Audio styles -// -------------------------------------------------------------- - -.plyr--audio { - display: block; -} diff --git a/src/sass/components/control.scss b/src/sass/components/control.scss index 0022d17b..64390dbd 100644 --- a/src/sass/components/control.scss +++ b/src/sass/components/control.scss @@ -50,59 +50,3 @@ a.plyr__control { .plyr__control.plyr__control--pressed .label--not-pressed { display: none; } - -// Audio control -.plyr--audio .plyr__control { - &.plyr__tab-focus, - &:hover, - &[aria-expanded='true'] { - background: $plyr-audio-control-bg-hover; - color: $plyr-audio-control-color-hover; - } -} - -// Video control -.plyr--video .plyr__control { - // Hover and tab focus - &.plyr__tab-focus, - &:hover, - &[aria-expanded='true'] { - background: $plyr-video-control-bg-hover; - color: $plyr-video-control-color-hover; - } -} - -// Large play button (video only) -.plyr__control--overlaid { - background: rgba($plyr-video-control-bg-hover, 0.8); - border: 0; - border-radius: 100%; - color: $plyr-video-control-color; - display: none; - left: 50%; - padding: ceil($plyr-control-spacing * 1.5); - position: absolute; - top: 50%; - transform: translate(-50%, -50%); - z-index: 2; - - // Offset icon to make the play button look right - svg { - left: 2px; - position: relative; - } - - &:hover, - &:focus { - background: $plyr-video-control-bg-hover; - } -} - -.plyr--playing .plyr__control--overlaid { - opacity: 0; - visibility: hidden; -} - -.plyr--full-ui.plyr--video .plyr__control--overlaid { - display: block; -} diff --git a/src/sass/components/controls.scss b/src/sass/components/controls.scss index cc07ef7f..50333701 100644 --- a/src/sass/components/controls.scss +++ b/src/sass/components/controls.scss @@ -49,40 +49,6 @@ } } -// Audio controls -.plyr--audio .plyr__controls { - background: $plyr-audio-controls-bg; - border-radius: inherit; - color: $plyr-audio-control-color; - padding: $plyr-control-spacing; -} - -// Video controls -.plyr--video .plyr__controls { - background: linear-gradient(rgba($plyr-video-controls-bg, 0), rgba($plyr-video-controls-bg, 0.7)); - border-bottom-left-radius: inherit; - border-bottom-right-radius: inherit; - bottom: 0; - color: $plyr-video-control-color; - left: 0; - padding: ($plyr-control-spacing * 2) ($plyr-control-spacing / 2) ($plyr-control-spacing / 2); - position: absolute; - right: 0; - transition: opacity 0.4s ease-in-out, transform 0.4s ease-in-out; - z-index: 3; - - @media (min-width: $plyr-bp-sm) { - padding: ($plyr-control-spacing * 3.5) $plyr-control-spacing $plyr-control-spacing; - } -} - -// Hide video controls -.plyr--video.plyr--hide-controls .plyr__controls { - opacity: 0; - pointer-events: none; - transform: translateY(100%); -} - // Some options are hidden by default .plyr [data-plyr='captions'], .plyr [data-plyr='pip'], diff --git a/src/sass/components/sliders.scss b/src/sass/components/sliders.scss index ee64271b..7b519fc6 100644 --- a/src/sass/components/sliders.scss +++ b/src/sass/components/sliders.scss @@ -19,11 +19,7 @@ &::-webkit-slider-runnable-track { @include plyr-range-track(); - background-image: linear-gradient( - to right, - currentColor var(--value, 0%), - transparent var(--value, 0%) - ); + background-image: linear-gradient(to right, currentColor var(--value, 0%), transparent var(--value, 0%)); } &::-webkit-slider-thumb { @@ -96,69 +92,3 @@ } } } - -// Video range inputs -.plyr--full-ui.plyr--video input[type='range'] { - &::-webkit-slider-runnable-track { - background-color: $plyr-video-range-track-bg; - } - - &::-moz-range-track { - background-color: $plyr-video-range-track-bg; - } - - &::-ms-track { - background-color: $plyr-video-range-track-bg; - } - - // Pressed styles - &:active { - &::-webkit-slider-thumb { - @include plyr-range-thumb-active(); - } - - &::-moz-range-thumb { - @include plyr-range-thumb-active(); - } - - &::-ms-thumb { - @include plyr-range-thumb-active(); - } - } -} - -// Audio range inputs -.plyr--full-ui.plyr--audio input[type='range'] { - &::-webkit-slider-runnable-track { - background-color: $plyr-audio-range-track-bg; - } - - &::-moz-range-track { - background-color: $plyr-audio-range-track-bg; - } - - &::-ms-track { - background-color: $plyr-audio-range-track-bg; - } - - // Pressed styles - &:active { - &::-webkit-slider-thumb { - @include plyr-range-thumb-active( - $plyr-audio-range-thumb-shadow-color - ); - } - - &::-moz-range-thumb { - @include plyr-range-thumb-active( - $plyr-audio-range-thumb-shadow-color - ); - } - - &::-ms-thumb { - @include plyr-range-thumb-active( - $plyr-audio-range-thumb-shadow-color - ); - } - } -} diff --git a/src/sass/components/times.scss b/src/sass/components/times.scss index 240d3528..7d7a50f1 100644 --- a/src/sass/components/times.scss +++ b/src/sass/components/times.scss @@ -18,7 +18,3 @@ display: none; } } - -.plyr--video .plyr__time { - text-shadow: 0 1px 1px rgba(#000, 0.15); -} diff --git a/src/sass/components/video.scss b/src/sass/components/video.scss deleted file mode 100644 index e5f6fe87..00000000 --- a/src/sass/components/video.scss +++ /dev/null @@ -1,51 +0,0 @@ -// -------------------------------------------------------------- -// Video styles -// -------------------------------------------------------------- - -.plyr--video { - background: #000; - overflow: hidden; - - // Menu open - &.plyr--menu-open { - overflow: visible; - } -} - -.plyr__video-wrapper { - background: #000; - height: 100%; - margin: auto; - overflow: hidden; - width: 100%; -} - -// Default to 16:9 ratio but this is set by JavaScript based on config -$embed-padding: ((100 / 16) * 9); - -.plyr__video-embed, -.plyr__video-wrapper--fixed-ratio { - height: 0; - padding-bottom: to-percentage($embed-padding); -} - -.plyr__video-embed iframe, -.plyr__video-wrapper--fixed-ratio video { - border: 0; - left: 0; - position: absolute; - top: 0; -} - -// If the full custom UI is supported -.plyr--full-ui .plyr__video-embed { - $height: 240; - $offset: to-percentage(($height - $embed-padding) / ($height / 50)); - - // Only used for Vimeo - > .plyr__video-embed__container { - padding-bottom: to-percentage($height); - position: relative; - transform: translateY(-$offset); - } -} -- cgit v1.2.3 From ff8dedd4ec2235131a630635ec7927c75d0a3c16 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Mon, 10 Feb 2020 17:53:23 +0000 Subject: Menu border color tweak --- src/sass/components/menus.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/sass/components') diff --git a/src/sass/components/menus.scss b/src/sass/components/menus.scss index b8c85284..be354e46 100644 --- a/src/sass/components/menus.scss +++ b/src/sass/components/menus.scss @@ -39,8 +39,7 @@ > div { overflow: hidden; - transition: height 0.35s cubic-bezier(0.4, 0, 0.2, 1), - width 0.35s cubic-bezier(0.4, 0, 0.2, 1); + transition: height 0.35s cubic-bezier(0.4, 0, 0.2, 1), width 0.35s cubic-bezier(0.4, 0, 0.2, 1); } // Arrow @@ -74,8 +73,7 @@ color: $plyr-menu-color; display: flex; font-size: $plyr-font-size-menu; - padding: ceil($plyr-control-padding / 2) - ceil($plyr-control-padding * 1.5); + padding: ceil($plyr-control-padding / 2) ceil($plyr-control-padding * 1.5); user-select: none; width: 100%; -- cgit v1.2.3 From cddd9c30dbda83ad5be3ffc159cc11e352219fef Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Wed, 12 Feb 2020 14:36:30 +0000 Subject: More styles clean up --- src/sass/components/progress.scss | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/sass/components') 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; -- cgit v1.2.3 From 5afb14283a40abdf46afae8a34fd5fe66114446e Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Fri, 14 Feb 2020 16:53:31 +0000 Subject: Fix for regression with volume control width --- src/sass/components/volume.scss | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/sass/components') 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; - } } -- cgit v1.2.3 From 6350b7b9e46c60baa49903e54b8c39b6f1dc311c Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Fri, 14 Feb 2020 17:33:09 +0000 Subject: v3.5.10 - iOS volume display fix --- src/sass/components/volume.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/sass/components') diff --git a/src/sass/components/volume.scss b/src/sass/components/volume.scss index 7e59b992..614b35f5 100644 --- a/src/sass/components/volume.scss +++ b/src/sass/components/volume.scss @@ -17,3 +17,9 @@ z-index: 2; } } + +// Auto size on iOS as there's no slider +.plyr--is-ios .plyr__volume { + min-width: 0; + width: auto; +} -- cgit v1.2.3