Skip to content
This repository was archived by the owner on Sep 30, 2025. It is now read-only.

Conversation

aaronccasanova
Copy link
Member

@aaronccasanova aaronccasanova commented Sep 14, 2023

WHY are these changes introduced?

Fixes #10539
Part of #10415

WHAT is this pull request doing?

Adds the following tokens to the color token group:

Old token New token
--p-color-bg --p-color-bg-surface
--p-color-bg-hover --p-color-bg-surface-hover
--p-color-bg-active --p-color-bg-surface-active
--p-color-bg-disabled --p-color-bg-surface-disabled
--p-color-bg-subdued --p-color-bg-surface-secondary
--p-color-bg-subdued-hover --p-color-bg-surface-secondary-hover
--p-color-bg-subdued-active --p-color-bg-surface-secondary-active
--p-color-bg-secondary-experimental --p-color-bg-surface-tertiary
--p-color-bg-strong --p-color-bg-fill-tertiary
--p-color-bg-strong-hover --p-color-bg-fill-tertiary-hover
--p-color-bg-strong-active --p-color-bg-fill-tertiary-active
--p-color-bg-input --p-color-input-bg-surface
--p-color-bg-input-hover-experimental --p-color-input-bg-surface-hover
--p-color-bg-input-active-experimental --p-color-input-bg-surface-active
--p-color-bg-primary --p-color-bg-fill-brand
--p-color-bg-primary-hover --p-color-bg-fill-brand-hover
--p-color-bg-primary-active --p-color-bg-fill-brand-active
--p-color-bg-primary-subdued --p-color-bg-surface-brand
--p-color-bg-primary-subdued-hover --p-color-bg-surface-brand-hover
--p-color-bg-primary-subdued-active --p-color-bg-surface-brand-active
--p-color-bg-primary-subdued-selected --p-color-bg-surface-brand-selected
--p-color-bg-app-selected --p-color-bg-surface-selected
--p-color-bg-success-strong --p-color-bg-fill-success
--p-color-bg-success-strong-hover-experimental --p-color-bg-fill-success-hover
--p-color-bg-success-strong-active-experimental --p-color-bg-fill-success-active
--p-color-bg-success --p-color-bg-fill-success-secondary
--p-color-bg-success-subdued --p-color-bg-surface-success
--p-color-bg-success-subdued-hover --p-color-bg-surface-success-hover
--p-color-bg-success-subdued-active --p-color-bg-surface-success-active
--p-color-bg-critical-strong --p-color-bg-fill-critical
--p-color-bg-critical-strong-hover --p-color-bg-fill-critical-hover
--p-color-bg-critical-strong-active --p-color-bg-fill-critical-active
--p-color-bg-critical --p-color-bg-fill-critical-secondary
--p-color-bg-critical-subdued --p-color-bg-surface-critical
--p-color-bg-critical-subdued-hover --p-color-bg-surface-critical-hover
--p-color-bg-critical-subdued-active --p-color-bg-surface-critical-active
--p-color-bg-caution-strong --p-color-bg-fill-caution
--p-color-bg-caution --p-color-bg-fill-caution-secondary
--p-color-bg-caution-subdued --p-color-bg-surface-caution
--p-color-bg-caution-subdued-hover --p-color-bg-surface-caution-hover
--p-color-bg-caution-subdued-active --p-color-bg-surface-caution-active
--p-color-bg-info-strong --p-color-bg-fill-info
--p-color-bg-info --p-color-bg-fill-info-secondary
--p-color-bg-info-subdued --p-color-bg-surface-info
--p-color-bg-info-subdued-hover --p-color-bg-surface-info-hover
--p-color-bg-info-subdued-active --p-color-bg-surface-info-active
--p-color-bg-warning-strong-experimental --p-color-bg-fill-warning
--p-color-bg-warning --p-color-bg-fill-warning-secondary
--p-color-bg-warning-subdued-experimental --p-color-bg-surface-warning
--p-color-bg-magic-strong --p-color-bg-fill-magic
--p-color-bg-magic --p-color-bg-fill-magic-secondary
--p-color-bg-magic-hover --p-color-bg-fill-magic-secondary-hover
--p-color-bg-magic-active --p-color-bg-fill-magic-secondary-active
--p-color-bg-magic-subdued --p-color-bg-surface-magic
--p-color-bg-magic-subdued-hover --p-color-bg-surface-magic-hover
--p-color-bg-inset --p-color-bg-fill-secondary
--p-color-bg-inset-strong --p-color-bg-fill-inverse
--p-color-bg-inverse-hover --p-color-bg-fill-inverse-hover
--p-color-bg-inverse-active --p-color-bg-fill-inverse-active
--p-color-bg-transparent-experimental --p-color-bg-surface-transparent
--p-color-bg-transparent-hover-experimental --p-color-bg-fill-transparent-hover
--p-color-bg-transparent-active-experimental --p-color-bg-fill-transparent-active
--p-color-bg-transparent-disabled-experimental --p-color-bg-fill-disabled
--p-color-bg-transparent-subdued-experimental --p-color-bg-fill-transparent-secondary
--p-color-bg-transparent-primary-disabled-experimental --p-color-bg-fill-brand-disabled
--p-color-bg-backdrop-experimental --p-color-backdrop-bg
--p-color-avatar-background-experimental --p-color-avatar-bg-fill
--p-color-avatar-style-one-background-experimental --p-color-avatar-one-bg-fill
--p-color-avatar-style-two-background-experimental --p-color-avatar-two-bg-fill
--p-color-avatar-style-three-background-experimental --p-color-avatar-three-bg-fill
--p-color-avatar-style-four-background-experimental --p-color-avatar-four-bg-fill
--p-color-avatar-style-five-background-experimental --p-color-avatar-five-bg-fill
--p-color-text-subdued --p-color-text-secondary
--p-color-text-interactive --p-color-text-emphasis
--p-color-text-interactive-hover --p-color-text-emphasis-hover
--p-color-text-interactive-active --p-color-text-emphasis-active
--p-color-text-primary --p-color-text-brand
--p-color-text-primary-hover --p-color-text-brand-hover
--p-color-text-critical-hover-experimental --p-color-text-critical-hover
--p-color-text-info-strong --p-color-text-info-on-bg-fill
--p-color-text-warning-experimental --p-color-text-warning
--p-color-text-inverse-subdued --p-color-text-inverse-secondary
--p-color-text-interactive-inverse --p-color-text-link-inverse
--p-color-avatar-color-experimental --p-color-avatar-text-on-bg-fill
--p-color-avatar-style-one-color-experimental --p-color-avatar-one-text-on-bg-fill
--p-color-avatar-style-two-color-experimental --p-color-avatar-two-text-on-bg-fill
--p-color-avatar-style-three-color-experimental --p-color-avatar-three-text-on-bg-fill
--p-color-avatar-style-four-color-experimental --p-color-avatar-four-text-on-bg-fill
--p-color-avatar-style-five-color-experimental --p-color-avatar-five-text-on-bg-fill
--p-color-icon-subdued --p-color-icon-secondary
--p-color-icon-interactive --p-color-icon-emphasis
--p-color-icon-interactive-hover --p-color-icon-emphasis-hover
--p-color-icon-interactive-active --p-color-icon-emphasis-active
--p-color-icon-primary --p-color-icon-brand
--p-color-border-subdued --p-color-border-secondary
--p-color-border-strong --p-color-border-tertiary
--p-color-border-input --p-color-input-border
--p-color-border-input-hover --p-color-input-border-hover
--p-color-border-input-active-experimental --p-color-input-border-active
--p-color-border-interactive --p-color-border-emphasis
--p-color-border-interactive-hover --p-color-border-emphasis-hover
--p-color-border-interactive-active --p-color-border-emphasis-active
--p-color-border-interactive-focus --p-color-border-focus
--p-color-border-primary --p-color-border-brand
--p-color-border-critical-strong-experimental --p-color-border-critical-secondary
--p-color-border-magic-strong --p-color-border-magic-secondary

