Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(inputs): clockface 4 updates #880

Merged
merged 1 commit into from
Oct 26, 2022
Merged

feat(inputs): clockface 4 updates #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Components/Dropdowns/Dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ $dropdown-item--padding-v: $cf-space-2xs;
}

.cf-dropdown-item.active:not(.cf-dropdown-item__disabled) {
background-color: $cf-martinique;
background-color: #2A2649;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we not have a color variable for this color?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Design team will be sending it to me after this week, basically, i'll be going through and deleting old colors and adding new ones with their names, and I thought I can just address this then (i'll be doing a global hex search to replace any hard coded values)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha!

border: 1px $cf-lavender solid;
border-radius: $cf-border;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Inputs/Composed/RangeSlider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ $slider-hover: $g17-whisper;
@include rangeSliderColorModifier($g7-graphite, $g8-storm, $g9-mountain);
}
.cf-range-slider__primary {
@include rangeSliderColorModifier($c-pool, $c-laser, $c-hydrogen);
@include rangeSliderColorModifier($cf-lavender, $cf-lavender, $cf-lavender);
}
.cf-range-slider__secondary {
@include rangeSliderColorModifier($c-star, $c-comet, $c-potassium);
Expand Down
8 changes: 1 addition & 7 deletions src/Components/Inputs/Input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@
color: $cf-input-text--default;
border: $cf-border solid $cf-input-border--default;

&:hover {
background-color: $cf-input-background--hover;
border-color: $cf-input-border--hover;
color: $cf-input-text--hover;
}

&:focus {
background-color: $cf-input-background--focused;
border-color: $cf-input-border--focused;
Expand Down Expand Up @@ -193,7 +187,7 @@ alternate css for the other sizes */
left: 50%;
transform: translate(-50%, -50%) scale(1.5, 1.5);
border-radius: 50%;
background: $cf-input-border--focused;
background: $cf-lavender;
z-index: 2;
opacity: 0;
transition: opacity $cf-transition-default, transform $cf-transition-default;
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Inputs/StatusIndicator.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
*/

.cf-status-indicator__valid {
color: $c-rainforest;
color: $cf-green;
}

.cf-status-indicator__error {
Expand Down
3 changes: 2 additions & 1 deletion src/Components/Inputs/Toggle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}

.cf-toggle__checked & {
background: $c-pool;
background: $cf-lavender;

.cf-toggle--indicator {
opacity: 1;
Expand Down Expand Up @@ -103,6 +103,7 @@
width: 100%;
height: 100%;
transform: translate(-50%, -50%) scale(0.333);
outline: rgba(0,0,0, 0.2) solid 1px;
}

.cf-toggle--icon {
Expand Down
7 changes: 3 additions & 4 deletions src/Components/SlideToggle/SlideToggle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ $slide-toggle--gap: 3px;
transform $cf-transition-default;
transform: translate(0, -50%);
border-radius: 50%;
box-shadow: 0 0 $slide-toggle--gap ($slide-toggle--gap * 0.5)
rgba($cf-grey-5, 0.25);
background-color: $cf-grey-75;
left: 10%;

Expand All @@ -62,6 +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;
}

/*
Expand Down Expand Up @@ -123,7 +122,7 @@ $slide-toggle--gap: 3px;
.cf-slide-toggle {
&.cf-slide-toggle-default,
&.cf-slide-toggle-primary {
@include slideToggleColorModifier($c-pool);
@include slideToggleColorModifier($cf-lavender);
}
&.cf-slide-toggle-secondary {
@include slideToggleColorModifier($c-star);
Expand All @@ -132,7 +131,7 @@ $slide-toggle--gap: 3px;
@include slideToggleColorModifier($c-rainforest);
}
&.cf-slide-toggle-danger {
@include slideToggleColorModifier($c-curacao);
@include slideToggleColorModifier($cf-carnation);
}
&.cf-slide-toggle-warning {
@include slideToggleColorModifier($c-pineapple);
Expand Down
10 changes: 6 additions & 4 deletions src/Styles/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ $cf-white: #ffffff;

// Brand Colors
$cf-turquoise: #5ee4e4;
$cf-lavender: #c77bea;
$cf-lavender: #9394FF;
$cf-hot-pink: #f863b0;
$cf-chartreuse: #d6f622;

$cf-green: #53E51A;

// Utility Colors
$cf-lime-green: #51d91c;
$cf-carnation: #e65b5b;
Expand Down Expand Up @@ -335,9 +337,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: $c-fire;
$cf-input-border--error-hover: $c-fire;
$cf-input-border--error-focused: $c-fire;
$cf-input-border--error: $cf-carnation;
$cf-input-border--error-hover: $cf-carnation;
$cf-input-border--error-focused: $cf-carnation;

$cf-input--field-z: 1;
$cf-input--shadow-z: $cf-input--field-z + 1;
Expand Down
1 change: 1 addition & 0 deletions src/Types/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ export enum ButtonType {
}

export enum InfluxColors {
Lavender = '#9394FF',
// Grey
Grey5 = '#07070e',
Grey15 = '#1a1a2a',
Expand Down
2 changes: 1 addition & 1 deletion src/Utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export const generateRangeSliderTrackFillStyle = (

const fillColor = {
default: InfluxColors.Graphite,
primary: InfluxColors.Pool,
primary: InfluxColors.Lavender,
secondary: InfluxColors.Star,
success: InfluxColors.Rainforest,
warning: InfluxColors.Pineapple,
Expand Down