Skip to content

Revert removal of misc tokens #4679

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

Merged
merged 1 commit into from
Nov 19, 2021
+16 −0
Merged

Revert removal of misc tokens #4679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions documentation/Color system.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,14 @@ Used to decorate elements where color does convey a specific meaning in componen
| `--p-button-drop-shadow` | `0 1px 0 rgba(0, 0, 0, 0.05)` |
| `--p-button-inner-shadow` | `inset 0 -1px 0 rgba(0, 0, 0, 0.2)` |
| `--p-button-pressed-inner-shadow` | `inset 0 1px 0 rgba(0, 0, 0, 0.15)` |
| `--p-override-none` | `none` |
| `--p-override-transparent` | `transparent` |
| `--p-override-one` | `1` |
| `--p-override-visible` | `visible` |
| `--p-override-zero` | `0` |
| `--p-override-loading-z-index` | `514` |
| `--p-button-font-weight` | `500` |
| `--p-non-null-content` | `''` |
| `--p-choice-size` | `2rem` |
| `--p-icon-size` | `1rem` |
| `--p-choice-margin` | `0.1rem` |
Expand All @@ -279,6 +285,7 @@ Used to decorate elements where color does convey a specific meaning in componen
| `--p-banner-border-highlight` | `inset 0 0.1rem 0 0 var(--p-border-highlight-subdued), inset 0 0 0 0.1rem var(--p-border-highlight-subdued)` |
| `--p-banner-border-warning` | `inset 0 0.1rem 0 0 var(--p-border-warning-subdued), inset 0 0 0 0.1rem var(--p-border-warning-subdued)` |
| `--p-banner-border-critical` | `inset 0 0.1rem 0 0 var(--p-border-critical-subdued), inset 0 0 0 0.1rem var(--p-border-critical-subdued)` |
| `--p-badge-mix-blend-mode` | `luminosity` |
| `--p-thin-border-subdued` | `0.1rem solid var(--p-border-subdued)` |
| `--p-text-field-spinner-offset` | `0.2rem` |
| `--p-text-field-focus-ring-offset` | `-0.4rem` |
Expand All @@ -290,4 +297,5 @@ Used to decorate elements where color does convey a specific meaning in componen
| `--p-ease` | `cubic-bezier(0.4, 0.22, 0.28, 1)` |
| `--p-range-slider-thumb-size-base` | `1.6rem` |
| `--p-range-slider-thumb-size-active` | `2.4rem` |
| `--p-range-slider-thumb-scale` | `1.5` |
| `--p-badge-font-weight` | `400` |
8 changes: 8 additions & 0 deletions src/utilities/theme/tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ export const Tokens = {
buttonPressedInnerShadow: 'inset 0 1px 0 rgba(0, 0, 0, 0.15)',

// Overrides
overrideNone: 'none',
overrideTransparent: 'transparent',
overrideOne: '1',
overrideVisible: 'visible',
overrideZero: '0',
overrideLoadingZIndex: '514',
buttonFontWeight: '500',
nonNullContent: "''",
choiceSize: rem('20px'),
iconSize: rem('10px'),
choiceMargin: rem('1px'),
Expand All @@ -29,6 +35,7 @@ export const Tokens = {
bannerBorderHighlight: buildBannerBorder('--p-border-highlight-subdued'),
bannerBorderWarning: buildBannerBorder('--p-border-warning-subdued'),
bannerBorderCritical: buildBannerBorder('--p-border-critical-subdued'),
badgeMixBlendMode: 'luminosity',
thinBorderSubdued: `${rem('1px')} solid var(--p-border-subdued)`,
textFieldSpinnerOffset: rem('2px'),
textFieldFocusRingOffset: rem('-4px'),
Expand All @@ -40,6 +47,7 @@ export const Tokens = {
ease: 'cubic-bezier(0.4, 0.22, 0.28, 1)',
rangeSliderThumbSizeBase: rem('16px'),
rangeSliderThumbSizeActive: rem('24px'),
rangeSliderThumbScale: '1.5',
badgeFontWeight: '400',
};

Expand Down