Note

The following tokens were not added since they conflict with existing tokens with the same name. These tokens will have their values updated in the next major version v12:

Old token New token
--p-color-bg-hover --p-color-bg-surface-hover
--p-color-bg-active --p-color-bg-surface-active
--p-color-bg-disabled --p-color-bg-surface-disabled
--p-color-bg-primary --p-color-bg-fill-brand
--p-color-bg-primary-hover --p-color-bg-fill-brand-hover
--p-color-bg-primary-active --p-color-bg-fill-brand-active
--p-color-bg-primary-subdued --p-color-bg-surface-brand
--p-color-bg-primary-subdued-hover --p-color-bg-surface-brand-hover
--p-color-bg-primary-subdued-active --p-color-bg-surface-brand-active
--p-color-bg-primary-subdued-selected --p-color-bg-surface-brand-selected
--p-color-bg-magic-subdued --p-color-bg-surface-magic
--p-color-text-critical-hover-experimental --p-color-text-critical-hover
--p-color-text-warning-experimental --p-color-text-warning
--p-color-text-interactive-inverse --p-color-text-link-inverse
--p-color-border-strong --p-color-border-tertiary
--p-color-border-interactive --p-color-border-emphasis

@aaronccasanova aaronccasanova changed the base branch from main to update-private-primitive-colors September 14, 2023 16:57
@aaronccasanova
Copy link
Member Author

