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/colors.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/colors.scss')
| -rw-r--r-- | src/sass/settings/colors.scss | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/sass/settings/colors.scss b/src/sass/settings/colors.scss index e3883eef..f1364905 100644 --- a/src/sass/settings/colors.scss +++ b/src/sass/settings/colors.scss @@ -2,16 +2,16 @@ // Colors // ========================================================================== -$plyr-color-main: hsl(198, 100%, 50%) !default; +$plyr-color-main: var(--plyr-color-main, hsl(198, 100%, 50%)) !default; // Grayscale -$plyr-color-gray-9: hsl(210, 15%, 16%); -$plyr-color-gray-8: lighten($plyr-color-gray-9, 9%); -$plyr-color-gray-7: lighten($plyr-color-gray-8, 9%); -$plyr-color-gray-6: lighten($plyr-color-gray-7, 9%); -$plyr-color-gray-5: lighten($plyr-color-gray-6, 9%); -$plyr-color-gray-4: lighten($plyr-color-gray-5, 9%); -$plyr-color-gray-3: lighten($plyr-color-gray-4, 9%); -$plyr-color-gray-2: lighten($plyr-color-gray-3, 9%); -$plyr-color-gray-1: lighten($plyr-color-gray-2, 9%); -$plyr-color-gray-0: lighten($plyr-color-gray-1, 9%); +$plyr-color-gray-900: hsl(216, 15%, 16%) !default; +$plyr-color-gray-800: hsl(216, 15%, 25%) !default; +$plyr-color-gray-700: hsl(216, 15%, 34%) !default; +$plyr-color-gray-600: hsl(216, 15%, 43%) !default; +$plyr-color-gray-500: hsl(216, 15%, 52%) !default; +$plyr-color-gray-400: hsl(216, 15%, 61%) !default; +$plyr-color-gray-300: hsl(216, 15%, 70%) !default; +$plyr-color-gray-200: hsl(216, 15%, 79%) !default; +$plyr-color-gray-100: hsl(216, 15%, 88%) !default; +$plyr-color-gray-50: hsl(216, 15%, 97%) !default; |