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: add background-muted color to design system #29117

Merged
merged 3 commits into from
Dec 12, 2024
+8 −0
Merged

feat: add background-muted color to design system #29117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8074ac3
chore: updating design tokens and adding background muted
georgewrmarshall Dec 11, 2024
54bf90e
chore: updating failing snapshots
georgewrmarshall Dec 11, 2024
526b29f
Merge branch 'main' into fix/design-tokens-4.2
georgewrmarshall Dec 12, 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
5 changes: 5 additions & 0 deletions ui/components/component-library/box/box.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,11 @@ export const BackgroundColorStory = () => {
BackgroundColor.backgroundAlternative
</Text>
</Box>
<Box padding={3} backgroundColor={BackgroundColor.backgroundMuted}>
<Text color={TextColor.textDefault}>
BackgroundColor.backgroundMuted
</Text>
</Box>
Comment on lines +393 to +397
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updating Box component stories

Screenshot 2024-12-12 at 10 58 11 AM Screenshot 2024-12-12 at 10 58 25 AM

<Box padding={3} backgroundColor={BackgroundColor.overlayDefault}>
<Text color={TextColor.overlayInverse}>
BackgroundColor.overlayDefault
Expand Down
1 change: 1 addition & 0 deletions ui/css/design-system/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
$color-map: (
'background-default': --color-background-default,
'background-alternative': --color-background-alternative,
'background-muted': --color-background-muted,
'background-hover': --color-background-hover,
'background-pressed': --color-background-pressed,
'text-default': --color-text-default,
Expand Down
2 changes: 2 additions & 0 deletions ui/helpers/constants/design-system.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
export enum Color {
backgroundDefault = 'background-default',
backgroundAlternative = 'background-alternative',
backgroundMuted = 'background-muted',
textDefault = 'text-default',
textAlternative = 'text-alternative',
textMuted = 'text-muted',
Expand Down Expand Up @@ -54,6 +55,7 @@ export enum Color {
export enum BackgroundColor {
backgroundDefault = 'background-default',
backgroundAlternative = 'background-alternative',
backgroundMuted = 'background-muted',
backgroundHover = 'background-hover',
backgroundPressed = 'background-pressed',
overlayDefault = 'overlay-default',
Expand Down
Loading