/snapit

@github-actions
Copy link
Contributor

🫰✨ Thanks @aaronccasanova! Your snapshots have been published to npm.

Test the snapshots by updating your package.json with the newly published versions:

yarn add @shopify/polaris-migrator@0.0.0-snapshot-release-20230915235059
yarn add @shopify/polaris@0.0.0-snapshot-release-20230915235059
yarn add @shopify/polaris-tokens@0.0.0-snapshot-release-20230915235059
yarn add @shopify/stylelint-polaris@0.0.0-snapshot-release-20230915235059

Base automatically changed from update-private-primitive-colors to main September 18, 2023 18:09
@aaronccasanova aaronccasanova self-assigned this Sep 18, 2023
@aaronccasanova aaronccasanova marked this pull request as ready for review September 18, 2023 21:24
@aaronccasanova
Copy link
Member Author

/snapit

@github-actions
Copy link
Contributor

🫰✨ Thanks @aaronccasanova! Your snapshots have been published to npm.

Test the snapshots by updating your package.json with the newly published versions:

yarn add @shopify/polaris-migrator@0.0.0-snapshot-release-20230919010747
yarn add @shopify/polaris@0.0.0-snapshot-release-20230919010747
yarn add @shopify/polaris-tokens@0.0.0-snapshot-release-20230919010747
yarn add @shopify/stylelint-polaris@0.0.0-snapshot-release-20230919010747

@@ -0,0 +1,6 @@
---
'@shopify/polaris': minor
Copy link
Contributor

@lgriffee lgriffee Sep 19, 2023

Choose a reason for hiding this comment

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

Should this only be for polaris-tokens? 🦍✨

Copy link
Member Author

Choose a reason for hiding this comment

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

Good question. Most consumers don't pull in Polaris tokens and instead rely on Polaris react for token updates. If we omit Polaris react here our changeset config bumps it as a patch. I tentatively think they should both be minor releases in this case.

Copy link
Contributor

@lgriffee lgriffee left a comment

Choose a reason for hiding this comment

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

Looks good based on our migration strategy! Didn't check over the token/value maps but can if you'd like (just let me know).

@aaronccasanova aaronccasanova merged commit 790a001 into main Sep 19, 2023
@aaronccasanova aaronccasanova deleted the update-semantic-color-tokens branch September 19, 2023 21:06
laurkim pushed a commit that referenced this pull request Sep 22, 2023
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @shopify/polaris@11.20.0

### Minor Changes

