diff options
| author | Danielh112 <Daniel@sbgsportssoftware.com> | 2020-08-18 11:29:25 +0100 |
|---|---|---|
| committer | Danielh112 <Daniel@sbgsportssoftware.com> | 2020-08-18 11:29:25 +0100 |
| commit | f7e9ee56d2ed5447f59e5548f005fabdab2f0a72 (patch) | |
| tree | a16300fa62e68b3310ae96e36dba65981f0024ef /src/sass/settings/progress.scss | |
| parent | 22af7f16ea4a4269321d29242d63ec23718c92da (diff) | |
| parent | 423b7b276f1572eb666de32094a9aacd32e87d18 (diff) | |
| download | plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.lz plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.tar.xz plyr-f7e9ee56d2ed5447f59e5548f005fabdab2f0a72.zip | |
Fix merge conflicts
Diffstat (limited to 'src/sass/settings/progress.scss')
| -rw-r--r-- | src/sass/settings/progress.scss | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/sass/settings/progress.scss b/src/sass/settings/progress.scss index 10b6ebb7..4e5105f0 100644 --- a/src/sass/settings/progress.scss +++ b/src/sass/settings/progress.scss @@ -3,9 +3,12 @@ // ========================================================================== // Loading -$plyr-progress-loading-size: 25px !default; -$plyr-progress-loading-bg: rgba($plyr-color-gray-9, 0.6) !default; +$plyr-progress-loading-size: var(--plyr-progress-loading-size, 25px) !default; +$plyr-progress-loading-background: var(--plyr-progress-loading-background, rgba($plyr-color-gray-900, 0.6)) !default; // Buffered -$plyr-video-progress-buffered-bg: rgba(#fff, 0.25) !default; -$plyr-audio-progress-buffered-bg: rgba($plyr-color-gray-2, 0.66) !default; +$plyr-video-progress-buffered-background: var(--plyr-video-progress-buffered-background, rgba(#fff, 0.25)) !default; +$plyr-audio-progress-buffered-background: var( + --plyr-audio-progress-buffered-background, + rgba($plyr-color-gray-200, 0.6) +) !default; |