From c11675ecb2b8e61e92fe8a197a0f3020cb872bd9 Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Mon, 22 Nov 2021 14:24:26 -0500 Subject: [PATCH 1/3] Remove tokens --- documentation/Color system.md | 2 -- src/utilities/theme/tokens.ts | 2 -- 2 files changed, 4 deletions(-) diff --git a/documentation/Color system.md b/documentation/Color system.md index 6f6f79099d5..b2ff63f83f6 100644 --- a/documentation/Color system.md +++ b/documentation/Color system.md @@ -278,7 +278,6 @@ Used to decorate elements where color does convey a specific meaning in componen | `--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` | @@ -302,4 +301,3 @@ Used to decorate elements where color does convey a specific meaning in componen | `--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` | diff --git a/src/utilities/theme/tokens.ts b/src/utilities/theme/tokens.ts index 723a727327c..cbb5a66047c 100644 --- a/src/utilities/theme/tokens.ts +++ b/src/utilities/theme/tokens.ts @@ -30,7 +30,6 @@ export const Tokens = { overrideVisible: 'visible', overrideZero: '0', overrideLoadingZIndex: '514', - buttonFontWeight: '500', nonNullContent: "''", choiceSize: rem('20px'), iconSize: rem('10px'), @@ -54,7 +53,6 @@ export const Tokens = { rangeSliderThumbSizeBase: rem('16px'), rangeSliderThumbSizeActive: rem('24px'), rangeSliderThumbScale: '1.5', - badgeFontWeight: '400', }; function rem(px: string) { From 4bee48d999f825dcabcd8205ca48293ebb33ed89 Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Mon, 22 Nov 2021 14:35:25 -0500 Subject: [PATCH 2/3] Remove unnecessary properties TextField Co-Authored-By: Kyle Durand <6844391+kyledurand@users.noreply.github.com> --- src/components/TextField/TextField.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/TextField/TextField.scss b/src/components/TextField/TextField.scss index f33244610c3..6197e8f03b3 100644 --- a/src/components/TextField/TextField.scss +++ b/src/components/TextField/TextField.scss @@ -100,9 +100,7 @@ $stacking-order: ( padding: control-vertical-padding() $backdrop-horizontal-spacing; background: none; border: border(transparent); - font-family: inherit; - font-size: inherit; - font-weight: inherit; + font-family: font-family(); appearance: none; caret-color: var(--p-text); color: var(--p-text); From 6fb06b2aa9e83490f0028e766d66c219af62fc24 Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Mon, 22 Nov 2021 14:41:13 -0500 Subject: [PATCH 3/3] Update UNRELEASED.md --- UNRELEASED.md | 1 + 1 file changed, 1 insertion(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index 95ac5dd846a..fc88be896cf 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -5,6 +5,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t ### Breaking changes - Renamed `--p-duration-1-0-0` and `--p-duration-1-5-0` to `--p-duration-100` and `--p-duration-150`. +- Removed custom and unnecessary font weight properties ([#4687](https://github.com/Shopify/polaris-react/pull/4687)) ### Enhancements