- [#10477](#10477)
[`790a001cd`](790a001)
Thanks [@aaronccasanova](https://github.com/aaronccasanova)! - Updated
semantic `color` tokens


- [#10478](#10478)
[`8be227e0c`](8be227e)
Thanks [@MaxCloutier](https://github.com/MaxCloutier)! - Added
`allowFiltering` prop on `ActionList`, and `filterActions` prop on Page
Header


- [#9445](#9445)
[`7be9c243a`](7be9c24)
Thanks [@m4thieulavoie](https://github.com/m4thieulavoie)! - Added
support for subheaders and selection of a range of `IndexTable.Rows` --
See the [With
subheaders](https://polaris.shopify.com/components/tables/index-table)
example on polaris.shopify.com for how to properly configure
    -   `IndexTable.Row`
- Added support for setting the `indeterminate` value on the `selected`
prop
- Added the `selectionRange` prop to specify a range of other
consecutive, related rows selected when the row is selected
- Added the `rowType` prop to indicate the relationship or role of the
row's contents (defaults to `data`, `subheader` renders the row to look
and behave like the table header row)
Added support for setting accessibility attributes on `IndexTable.Cell`
    -   `IndexTable.Cell`
- Added the `as` prop to support rendering the cell as a `th` element if
it is serving as a subheading cell
- Added support for the `headers` attribute to manually associate all
headers when the cell is described by more than its column heading
- Added support for the `colSpan` attribute to specify the number of the
columns that the cell element should extend to
- Added support for the `scope` attribute to indicate whether the `th`
is a header for a column, row, or group of columns or rows


- [#10490](#10490)
[`863f15ff2`](863f15f)
Thanks [@mrcthms](https://github.com/mrcthms)! - Add new
`IndexFiltersManager` for allowing disabling of Page Header actions when
in Filtering or EditingColumns mode


- [#10566](#10566)
[`9fed74317`](9fed743)
Thanks [@mrcthms](https://github.com/mrcthms)! - Fixed a bug in
`Filters` where changes to the `appliedFilters` prop were not being
handled

### Patch Changes

- [#10404](#10404)
[`5acfcec04`](5acfcec)
Thanks [@jesstelford](https://github.com/jesstelford)! - Scoped CSS
variables for non-responsive props on `Tooltip`, `RangeSlider`,
`ProgressBar`, and `HorizontalStack`.


- [#10582](#10582)
[`3efbc1b4e`](3efbc1b)
Thanks [@mrcthms](https://github.com/mrcthms)! - Fixed the focus states
of actions within the Page Header component


- [#10492](#10492)
[`d5ff72dec`](d5ff72d)
Thanks [@mrcthms](https://github.com/mrcthms)! - Updated Storybook
stories to be wrapped with an empty FrameContext.Provider

- Updated dependencies
\[[`fe1aac1b5`](fe1aac1),
[`790a001cd`](790a001),
[`63cf3ad24`](63cf3ad),
[`120e96eae`](120e96e)]:
    -   @shopify/polaris-tokens@7.10.0

## @shopify/polaris-tokens@7.10.0

### Minor Changes

- [#10465](#10465)
[`fe1aac1b5`](fe1aac1)
Thanks [@aaronccasanova](https://github.com/aaronccasanova)! - Updated
private primitive `colors`


- [#10477](#10477)
[`790a001cd`](790a001)
Thanks [@aaronccasanova](https://github.com/aaronccasanova)! - Updated
semantic `color` tokens


- [#10600](#10600)
[`63cf3ad24`](63cf3ad)
Thanks [@lgriffee](https://github.com/lgriffee)! - Added public
primitive and semantic `shadow` token scales

### Patch Changes

- [#10485](#10485)
[`120e96eae`](120e96e)
Thanks [@lgriffee](https://github.com/lgriffee)! - Updated public
primitive `base` and `light-uplift` theme scales

## @shopify/polaris-migrator@0.22.5

### Patch Changes

- [#10575](#10575)
[`ea6b54284`](ea6b542)
Thanks [@aveline](https://github.com/aveline)! - Handled `buttonFrom`
and `buttonsFrom` functions in `Button` migration

- Updated dependencies
\[[`fe1aac1b5`](fe1aac1),
[`790a001cd`](790a001),
[`63cf3ad24`](63cf3ad),
[`120e96eae`](120e96e)]:
    -   @shopify/polaris-tokens@7.10.0
    -   @shopify/stylelint-polaris@14.0.5

## @shopify/stylelint-polaris@14.0.5

### Patch Changes

- Updated dependencies
\[[`fe1aac1b5`](fe1aac1),
[`790a001cd`](790a001),
[`63cf3ad24`](63cf3ad),
[`120e96eae`](120e96e)]:
    -   @shopify/polaris-tokens@7.10.0

## polaris.shopify.com@0.57.8

### Patch Changes

- [#10605](#10605)
[`9748b0838`](9748b08)
Thanks [@laurkim](https://github.com/laurkim)! - Updated logic for
rendering `color` custom property previews in `TokenList`


- [#10573](#10573)
[`da09e0b8c`](da09e0b)
Thanks [@kyledurand](https://github.com/kyledurand)! - Updated copy url
to change browser url

- Updated dependencies
\[[`fe1aac1b5`](fe1aac1),
[`5acfcec04`](5acfcec),
[`790a001cd`](790a001),
[`8be227e0c`](8be227e),
[`63cf3ad24`](63cf3ad),
[`7be9c243a`](7be9c24),
[`863f15ff2`](863f15f),
[`3efbc1b4e`](3efbc1b),
[`d5ff72dec`](d5ff72d),
[`120e96eae`](120e96e),
[`9fed74317`](9fed743)]:
    -   @shopify/polaris-tokens@7.10.0
    -   @shopify/polaris@11.20.0

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AnnaCheba pushed a commit to AnnaCheba/polaris that referenced this pull request Apr 22, 2024
Co-authored-by: Sara Hill <sara.hill@shopify.com>
ascherkus pushed a commit to ascherkus/polaris that referenced this pull request Feb 19, 2025
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @shopify/polaris@11.20.0

### Minor Changes

- [Shopify#10477](Shopify#10477)
[`790a001cd`](Shopify@be6914d)
Thanks [@aaronccasanova](https://github.com/aaronccasanova)! - Updated
semantic `color` tokens


- [Shopify#10478](Shopify#10478)
[`8be227e0c`](Shopify@b588f20)
Thanks [@MaxCloutier](https://github.com/MaxCloutier)! - Added
`allowFiltering` prop on `ActionList`, and `filterActions` prop on Page
Header


- [Shopify#9445](Shopify#9445)
[`7be9c243a`](Shopify@4069237)
Thanks [@m4thieulavoie](https://github.com/m4thieulavoie)! - Added
support for subheaders and selection of a range of `IndexTable.Rows` --
See the [With
subheaders](https://polaris.shopify.com/components/tables/index-table)
example on polaris.shopify.com for how to properly configure
    -   `IndexTable.Row`
- Added support for setting the `indeterminate` value on the `selected`
prop
- Added the `selectionRange` prop to specify a range of other
consecutive, related rows selected when the row is selected
- Added the `rowType` prop to indicate the relationship or role of the
row's contents (defaults to `data`, `subheader` renders the row to look
and behave like the table header row)
Added support for setting accessibility attributes on `IndexTable.Cell`
    -   `IndexTable.Cell`
- Added the `as` prop to support rendering the cell as a `th` element if
it is serving as a subheading cell
- Added support for the `headers` attribute to manually associate all
headers when the cell is described by more than its column heading
- Added support for the `colSpan` attribute to specify the number of the
columns that the cell element should extend to
- Added support for the `scope` attribute to indicate whether the `th`
is a header for a column, row, or group of columns or rows


- [Shopify#10490](Shopify#10490)
[`863f15ff2`](Shopify@07246bc)
Thanks [@mrcthms](https://github.com/mrcthms)! - Add new
`IndexFiltersManager` for allowing disabling of Page Header actions when
in Filtering or EditingColumns mode


- [Shopify#10566](Shopify#10566)
[`9fed74317`](Shopify@3fb446f)
Thanks [@mrcthms](https://github.com/mrcthms)! - Fixed a bug in
`Filters` where changes to the `appliedFilters` prop were not being
handled

### Patch Changes

- [Shopify#10404](Shopify#10404)
[`5acfcec04`](Shopify@5cdd787)
Thanks [@jesstelford](https://github.com/jesstelford)! - Scoped CSS
variables for non-responsive props on `Tooltip`, `RangeSlider`,
`ProgressBar`, and `HorizontalStack`.


- [Shopify#10582](Shopify#10582)
[`3efbc1b4e`](Shopify@d47089b)
Thanks [@mrcthms](https://github.com/mrcthms)! - Fixed the focus states
of actions within the Page Header component


- [Shopify#10492](Shopify#10492)
[`d5ff72dec`](Shopify@8057862)
Thanks [@mrcthms](https://github.com/mrcthms)! - Updated Storybook
stories to be wrapped with an empty FrameContext.Provider

- Updated dependencies
\[[`fe1aac1b5`](Shopify@a4f7ed7),
[`790a001cd`](Shopify@be6914d),
[`63cf3ad24`](Shopify@d4e6bd4),
[`120e96eae`](Shopify@fe98b0b)]:
    -   @shopify/polaris-tokens@7.10.0

## @shopify/polaris-tokens@7.10.0

### Minor Changes

- [Shopify#10465](Shopify#10465)
[`fe1aac1b5`](Shopify@a4f7ed7)
Thanks [@aaronccasanova](https://github.com/aaronccasanova)! - Updated
private primitive `colors`


- [Shopify#10477](Shopify#10477)
[`790a001cd`](Shopify@be6914d)
Thanks [@aaronccasanova](https://github.com/aaronccasanova)! - Updated
semantic `color` tokens


- [Shopify#10600](Shopify#10600)
[`63cf3ad24`](Shopify@d4e6bd4)
Thanks [@lgriffee](https://github.com/lgriffee)! - Added public
primitive and semantic `shadow` token scales

### Patch Changes

- [Shopify#10485](Shopify#10485)
[`120e96eae`](Shopify@fe98b0b)
Thanks [@lgriffee](https://github.com/lgriffee)! - Updated public
primitive `base` and `light-uplift` theme scales

## @shopify/polaris-migrator@0.22.5

### Patch Changes

- [Shopify#10575](Shopify#10575)
[`ea6b54284`](Shopify@9761c8a)
Thanks [@aveline](https://github.com/aveline)! - Handled `buttonFrom`
and `buttonsFrom` functions in `Button` migration

- Updated dependencies
\[[`fe1aac1b5`](Shopify@a4f7ed7),
[`790a001cd`](Shopify@be6914d),
[`63cf3ad24`](Shopify@d4e6bd4),
[`120e96eae`](Shopify@fe98b0b)]:
    -   @shopify/polaris-tokens@7.10.0
    -   @shopify/stylelint-polaris@14.0.5

## @shopify/stylelint-polaris@14.0.5

### Patch Changes

- Updated dependencies
\[[`fe1aac1b5`](Shopify@a4f7ed7),
[`790a001cd`](Shopify@be6914d),
[`63cf3ad24`](Shopify@d4e6bd4),
[`120e96eae`](Shopify@fe98b0b)]:
    -   @shopify/polaris-tokens@7.10.0

## polaris.shopify.com@0.57.8

### Patch Changes

- [Shopify#10605](Shopify#10605)
[`9748b0838`](Shopify@a21aca4)
Thanks [@laurkim](https://github.com/laurkim)! - Updated logic for
rendering `color` custom property previews in `TokenList`


- [Shopify#10573](Shopify#10573)
[`da09e0b8c`](Shopify@439fedc)
Thanks [@kyledurand](https://github.com/kyledurand)! - Updated copy url
to change browser url

- Updated dependencies
\[[`fe1aac1b5`](Shopify@a4f7ed7),
[`5acfcec04`](Shopify@5cdd787),
[`790a001cd`](Shopify@be6914d),
[`8be227e0c`](Shopify@b588f20),
[`63cf3ad24`](Shopify@d4e6bd4),
[`7be9c243a`](Shopify@4069237),
[`863f15ff2`](Shopify@07246bc),
[`3efbc1b4e`](Shopify@d47089b),
[`d5ff72dec`](Shopify@8057862),
[`120e96eae`](Shopify@fe98b0b),
[`9fed74317`](Shopify@3fb446f)]:
    -   @shopify/polaris-tokens@7.10.0
    -   @shopify/polaris@11.20.0

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add new color tokens that don't conflict with existing names
4 participants