diff options
author | Sam Potts <sam@potts.es> | 2020-03-30 10:45:57 +1100 |
---|---|---|
committer | Sam Potts <sam@potts.es> | 2020-03-30 10:45:57 +1100 |
commit | da943b384ca334cad66fd261cb9a0f924716da9d (patch) | |
tree | 5aaac37b474a2708c7910eb536b9d96d4c0dcff3 /src/sass/components/progress.scss | |
parent | 50a7c2fad6f0d9b03788fe57a855894eafcf5ef7 (diff) | |
parent | ad63af5096e014785bd22eac24bc8030c0dc70d6 (diff) | |
download | plyr-da943b384ca334cad66fd261cb9a0f924716da9d.tar.lz plyr-da943b384ca334cad66fd261cb9a0f924716da9d.tar.xz plyr-da943b384ca334cad66fd261cb9a0f924716da9d.zip |
Merge branch 'develop' into css-variables
# Conflicts:
# demo/dist/demo.css
# demo/dist/demo.min.js.map
# demo/index.html
# dist/plyr.css
# dist/plyr.min.js.map
# dist/plyr.min.mjs.map
# dist/plyr.polyfilled.min.js.map
# dist/plyr.polyfilled.min.mjs.map
# gulpfile.js
# src/sass/base.scss
# src/sass/components/control.scss
# src/sass/settings/colors.scss
# src/sass/settings/controls.scss
Diffstat (limited to 'src/sass/components/progress.scss')
-rw-r--r-- | src/sass/components/progress.scss | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/sass/components/progress.scss b/src/sass/components/progress.scss index 04c83516..c15ee911 100644 --- a/src/sass/components/progress.scss +++ b/src/sass/components/progress.scss @@ -67,25 +67,16 @@ $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; background-image: linear-gradient( -45deg, - $plyr-progress-loading-bg 25%, + var(--plyr-progress-loading-background, $plyr-progress-loading-background) 25%, transparent 25%, transparent 50%, - $plyr-progress-loading-bg 50%, - $plyr-progress-loading-bg 75%, + var(--plyr-progress-loading-background, $plyr-progress-loading-background) 50%, + var(--plyr-progress-loading-background, $plyr-progress-loading-background) 75%, transparent 75%, transparent ); @@ -95,9 +86,9 @@ $plyr-progress-offset: $plyr-range-thumb-height; } .plyr--video.plyr--loading .plyr__progress__buffer { - background-color: $plyr-video-progress-buffered-bg; + background-color: $plyr-video-progress-buffered-background; } .plyr--audio.plyr--loading .plyr__progress__buffer { - background-color: $plyr-audio-progress-buffered-bg; + background-color: $plyr-audio-progress-buffered-background; } |