From a9a3da9b323cae4d3d3e3ddb7c858d90ed8b1420 Mon Sep 17 00:00:00 2001 From: Sara Hill Date: Fri, 3 Nov 2023 10:38:55 -0700 Subject: [PATCH 1/5] fix colors --- polaris-react/src/components/Tag/Tag.scss | 7 +++---- polaris-react/src/components/Tag/Tag.stories.tsx | 12 +++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/polaris-react/src/components/Tag/Tag.scss b/polaris-react/src/components/Tag/Tag.scss index f2a862377d4..bc799b26fe9 100644 --- a/polaris-react/src/components/Tag/Tag.scss +++ b/polaris-react/src/components/Tag/Tag.scss @@ -56,7 +56,6 @@ $button-size: 20px; cursor: default; pointer-events: none; color: var(--p-color-text-disabled); - border: var(--p-border-width-025) solid var(--p-color-border-tertiary); } @media #{$p-breakpoints-sm-up} { @@ -121,7 +120,7 @@ $button-size: 20px; &:hover { background: var(--p-color-bg-fill-tertiary-hover); - color: var(--p-color-icon-active); + color: var(--p-color-icon-hover); outline: var(--p-border-width-025) solid transparent; } @@ -130,7 +129,7 @@ $button-size: 20px; &:focus-visible { background: var(--p-color-bg-fill-tertiary-hover); - color: var(--p-color-icon-active); + color: var(--p-color-icon-hover); } &:focus-visible:not(:active) { @@ -147,7 +146,7 @@ $button-size: 20px; pointer-events: none; svg { - fill: currentColor; + fill: var(--p-color-icon-disabled); } } } diff --git a/polaris-react/src/components/Tag/Tag.stories.tsx b/polaris-react/src/components/Tag/Tag.stories.tsx index 9abfd4634a9..13a1de0b37a 100644 --- a/polaris-react/src/components/Tag/Tag.stories.tsx +++ b/polaris-react/src/components/Tag/Tag.stories.tsx @@ -1,7 +1,7 @@ import React, {useCallback, useState} from 'react'; import type {ComponentMeta} from '@storybook/react'; -import {InlineStack, Icon, LegacyStack, Tag} from '@shopify/polaris'; -import {Wand} from '@shopify/polaris-icons'; +import {InlineStack, Icon, LegacyStack, Tag, Bleed} from '@shopify/polaris'; +import {MagicMinor, Wand} from '@shopify/polaris-icons'; export default { component: Tag, @@ -66,10 +66,12 @@ export function WithLink() { export function WithCustomContent() { return ( - - + + + + Wholesale - + ); } From a254e98aa1cdbedb2aee1f2b760116d0df2336c4 Mon Sep 17 00:00:00 2001 From: Sara Hill Date: Fri, 3 Nov 2023 10:53:23 -0700 Subject: [PATCH 2/5] adding changeset --- .changeset/tiny-crabs-rhyme.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/tiny-crabs-rhyme.md diff --git a/.changeset/tiny-crabs-rhyme.md b/.changeset/tiny-crabs-rhyme.md new file mode 100644 index 00000000000..abe93363028 --- /dev/null +++ b/.changeset/tiny-crabs-rhyme.md @@ -0,0 +1,5 @@ +--- +'@shopify/polaris': patch +--- + +Fixed icon and disabled state colors From 355874e19f07b5f3e7d93b6f923ffe253072802e Mon Sep 17 00:00:00 2001 From: Sara Hill Date: Fri, 3 Nov 2023 11:35:04 -0700 Subject: [PATCH 3/5] Update .changeset/tiny-crabs-rhyme.md Co-authored-by: Lo Kim --- .changeset/tiny-crabs-rhyme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/tiny-crabs-rhyme.md b/.changeset/tiny-crabs-rhyme.md index abe93363028..d0b13b04269 100644 --- a/.changeset/tiny-crabs-rhyme.md +++ b/.changeset/tiny-crabs-rhyme.md @@ -2,4 +2,4 @@ '@shopify/polaris': patch --- -Fixed icon and disabled state colors +Fixed `Tag` icon and disabled state colors From c79fafe6543f455ff372c66b20f5650338c9c202 Mon Sep 17 00:00:00 2001 From: Sara Hill Date: Fri, 3 Nov 2023 11:35:12 -0700 Subject: [PATCH 4/5] Update polaris-react/src/components/Tag/Tag.stories.tsx Co-authored-by: Lo Kim --- polaris-react/src/components/Tag/Tag.stories.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polaris-react/src/components/Tag/Tag.stories.tsx b/polaris-react/src/components/Tag/Tag.stories.tsx index 13a1de0b37a..72b17a7172a 100644 --- a/polaris-react/src/components/Tag/Tag.stories.tsx +++ b/polaris-react/src/components/Tag/Tag.stories.tsx @@ -68,7 +68,7 @@ export function WithCustomContent() { - + Wholesale From 561caec78eae0d38c803e1004dc7d6ead10a5317 Mon Sep 17 00:00:00 2001 From: Sara Hill Date: Fri, 3 Nov 2023 11:35:19 -0700 Subject: [PATCH 5/5] Update polaris-react/src/components/Tag/Tag.stories.tsx Co-authored-by: Lo Kim --- polaris-react/src/components/Tag/Tag.stories.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polaris-react/src/components/Tag/Tag.stories.tsx b/polaris-react/src/components/Tag/Tag.stories.tsx index 72b17a7172a..37140b214e5 100644 --- a/polaris-react/src/components/Tag/Tag.stories.tsx +++ b/polaris-react/src/components/Tag/Tag.stories.tsx @@ -1,7 +1,7 @@ import React, {useCallback, useState} from 'react'; import type {ComponentMeta} from '@storybook/react'; import {InlineStack, Icon, LegacyStack, Tag, Bleed} from '@shopify/polaris'; -import {MagicMinor, Wand} from '@shopify/polaris-icons'; +import {Magic} from '@shopify/polaris-icons'; export default { component: Tag,