Skip to content

feat: Accordion, Alert, Button Color Updates #826

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

Open
brandenTenbrink wants to merge 2 commits into
base: feat/clockface-color-refactor-master
Choose a base branch
from
Open

feat: Accordion, Alert, Button Color Updates #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a85876c
feat: started the color swap
brandenTenbrink Jul 15, 2022
6891801
more changes to colors
brandenTenbrink Aug 3, 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
6 changes: 3 additions & 3 deletions src/Components/Accordion/Accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
width: 100%;
min-height: $cf-form-lg-height;
border-radius: $cf-radius;
background-color: $cf-grey-25;
background-color: $cf-gray-3;
align-items: center;
outline: none;
padding: $cf-space-s;
Expand Down Expand Up @@ -115,11 +115,11 @@
@extend .cf-accordion--header;
min-height: $cf-form-md-height;
padding: $cf-form-md-padding;
background-color: $cf-grey-15;
background-color: $cf-gray-2;
border-radius: 0px;

&:hover {
background-color: $cf-grey-15;
background-color: $cf-martinique;
}
}

Expand Down
43 changes: 24 additions & 19 deletions src/Components/Alert/Alert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,22 @@ $alert--icon-padding: $cf-marg-d + $cf-marg-a;
width: 100%;
border-radius: $cf-radius - 1px;
padding: $cf-marg-b;
background-color: rgba($g3-castle, 0.85);
}

.cf-alert-content--primary {
background-color: $cf-elephant;
}

.cf-alert-content--success {
background-color: $cf-seaweed;
}

.cf-alert-content--warning {
background-color: $cf-verdun-green;
}

.cf-alert-content--danger {
background-color: $cf-thunder;
}

.cf-alert--has-icon {
Expand All @@ -65,46 +80,36 @@ $alert--icon-padding: $cf-marg-d + $cf-marg-a;
}

/* Color Modifiers */
@mixin alertColorModifier($mainColor, $accentColor, $textColor, $boldColor) {
@mixin alertColorModifier($mainColor, $textColor, $boldColor) {
color: $textColor;

strong {
color: $boldColor;
}

@include gradient-h($mainColor, $accentColor);
}

.cf-alert--default {
@include alertColorModifier($g7-graphite, $g5-pepper, $g13-mist, $g20-white);
background: $mainColor
}

.cf-alert--primary {
@include alertColorModifier($c-ocean, $c-star, $c-hydrogen, $g20-white);
}

.cf-alert--secondary {
@include alertColorModifier($c-comet, $c-star, $c-moonstone, $g20-white);
@include alertColorModifier($cf-turquoise, $cf-turquoise, $cf-white);
}

.cf-alert--success {
@include alertColorModifier(
$c-rainforest,
$c-viridian,
$c-wasabi,
$cf-lime-green,
$cf-lime-green,
$g20-white
);
}

.cf-alert--warning {
@include alertColorModifier($c-pineapple, $c-thunder, $c-sulfur, $g20-white);
@include alertColorModifier($cf-chartreuse, $cf-chartreuse, $g20-white);
}

.cf-alert--danger {
@include alertColorModifier(
$c-dreamsicle,
$c-curacao,
$c-marmelade,
$cf-carnation,
$cf-carnation,
$g20-white
);
}
6 changes: 5 additions & 1 deletion src/Components/Alert/Alert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ export const Alert = forwardRef<AlertRef, Props>(
[`${className}`]: className,
})

const alertContentClassName = classnames('cf-alert--contents', {
[`cf-alert-content--${color}`]: color,
})

return (
<div
className={alertClassName}
Expand All @@ -37,7 +41,7 @@ export const Alert = forwardRef<AlertRef, Props>(
ref={ref}
>
{!!icon && <Icon glyph={icon} className="cf-alert--icon" />}
<div className="cf-alert--contents">{children}</div>
<div className={alertContentClassName}>{children}</div>
</div>
)
}
Expand Down
1 change: 1 addition & 0 deletions src/Components/Alert/Documentation/Alert.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const alertStories = storiesOf('Components/Alert', module).addDecorator(
withKnobs
)

// There is no css stylijng for these unused enums
Copy link
Contributor

@ChitlangeSahas ChitlangeSahas Aug 22, 2022

Choose a reason for hiding this comment

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

Did you mean Styling?

