From da53feca58e4a2331eb8ec0410ecb4c348f57df9 Mon Sep 17 00:00:00 2001 From: Alex Page Date: Wed, 24 Nov 2021 15:17:19 -0800 Subject: [PATCH 1/3] Remove legacy tokens --- .storybook/manager.js | 10 ++++------ UNRELEASED.md | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.storybook/manager.js b/.storybook/manager.js index 8f01b669d06..741817e177b 100644 --- a/.storybook/manager.js +++ b/.storybook/manager.js @@ -1,6 +1,5 @@ import {addons} from '@storybook/addons'; import {create} from '@storybook/theming'; -import {colorSkyLight, colorInk} from '@shopify/polaris-tokens'; addons.setConfig({ panelPosition: 'bottom', @@ -10,10 +9,9 @@ addons.setConfig({ brandUrl: '/', brandImage: null, appBorderRadius: 0, - appBg: colorSkyLight, - contentBg: colorSkyLight, - textColor: colorInk, - // TODO more pretty brand colors? - // SEE https://github.com/storybooks/storybook/blob/next/docs/src/pages/configurations/theming/index.md + // TODO investigate removing these values + appBg: '#f4f6f8', + contentBg: '#f4f6f8', + textColor: '#212b36', }), }); diff --git a/UNRELEASED.md b/UNRELEASED.md index a39883164e5..7d47fdcab1c 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -43,6 +43,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Cleaned up Button styling and $button-filled mixin([#4635](https://github.com/Shopify/polaris-react/pull/4635)) - Removed `rem()` function from `tokens.ts` ([#4695](https://github.com/Shopify/polaris-react/pull/4695)) - Remove unnecessary import of `Tokens` in `Collapsible` test ([#4722](https://github.com/Shopify/polaris-react/pull/4722)) +- Hard code legacy tokens in `.storybook/manager.js` ([#](https://github.com/Shopify/polaris-react/pull/)) ### Deprecations From 07899266a5c82f0fbdf29b4a88a8d8ba9fd79aba Mon Sep 17 00:00:00 2001 From: Alex Page Date: Wed, 24 Nov 2021 15:19:41 -0800 Subject: [PATCH 2/3] Update manager.js --- .storybook/manager.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.storybook/manager.js b/.storybook/manager.js index 741817e177b..8678eeac7e2 100644 --- a/.storybook/manager.js +++ b/.storybook/manager.js @@ -9,9 +9,5 @@ addons.setConfig({ brandUrl: '/', brandImage: null, appBorderRadius: 0, - // TODO investigate removing these values - appBg: '#f4f6f8', - contentBg: '#f4f6f8', - textColor: '#212b36', }), }); From a480760f4136df65ef5ce8188d9e3ad9c0ce045d Mon Sep 17 00:00:00 2001 From: Alex Page Date: Wed, 24 Nov 2021 15:21:50 -0800 Subject: [PATCH 3/3] Update UNRELEASED.md --- UNRELEASED.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UNRELEASED.md b/UNRELEASED.md index 7d47fdcab1c..83c9ed40621 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -43,7 +43,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Cleaned up Button styling and $button-filled mixin([#4635](https://github.com/Shopify/polaris-react/pull/4635)) - Removed `rem()` function from `tokens.ts` ([#4695](https://github.com/Shopify/polaris-react/pull/4695)) - Remove unnecessary import of `Tokens` in `Collapsible` test ([#4722](https://github.com/Shopify/polaris-react/pull/4722)) -- Hard code legacy tokens in `.storybook/manager.js` ([#](https://github.com/Shopify/polaris-react/pull/)) +- Remove legacy tokens and use default theme for `.storybook/manager.js` ([#4729](https://github.com/Shopify/polaris-react/pull/4729)) ### Deprecations