diff --git a/src/Components/Accordion/Accordion.scss b/src/Components/Accordion/Accordion.scss index aa464684..af04faf5 100644 --- a/src/Components/Accordion/Accordion.scss +++ b/src/Components/Accordion/Accordion.scss @@ -122,7 +122,7 @@ border-radius: 0px; &:hover { - background-color: $cf-martinique; + background-color: $cf-dark-lavender; } } diff --git a/src/Components/Button/Button.scss b/src/Components/Button/Button.scss index c7d96484..0a765c5f 100644 --- a/src/Components/Button/Button.scss +++ b/src/Components/Button/Button.scss @@ -242,15 +242,10 @@ .cf-button-warning, .cf-button-danger { - @include buttonColorModifier( - $cf-carnation, - $cf-carnation, - $cf-grey-1, - $cf-grey-1 - ); + @include buttonColorModifier($cf-red, $cf-red, $cf-grey-1, $cf-grey-1); &:focus { - @include focus-shadow($cf-carnation); + @include focus-shadow($cf-red); } } diff --git a/src/Components/Dropdowns/Dropdown.scss b/src/Components/Dropdowns/Dropdown.scss index 7646547f..ff50f89d 100644 --- a/src/Components/Dropdowns/Dropdown.scss +++ b/src/Components/Dropdowns/Dropdown.scss @@ -304,7 +304,7 @@ $dropdown-item--padding-v: $cf-space-2xs; } .cf-dropdown-item.active:not(.cf-dropdown-item__disabled) { - background-color: #2A2649; + background-color: #2a2649; border: 1px $cf-lavender solid; border-radius: $cf-border; } diff --git a/src/Components/Inputs/Composed/RangeSlider.scss b/src/Components/Inputs/Composed/RangeSlider.scss index 3c53b3f9..2ffc86ae 100644 --- a/src/Components/Inputs/Composed/RangeSlider.scss +++ b/src/Components/Inputs/Composed/RangeSlider.scss @@ -50,7 +50,7 @@ $slider-hover: $g17-whisper; width: $slider-handle-height; border-radius: $cf-radius; background: $slider-handle; - margin-top: -(($slider-handle-height*0.5) - ($slider-track-height*0.5)); + margin-top: -(($slider-handle-height * 0.5) - ($slider-track-height * 0.5)); &:hover, &:focus { @@ -229,7 +229,7 @@ $slider-hover: $g17-whisper; height: $slider-handle-mod-height; width: $slider-handle-mod-height; border-radius: 50%; - margin-top: -(($slider-handle-mod-height*0.5) - ($trackHeight*0.5)); + margin-top: -(($slider-handle-mod-height * 0.5) - ($trackHeight * 0.5)); } &::-moz-range-track { diff --git a/src/Components/Inputs/Toggle.scss b/src/Components/Inputs/Toggle.scss index b690c3ab..60c127bd 100644 --- a/src/Components/Inputs/Toggle.scss +++ b/src/Components/Inputs/Toggle.scss @@ -103,7 +103,7 @@ width: 100%; height: 100%; transform: translate(-50%, -50%) scale(0.333); - outline: rgba(0,0,0, 0.2) solid 1px; + outline: rgba(0, 0, 0, 0.2) solid 1px; } .cf-toggle--icon { diff --git a/src/Components/SlideToggle/SlideToggle.scss b/src/Components/SlideToggle/SlideToggle.scss index 42acfd2b..3b6e3e5f 100644 --- a/src/Components/SlideToggle/SlideToggle.scss +++ b/src/Components/SlideToggle/SlideToggle.scss @@ -60,7 +60,7 @@ $slide-toggle--gap: 3px; .cf-slide-toggle.active .cf-slide-toggle--knob { transform: translate(100%, -50%); background-color: $cf-white; - outline: rgba(0,0,0, 0.2) solid 1px; + outline: rgba(0, 0, 0, 0.2) solid 1px; } /* @@ -131,7 +131,7 @@ $slide-toggle--gap: 3px; @include slideToggleColorModifier($c-rainforest); } &.cf-slide-toggle-danger { - @include slideToggleColorModifier($cf-carnation); + @include slideToggleColorModifier($cf-red); } &.cf-slide-toggle-warning { @include slideToggleColorModifier($c-pineapple); diff --git a/src/Styles/variables.scss b/src/Styles/variables.scss index f6edf65e..a4abf7b5 100644 --- a/src/Styles/variables.scss +++ b/src/Styles/variables.scss @@ -3,7 +3,7 @@ ----------------------------------------------------------------------------- */ -// New Greys +// Greys $cf-grey-1: #0e101f; $cf-grey-2: #1a1c2b; $cf-grey-3: #232533; @@ -14,18 +14,21 @@ $cf-white: #ffffff; // Brand Colors $cf-turquoise: #5ee4e4; -$cf-lavender: #9394FF; -$cf-hot-pink: #f863b0; +$cf-lavender: #9394ff; +$cf-pink: #f863b0; $cf-chartreuse: #d6f622; -$cf-green: #53E51A; +$cf-dark-turquoise: #1e3a46; +$cf-dark-lavender: #2a2649; +$cf-dark-pink: #482543; +$cf-dark-chartreuse: #546120; // Utility Colors -$cf-lime-green: #51d91c; -$cf-carnation: #e65b5b; +$cf-green: #53e51a; +$cf-red: #e65b5b; -// Background Colors -$cf-martinique: #332548; +$cf-dark-green: #1b381f; +$cf-dark-red: #311c29; // Greys $cf-grey-5: #07070e; @@ -321,9 +324,9 @@ $cf-input-border--focused: rgba($cf-turquoise, 0.75); $cf-input-border--hover: $g5-pepper; $cf-input-border--disabled: $g4-onyx; -$cf-input-border--error: $cf-carnation; -$cf-input-border--error-hover: $cf-carnation; -$cf-input-border--error-focused: $cf-carnation; +$cf-input-border--error: $cf-red; +$cf-input-border--error-hover: $cf-red; +$cf-input-border--error-focused: $cf-red; $cf-input--field-z: 1; $cf-input--shadow-z: $cf-input--field-z + 1; diff --git a/src/Types/index.tsx b/src/Types/index.tsx index a8fef6bb..b3718168 100644 --- a/src/Types/index.tsx +++ b/src/Types/index.tsx @@ -180,6 +180,7 @@ export enum ButtonType { export enum InfluxColors { Lavender = '#9394FF', + Grey1 = '#0e101f', // Grey Grey5 = '#07070e', Grey15 = '#1a1a2a', diff --git a/src/Utils/index.ts b/src/Utils/index.ts index 569c1ac5..0a893925 100644 --- a/src/Utils/index.ts +++ b/src/Utils/index.ts @@ -119,7 +119,7 @@ export const generateLabelStyle = ( const color = calculateTextColorFromBackground(labelColor) === 'dark' - ? InfluxColors.Kevlar + ? InfluxColors.Grey1 : InfluxColors.White return {