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/tooltips.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/tooltips.scss')
-rw-r--r-- | src/sass/settings/tooltips.scss | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/sass/settings/tooltips.scss b/src/sass/settings/tooltips.scss index 2d298ef8..ffc24ab8 100644 --- a/src/sass/settings/tooltips.scss +++ b/src/sass/settings/tooltips.scss @@ -2,9 +2,10 @@ // Tooltips // ========================================================================== -$plyr-tooltip-bg: rgba(#fff, 0.9) !default; -$plyr-tooltip-color: $plyr-color-gray-7 !default; -$plyr-tooltip-padding: ($plyr-control-spacing / 2) !default; -$plyr-tooltip-arrow-size: 4px !default; -$plyr-tooltip-radius: 3px !default; -$plyr-tooltip-shadow: 0 1px 2px rgba(#000, 0.15) !default; +$plyr-tooltip-background: var(--plyr-tooltip-background, rgba(#fff, 0.9)) !default; +$plyr-tooltip-color: var(--plyr-tooltip-color, $plyr-color-gray-700) !default; +$plyr-tooltip-padding: calc(#{$plyr-control-spacing} / 2); +$plyr-tooltip-padding: var(--plyr-tooltip-padding, $plyr-tooltip-padding) !default; +$plyr-tooltip-arrow-size: var(--plyr-tooltip-arrow-size, 4px) !default; +$plyr-tooltip-radius: var(--plyr-tooltip-radius, 3px) !default; +$plyr-tooltip-shadow: var(--plyr-tooltip-shadow, 0 1px 2px rgba(0, 0, 0, 0.15)) !default; |