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

fix: css: global css variable name alignment with design specification #625

Merged
merged 2 commits into from
May 25, 2023
Merged

fix: css: global css variable name alignment with design specification #625

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6dadad
fix: css: global css variable name alignment with design specification
dkilgore-eightfold May 23, 2023
58124a0
Merge branch 'main' into dkilgore-eightfold/global-css-variable-align…
dkilgore-eightfold May 24, 2023
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
34 changes: 16 additions & 18 deletions src/components/Avatar/Avatar.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,26 +102,24 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
hashingFunction: () => 0,
size: '32px',
outline: {
// outlineColor: 'var(--green-color-60)',
outlineOffset: '1px',
// outlineStyle: 'solid',
outlineWidth: '2px',
},
statusItems: {
[StatusItemsPosition.Bottom]: {
...statusItemProps,
ariaLabel: 'Clock icon',
backgroundColor: 'var(--green-color-20)',
color: 'var(--green-color-70)',
backgroundColor: 'var(--green-background2-color)',
color: 'var(--green-secondary-color)',
wrapperStyle: { padding: '2px' },
path: IconName.mdiHome,
size: '6px',
},
[StatusItemsPosition.TopRight]: {
...statusItemProps,
ariaLabel: 'Pencil icon',
backgroundColor: 'var(--green-color-20)',
color: 'var(--green-color-70)',
backgroundColor: 'var(--green-background2-color)',
color: 'var(--green-secondary-color)',
wrapperStyle: { padding: '2px' },
path: IconName.mdiPencil,
size: '6px',
Expand All @@ -134,7 +132,7 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
fontSize: '48px',
hashingFunction: () => 0,
outline: {
outlineColor: 'var(--blue-color-60)',
outlineColor: 'var(--blue-tertiary-color)',
outlineOffset: '2px',
outlineStyle: 'solid',
outlineWidth: '4px',
Expand All @@ -143,11 +141,11 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
[StatusItemsPosition.TopRight]: {
...statusItemProps,
ariaLabel: 'Pencil icon',
backgroundColor: 'var(--red-color-20)',
color: 'var(--red-color-70)',
backgroundColor: 'var(--red-background2-color)',
color: 'var(--red-secondary-color)',
onClick: () => alert('Clicked pencil icon'),
outline: {
outlineColor: 'var(--red-color-60)',
outlineColor: 'var(--red-tertiary-color)',
outlineOffset: '0px',
outlineStyle: 'solid',
outlineWidth: '2px',
Expand All @@ -156,8 +154,8 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
[StatusItemsPosition.Bottom]: {
...statusItemProps,
ariaLabel: 'Clock icon',
backgroundColor: 'var(--grey-color-10)',
color: 'var(--grey-color-70)',
backgroundColor: 'var(--grey-background1-color)',
color: 'var(--grey-secondary-color)',
onClick: () => alert('Clicked clock icon'),
outline: {},
path: IconName.mdiClock,
Expand Down Expand Up @@ -193,28 +191,28 @@ const Avatar_StatusItem_Story: ComponentStory<typeof Avatar> = (args) => {
[StatusItemsPosition.Left]: {
...statusItemProps,
ariaLabel: 'Magnify icon',
backgroundColor: 'var(--blue-color-20)',
backgroundColor: 'var(--blue-background2-color)',
onClick: () => alert('Clicked magnify icon'),
path: IconName.mdiMagnify,
},
[StatusItemsPosition.TopLeft]: {
...statusItemProps,
ariaLabel: 'Clock icon',
backgroundColor: 'var(--red-color-30)',
backgroundColor: 'var(--red-background3-color)',
onClick: () => alert('Clicked clock icon'),
path: IconName.mdiClock,
text: '3000',
},
[StatusItemsPosition.Top]: {
...statusItemProps,
backgroundColor: 'var(--red-color-30)',
backgroundColor: 'var(--red-background3-color)',
path: IconName.mdiBell,
text: '4',
textMaxLength: 2,
},
[StatusItemsPosition.Right]: {
...statusItemProps,
backgroundColor: 'var(--blue-color-20)',
backgroundColor: 'var(--blue-background2-color)',
path: IconName.mdiCalendar,
text: '20',
alignIcon: StatusItemIconAlign.Left,
Expand Down Expand Up @@ -267,7 +265,7 @@ Avatar_Icon.args = {
path: IconName.mdiBell,
},
style: {
backgroundColor: 'var(--accent-color-20)',
backgroundColor: 'var(--accent-background2-color)',
},
};

Expand All @@ -284,7 +282,7 @@ Avatar_Round_Icon.args = {
path: IconName.mdiBell,
},
style: {
backgroundColor: 'var(--accent-color-20)',
backgroundColor: 'var(--accent-background2-color)',
},
type: 'round',
};
Expand Down
4 changes: 2 additions & 2 deletions src/components/Avatar/Avatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ const MinStatusItemFontSize: number = 12;
const StatusItemFontDiff: string = '2px';

const StatusItemOutlineDefaults: React.CSSProperties = {
outlineColor: 'var(--grey-color-80)',
outlineColor: 'var(--grey-color)',
outlineOffset: '0px',
outlineStyle: 'solid',
outlineWidth: '2px',
};

const AvatarOutlineDefaults: React.CSSProperties = {
outlineColor: 'var(--green-color-60)',
outlineColor: 'var(--green-tertiary-color)',
outlineOffset: '2px',
outlineStyle: 'solid',
outlineWidth: '4px',
Expand Down
4 changes: 2 additions & 2 deletions src/components/Avatar/Avatar.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export interface StatusItemsProps extends IconProps {
/**
* Status item outline
*
* Defaults when `outline` is truthy are `{ outlineColor: 'var(--grey-color-80)', outlineOffset: '0px', outlineStyle: 'solid', outlineWidth: '2px' }`
* Defaults when `outline` is truthy are `{ outlineColor: 'var(--grey-color)', outlineOffset: '0px', outlineStyle: 'solid', outlineWidth: '2px' }`
*/
outline?: AvatarOutlineProps;
/**
Expand Down Expand Up @@ -124,7 +124,7 @@ export interface BaseAvatarProps extends OcBaseProps<HTMLDivElement> {
/**
* Avatar outline
*
* Defaults when `outline` is truthy are `{ outlineColor: 'var(--green-color-60)', outlineOffset: '2px', outlineStyle: 'solid', outlineWidth: '4px' }`
* Defaults when `outline` is truthy are `{ outlineColor: 'var(--green-tertiary-color)', outlineOffset: '2px', outlineStyle: 'solid', outlineWidth: '4px' }`
*/
outline?: AvatarOutlineProps;
/**
Expand Down
2 changes: 1 addition & 1 deletion src/components/Avatar/Styles/group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
}

&-max-count {
background-color: var(--grey-color-20);
background-color: var(--grey-background2-color);
color: var(--text-secondary-color);
}
}
Expand Down
24 changes: 12 additions & 12 deletions src/components/Avatar/avatar.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,51 +11,51 @@
justify-content: center;

&.red {
background-color: var(--red-color-60);
background-color: var(--red-tertiary-color);
}

&.orange {
background-color: var(--orange-color-60);
background-color: var(--orange-tertiary-color);
}

&.red-orange {
background-color: var(--redorange-color-60);
background-color: var(--redorange-tertiary-color);
}

&.yellow {
background-color: var(--yellow-color-60);
background-color: var(--yellow-tertiary-color);
}

&.yellow-green {
background-color: var(--yellowgreen-color-60);
background-color: var(--yellowgreen-tertiary-color);
}

&.green {
background-color: var(--green-color-60);
background-color: var(--green-tertiary-color);
}

&.blue-green {
background-color: var(--bluegreen-color-60);
background-color: var(--bluegreen-tertiary-color);
}

&.blue {
background-color: var(--blue-color-60);
background-color: var(--blue-tertiary-color);
}

&.blue-violet {
background-color: var(--blueviolet-color-60);
background-color: var(--blueviolet-tertiary-color);
}

&.violet {
background-color: var(--violet-color-60);
background-color: var(--violet-tertiary-color);
}

&.violet-red {
background-color: var(--violetred-color-60);
background-color: var(--violetred-tertiary-color);
}

&.grey {
background-color: var(--grey-color-60);
background-color: var(--grey-tertiary-color);
}
}

Expand Down
86 changes: 49 additions & 37 deletions src/components/Button/button.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
&:after {
animation: $motion-duration-fast $motion-easing-easeinout 1
nudgeRingMedium;
border: $space-xxs solid var(--primary-color-20);
border: $space-xxs solid var(--primary-background2-color);
border-radius: 100%;
content: '';
height: 14px;
Expand Down Expand Up @@ -484,11 +484,11 @@
}

.button-primary {
--button-counter-default-background-color: var(--accent-color-10);
--button-counter-hover-background-color: var(--accent-color-20);
--button-counter-checked-background-color: var(--accent-color-10);
--button-counter-focus-background-color: var(--accent-color-10);
--button-counter-active-background-color: var(--accent-color-10);
--button-counter-default-background-color: var(--accent-background1-color);
--button-counter-hover-background-color: var(--accent-background2-color);
--button-counter-checked-background-color: var(--accent-background1-color);
--button-counter-focus-background-color: var(--accent-background1-color);
--button-counter-active-background-color: var(--accent-background1-color);

color: var(--button-primary-text-color);
background-color: var(--button-primary-background-color);
Expand Down Expand Up @@ -528,11 +528,11 @@
}

.button-secondary {
--button-counter-default-background-color: var(--primary-color-20);
--button-counter-hover-background-color: var(--primary-color-20);
--button-counter-checked-background-color: var(--primary-color-10);
--button-counter-focus-background-color: var(--primary-color-20);
--button-counter-active-background-color: var(--primary-color-10);
--button-counter-default-background-color: var(--primary-background2-color);
--button-counter-hover-background-color: var(--primary-background2-color);
--button-counter-checked-background-color: var(--primary-background1-color);
--button-counter-focus-background-color: var(--primary-background2-color);
--button-counter-active-background-color: var(--primary-background1-color);

color: var(--button-secondary-text-color);
background-color: var(--button-secondary-background-color);
Expand Down Expand Up @@ -606,12 +606,16 @@
}

.button-primary-disruptive {
--button-counter-default-background-color: var(--disruptive-color-10);
--button-counter-hover-background-color: var(--disruptive-color-20);
--button-counter-checked-background-color: var(--disruptive-color-10);
--button-counter-focus-background-color: var(--disruptive-color-10);
--button-counter-active-background-color: var(--disruptive-color-10);
--button-counter-default-text-color: var(--disruptive-color-80);
--button-counter-default-background-color: var(
--disruptive-background1-color
);
--button-counter-hover-background-color: var(--disruptive-background2-color);
--button-counter-checked-background-color: var(
--disruptive-background1-color
);
--button-counter-focus-background-color: var(--disruptive-background1-color);
--button-counter-active-background-color: var(--disruptive-background1-color);
--button-counter-default-text-color: var(--disruptive-color);

color: var(--button-primary-disruptive-text-color);
background-color: var(--button-primary-disruptive-background-color);
Expand All @@ -637,12 +641,16 @@
}

.button-secondary-disruptive {
--button-counter-default-background-color: var(--disruptive-color-20);
--button-counter-hover-background-color: var(--disruptive-color-20);
--button-counter-checked-background-color: var(--disruptive-color-10);
--button-counter-focus-background-color: var(--disruptive-color-20);
--button-counter-active-background-color: var(--disruptive-color-10);
--button-counter-default-text-color: var(--disruptive-color-80);
--button-counter-default-background-color: var(
--disruptive-background2-color
);
--button-counter-hover-background-color: var(--disruptive-background2-color);
--button-counter-checked-background-color: var(
--disruptive-background1-color
);
--button-counter-focus-background-color: var(--disruptive-background2-color);
--button-counter-active-background-color: var(--disruptive-background1-color);
--button-counter-default-text-color: var(--disruptive-color);

color: var(--button-secondary-disruptive-text-color);
background-color: var(--button-secondary-disruptive-background-color);
Expand Down Expand Up @@ -670,11 +678,11 @@
}

.button-default {
--button-counter-default-background-color: var(--primary-color-20);
--button-counter-hover-background-color: var(--primary-color-20);
--button-counter-checked-background-color: var(--primary-color-10);
--button-counter-focus-background-color: var(--primary-color-20);
--button-counter-active-background-color: var(--primary-color-10);
--button-counter-default-background-color: var(--primary-background2-color);
--button-counter-hover-background-color: var(--primary-background2-color);
--button-counter-checked-background-color: var(--primary-background1-color);
--button-counter-focus-background-color: var(--primary-background2-color);
--button-counter-active-background-color: var(--primary-background1-color);

color: var(--button-default-text-color);
background-color: var(--button-default-background-color);
Expand Down Expand Up @@ -714,12 +722,16 @@
}

.button-disruptive {
--button-counter-default-background-color: var(--disruptive-color-20);
--button-counter-hover-background-color: var(--disruptive-color-20);
--button-counter-checked-background-color: var(--disruptive-color-10);
--button-counter-focus-background-color: var(--disruptive-color-20);
--button-counter-active-background-color: var(--disruptive-color-10);
--button-counter-default-text-color: var(--disruptive-color-80);
--button-counter-default-background-color: var(
--disruptive-background2-color
);
--button-counter-hover-background-color: var(--disruptive-background2-color);
--button-counter-checked-background-color: var(
--disruptive-background1-color
);
--button-counter-focus-background-color: var(--disruptive-background2-color);
--button-counter-active-background-color: var(--disruptive-background1-color);
--button-counter-default-text-color: var(--disruptive-color);

color: var(--button-default-disruptive-text-color);
background-color: var(--button-default-disruptive-background-color);
Expand Down Expand Up @@ -1289,15 +1301,15 @@
&.button-secondary-disruptive {
&.focus-visible,
&:focus-visible {
color: var(--disruptive-color-80);
color: var(--disruptive-color);
}
}

&.button-disruptive {
&.focus-visible,
&:focus-visible {
background-color: var(--disruptive-color-10);
color: var(--disruptive-color-80);
background-color: var(--disruptive-background1-color);
color: var(--disruptive-color);
}
}

Expand Down
Loading