From 957de060c26b5915c85b5999a9b3ced70e8ea582 Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Thu, 18 Nov 2021 13:59:41 -0500 Subject: [PATCH 1/5] Remove sass filter function file --- src/styles/foundation/_filters.scss | 34 ----------------------------- 1 file changed, 34 deletions(-) delete mode 100644 src/styles/foundation/_filters.scss diff --git a/src/styles/foundation/_filters.scss b/src/styles/foundation/_filters.scss deleted file mode 100644 index 05c631c30db..00000000000 --- a/src/styles/foundation/_filters.scss +++ /dev/null @@ -1,34 +0,0 @@ -// stylelint-disable-next-line scss/partial-no-import -@import '../polaris-tokens/color-filters.color-map'; - -/// -/// Color filter data -/// -/// Shopify color filter palette, extended specifically for polaris-react. -/// -/// @type map -$color-filter-palette-data: $polaris-color-filters; - -/// Returns the filter list for a given color name and group. -/// -/// @param {String} $hue - The color’s hue. -/// @param {String} $value - The darkness/lightness of the color. Defaults to -/// base. -/// @return {List} The filter list. - -@function filter($hue, $value: base) { - $fetched-color: map-get(map-get($color-filter-palette-data, $hue), $value); - - @if map-has-key($color-filter-palette-data, $fetched-color) { - $fetched-color: map-get( - map-get($color-filter-palette-data, $fetched-color), - $value - ); - } - - @if type-of($fetched-color) == list { - @return $fetched-color; - } @else { - @error "Filter `#{$hue}, #{$value}` not found.\a Make sure arguments are strings.\a GOOD: `filter('yellow')`.\a BAD: `filter(yellow)`.\a\a Available options: #{available-names($color-filter-palette-data)}"; - } -} From 690f03afd19e2edfc61abe4ca97b858ca5e43d76 Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Thu, 18 Nov 2021 14:00:19 -0500 Subject: [PATCH 2/5] Remove sass filter function imports --- src/styles/_common.scss | 1 - src/styles/_public-api.scss | 1 - 2 files changed, 2 deletions(-) diff --git a/src/styles/_common.scss b/src/styles/_common.scss index 894a70fa23d..85124f8a350 100644 --- a/src/styles/_common.scss +++ b/src/styles/_common.scss @@ -6,7 +6,6 @@ @import './foundation/utilities'; @import './foundation/colors'; -@import './foundation/filters'; @import './foundation/spacing'; @import './foundation/border-width'; @import './foundation/borders'; diff --git a/src/styles/_public-api.scss b/src/styles/_public-api.scss index 36131fd4fad..779e36639fc 100644 --- a/src/styles/_public-api.scss +++ b/src/styles/_public-api.scss @@ -18,7 +18,6 @@ @import './foundation/utilities'; @import './foundation/colors'; -@import './foundation/filters'; @import './foundation/spacing'; @import './foundation/border-width'; @import './foundation/borders'; From 582645d8429415072265f5ec0004246ddc3becdd Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Thu, 18 Nov 2021 14:07:42 -0500 Subject: [PATCH 3/5] Remove last instance of filter function --- src/styles/shared/_icons.scss | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/styles/shared/_icons.scss b/src/styles/shared/_icons.scss index 5df7bab9425..aae95dc0793 100644 --- a/src/styles/shared/_icons.scss +++ b/src/styles/shared/_icons.scss @@ -16,13 +16,3 @@ filter: $filter-color; } } - -@mixin color-icon($value, $hue: base) { - svg { - fill: color($value, $hue); - } - - img { - filter: filter($value, $hue); - } -} From b066a05a2440c4a073d46b7ccbaa9a4382e8cd7a Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Thu, 18 Nov 2021 15:14:14 -0500 Subject: [PATCH 4/5] Update UNRELEASED.md --- UNRELEASED.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index 9196c6a162d..c4bd445cff7 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -4,6 +4,8 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t ### Breaking changes +- Removed filter sass function and color-icon() mixin ([#4676](https://github.com/Shopify/polaris-react/pull/4676)) + ### Enhancements - Updated `VisuallyHidden` styles to not use `top` or `clip` ([#4641](https://github.com/Shopify/polaris-react/pull/4641)) From d87006fcd7dcc9d5bbba4783b24e08182a03d78c Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Thu, 18 Nov 2021 15:14:51 -0500 Subject: [PATCH 5/5] Fix UNRELEASED formatting --- UNRELEASED.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UNRELEASED.md b/UNRELEASED.md index c4bd445cff7..d692f984e64 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -26,7 +26,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t ### Code quality -- Remove all color() invocations ([#4636](https://github.com/Shopify/polaris-react/pull/4636)) +- Removed all color() invocations ([#4636](https://github.com/Shopify/polaris-react/pull/4636)) - Cleaned up Button styling and $button-filled mixin([#4635](https://github.com/Shopify/polaris-react/pull/4635)) - Removed miscellaneous css custom properties ([#4620](https://github.com/Shopify/polaris-react/pull/4620)) - Removed custom and unnecessary font weight properties ([#4648](https://github.com/Shopify/polaris-react/pull/4648))