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(ProductSwitcher): Use color tokens #1373

Merged
merged 2 commits into from
Sep 30, 2024
Merged

fix(ProductSwitcher): Use color tokens #1373

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
001c0d4
Use tokens for colors
jakubsikora Sep 30, 2024
382fa26
add border color
jakubsikora Sep 30, 2024
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 packages/react-components/src/components/ProductSwitcher/ProductSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export const ProductSwitcher: FC<ProductSwitcherProps> = ({
<Icon
size="xlarge"
source={TextLogoFull}
customColor="var(--content-locked-white)"
customColor="var(--content-basic-primary)"
/>
</a>
</div>
Expand Down
2 changes: 2 additions & 0 deletions ...ages/react-components/src/components/ProductSwitcher/components/ProductRow/ProductRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const ProductRow: FC<IProps> = ({
icon,
iconColor,
backgroundColors,
borderColor,
notificationCount,
name,
url,
Expand Down Expand Up @@ -56,6 +57,7 @@ export const ProductRow: FC<IProps> = ({
iconColor={iconColor}
expired={expired}
backgroundColors={backgroundColors}
borderColor={borderColor}
notificationCount={notificationCount}
withBorder={isActive}
/>
Expand Down
2 changes: 1 addition & 1 deletion ...-components/src/components/ProductSwitcher/components/ProductTile/ProductTile.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $base-class: 'product-tile';
}

.outer-border {
border: solid 2px rgb(255 255 255 / 80%);
border: solid 2px var(--content-basic-primary);
border-radius: 12px;
padding: 3px;
}
Expand Down
9 changes: 8 additions & 1 deletion ...es/react-components/src/components/ProductSwitcher/components/ProductTile/ProductTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ import styles from './ProductTile.module.scss';

type IProps = Pick<
ProductOption,
'icon' | 'notificationCount' | 'backgroundColors' | 'expired' | 'iconColor'
| 'icon'
| 'notificationCount'
| 'backgroundColors'
| 'expired'
| 'iconColor'
| 'borderColor'
> & {
isMainProduct?: boolean;
withBorder?: boolean;
Expand All @@ -23,6 +28,7 @@ export const ProductTile: FC<IProps> = ({
iconColor,
expired,
backgroundColors,
borderColor,
notificationCount,
withBorder = false,
isMainProduct = false,
Expand Down Expand Up @@ -55,6 +61,7 @@ export const ProductTile: FC<IProps> = ({
background: expired
? 'var(--surface-moderate-default)'
: backgroundColors.main,
border: borderColor ? `1px solid ${borderColor}` : '',
}}
>
{notificationCount && !expired ? (
Expand Down
1 change: 1 addition & 0 deletions packages/react-components/src/components/ProductSwitcher/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ export const ProductSwitcherProducts: ProductOption[] = [
iconColor: 'var(--content-locked-black)',
withDivider: true,
url: '',
borderColor: 'var(--border-basic-secondary)',
},
];

Expand Down
1 change: 1 addition & 0 deletions packages/react-components/src/components/ProductSwitcher/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export interface ProductOption {
};
withDivider?: boolean;
url: string;
borderColor?: string;
}

export type ProductData = {
Expand Down
Loading