Skip to content

Commit

Permalink
chore[DST-127]: replace fill colors with text colors (#3261)
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahgm authored Aug 10, 2023
1 parent 52d08fd commit 9a19dba
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 17 deletions.
6 changes: 6 additions & 0 deletions .changeset/cold-mayflies-dream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@marigold/docs": patch
"@marigold/theme-b2b": patch
---

chore[DST-131]: replace fill colors with text colors
2 changes: 1 addition & 1 deletion docs/content/components/content/icon/icon-fill.demo.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { DesignTicket } from '@marigold/icons';

export default () => <DesignTicket className="fill-fill-info" />;
export default () => <DesignTicket className="text-text-info" />;
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Info } from '@marigold/icons';
export default () => (
<Tooltip.Trigger>
<Button>
<Info className="fill-fill-info" />
<Info className="text-text-info" />
</Button>
<Tooltip>Tooltip</Tooltip>
</Tooltip.Trigger>
Expand Down
2 changes: 1 addition & 1 deletion themes/theme-b2b/src/components/Label.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ import { ThemeComponent, cva } from '@marigold/system';
export const Label: ThemeComponent<'Label'> = {
container: cva('group-disabled/field:text-text-disabled text-sm '),
indicator: cva(
'group-required/field:fill-fill-required group-required/field:block'
'group-required/field:text-text-required group-required/field:block'
),
};
6 changes: 3 additions & 3 deletions themes/theme-b2b/src/components/Message.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ export const Message: ThemeComponent<'Message'> = {
icon: cva('h-4 w-4', {
variants: {
variant: {
warning: 'text-fill-warning',
info: 'text-fill-info',
error: 'text-fill-error',
warning: 'text-text-warning',
info: 'text-text-info',
error: 'text-text-error',
},
},
}),
Expand Down
17 changes: 6 additions & 11 deletions themes/theme-b2b/src/tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,13 @@ export const colors = {

// State
disabled: brand.secondary[400],
error: red[500],
hover: brand.secondary[800],

// Status
error: red[500],
info: blue[500],
warning: yellow[500],
required: red[500],
},

// Background
Expand Down Expand Up @@ -209,14 +214,4 @@ export const colors = {
// Status
error: red[500],
},

// Fill
// ---------------
fill: {
// Status
required: red[500],
error: red[500],
info: blue[500],
warning: yellow[500],
},
};

3 comments on commit 9a19dba

@vercel
Copy link

@vercel vercel bot commented on 9a19dba Aug 10, 2023

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

marigold-storybook – ./

marigold-latest.vercel.app
marigold-storybook-marigold.vercel.app
marigold-storybook-git-main-marigold.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 9a19dba Aug 10, 2023

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

marigold-docs – ./

marigold-docs-marigold.vercel.app
marigold-docs.vercel.app
marigold-docs-git-main-marigold.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 9a19dba Aug 10, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.