const unusedAlertColorEnium = ['Colorless', 'Tertiary', 'Secondary', 'Default']
const reducedAlertColorEnum = removeUnusedEnumKeyValue(
ComponentColor,
Expand Down
18 changes: 8 additions & 10 deletions src/Components/Button/Button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@
Color Modifiers
------------------------------------------------------------------------------
*/
@mixin buttonColorModifier($bgA, $bgB, $text, $textHover, $tertiary: false) {
@mixin buttonColorModifier($bgColor, $text, $textHover, $tertiary: false) {
color: $text;
@include gradient-diag-up($bgA, $bgB);
background-color: $bgColor;

&:hover {
color: $textHover;
Expand Down Expand Up @@ -185,7 +185,6 @@
&.active,
&.active:hover {
color: $textHover;

&:after {
opacity: $cf-hover-active-opacity;
}
Expand Down Expand Up @@ -213,31 +212,30 @@
.cf-button-default,
.cf-button-secondary {
@include buttonColorModifier(
$cf-button-default-bg,
$cf-button-default-bg,
$cf-gray-3,
$cf-white,
$cf-white
);
}

.cf-button-primary,
.cf-button-success {
@include buttonColorModifier($c-pool, $c-pulsar, $cf-white, $cf-white);
@include buttonColorModifier($cf-turquoise, $cf-gray-1, $cf-gray-1);
}

.cf-button-tertiary {
border: 1px solid $cf-gray-5;
@include buttonColorModifier(
transparent,
transparent,
$cf-grey-65,
$cf-grey-65,
$cf-white,
$cf-white,
true
);
}

.cf-button-warning,
.cf-button-danger {
@include buttonColorModifier($c-ruby, $c-topaz, $cf-white, $cf-white);
@include buttonColorModifier($cf-carnation, $cf-gray-1, $cf-gray-1);
}

.cf-button-colorless {
Expand Down
10 changes: 10 additions & 0 deletions src/Components/Button/Composed/DismissButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,13 @@ button.cf-dismiss-button {
opacity: 1;
}
}

.cf-dismiss-button--primary,
.cf-dismiss-button--success,
.cf-dismiss-button--danger,
.cf-dismiss-button--warning {
&:before,
&:after {
background-color: $cf-gray-1;
}
}
6 changes: 5 additions & 1 deletion src/Components/Button/Composed/DismissButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ export const DismissButton = forwardRef<DismissButtonRef, DismissButtonProps>(
[`${className}`]: className,
})

const dismissButtonClass = classnames(
`cf-dismiss-button--x cf-dismiss-button--${color}`
)

return (
<ButtonBase
tabIndex={tabIndex}
Expand All @@ -71,7 +75,7 @@ export const DismissButton = forwardRef<DismissButtonRef, DismissButtonProps>(
style={style}
ref={ref}
>
<div className="cf-dismiss-button--x" />
<div className={dismissButtonClass} />
</ButtonBase>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/Components/FunnelPage/Documentation/FunnelPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ funnelPageStories.add(
}
accentColorA={
InfluxColors[
select('accentColorA', mapEnumKeys(InfluxColors), 'PurpleX')
select('accentColorA', mapEnumKeys(InfluxColors), 'Lavender')
]
}
accentColorB={
Expand Down
6 changes: 3 additions & 3 deletions src/Components/FunnelPage/Family/FunnelPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ export const FunnelPageRoot = forwardRef<FunnelPageRef, FunnelPageProps>(
children,
pageStyle,
className,
accentColorA = InfluxColors.PurpleX,
accentColorB = InfluxColors.DogwoodRose,
accentColorA = InfluxColors.Lavender,
accentColorB = InfluxColors.HotPink,
enableGraphic = false,
backgroundColor = InfluxColors.CetaceanBlue,
backgroundColor = InfluxColors.Turquoise,
},
ref
) => {
Expand Down
4 changes: 2 additions & 2 deletions src/Components/SubwayNav/SubwayNavStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ export const SubwayNavStep = (props: OwnProps) => {
stepIsReached,
} = props
const iconAndTextColor =
stepIsActive || stepIsReached ? InfluxColors.Pool : InfluxColors.Grey95
stepIsActive || stepIsReached ? InfluxColors.Pool : InfluxColors.Gray6

const glyphFontStyle = {
fontSize: '20px',
}
const completedStepStyle = {color: InfluxColors.Grey95, fontSize: '25px'}
const completedStepStyle = {color: InfluxColors.Gray6, fontSize: '25px'}
const isActiveStepStyle = {...completedStepStyle, fontSize: '20px'}

return (
Expand Down
36 changes: 31 additions & 5 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,34 @@
-----------------------------------------------------------------------------
*/

// Greys
// New Greys
$cf-gray-1: #0E101F;
$cf-gray-2: #1A1C2B;
$cf-gray-3: #232533;
$cf-gray-4: #4B4F62;
$cf-gray-5: #88889B;
$cf-gray-6: #C2C5DB;
$cf-white: #ffffff;

// Brand Colors
$cf-turquoise: #5EE4E4;
$cf-lavender: #C77BEA;
$cf-hot-pink: #F863B0;
$cf-chartreuse: #D6F622;

// Utility Colors
$cf-lime-green: #51D91C;
$cf-carnation: #E65B5B;

// Background Colors
$cf-elephant: #1E3A46;
$cf-martinique: #332548;
$cf-voodoo: #482543;
$cf-verdun-green: #546120;
$cf-seaweed: #1B381F;
$cf-thunder: #311C29;

//Old Greys
$cf-grey-5: #07070e;
$cf-grey-15: #1a1a2a;
$cf-grey-25: #333346;
Expand All @@ -14,7 +41,6 @@ $cf-grey-65: #9e9ead;
$cf-grey-75: #b9b9c5;
$cf-grey-85: #d5d5dd;
$cf-grey-95: #f1f1f3;
$cf-white: #ffffff;

// Neutrals
$g0-obsidian: $cf-grey-5;
Expand Down Expand Up @@ -90,17 +116,17 @@ $c-daisy: #fff6b8;
$c-banana: #fffdde;

// Marketing Brand Colors
$c-chartreuse: #d6f622;
$c-magenta: #bf2fe5;
$c-deeppurple: #13002d;
$c-
Copy link
Contributor

@ChitlangeSahas ChitlangeSahas Aug 22, 2022

Choose a reason for hiding this comment

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

Seems like an extra newline sneaked in here?

: #13002d;
$c-galaxy: #9394ff;
$c-pulsar: #513cc6;

/*
State change variables
*/

$cf-hover-active-opacity: 0.08;
$cf-hover-active-opacity: 0.15;
$cf-disabled-opacity: 0.5;

/*
Expand Down
Loading