Skip to content

feat(Clockface 4): labels #887

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

Merged
ChitlangeSahas merged 4 commits into from
Nov 4, 2022
Merged

feat(Clockface 4): labels #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f0379b
chore: consolidate cf-carnation
ChitlangeSahas Nov 3, 2022
d1bd4da
chore: consolidate cf-martinique
ChitlangeSahas Nov 3, 2022
67781dc
chore: update label background color
ChitlangeSahas Nov 4, 2022
6a47797
chore: prettier
ChitlangeSahas Nov 4, 2022
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/Accordion/Accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
border-radius: 0px;

&:hover {
background-color: $cf-martinique;
background-color: $cf-dark-lavender;
}
}

Expand Down
9 changes: 2 additions & 7 deletions src/Components/Button/Button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
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: #2A2649;
background-color: #2a2649;
border: 1px $cf-lavender solid;
border-radius: $cf-border;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Components/Inputs/Composed/RangeSlider.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Inputs/Toggle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/Components/SlideToggle/SlideToggle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand Down Expand Up @@ -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);
Expand Down
25 changes: 14 additions & 11 deletions src/Styles/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-----------------------------------------------------------------------------
*/

// New Greys
// Greys
$cf-grey-1: #0e101f;
$cf-grey-2: #1a1c2b;
$cf-grey-3: #232533;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
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 @@ -180,6 +180,7 @@ export enum ButtonType {

export enum InfluxColors {
Lavender = '#9394FF',
Grey1 = '#0e101f',
// 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 @@ -119,7 +119,7 @@ export const generateLabelStyle = (

const color =
calculateTextColorFromBackground(labelColor) === 'dark'
? InfluxColors.Kevlar
? InfluxColors.Grey1
: InfluxColors.White

return {
Expand Down