From 0ef20368883dd61fb17db87b971dfa93f476389d Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Tue, 25 Jan 2022 11:59:22 -0700 Subject: [PATCH 1/4] Update UNRELEASED-v8.md --- UNRELEASED-v8.md | 1 + 1 file changed, 1 insertion(+) diff --git a/UNRELEASED-v8.md b/UNRELEASED-v8.md index 9c8aacaa6ef..f43d529b329 100644 --- a/UNRELEASED-v8.md +++ b/UNRELEASED-v8.md @@ -36,6 +36,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Removed the shadow() function (replaced any instances with tokens) and renamed shadow legacy tokens ([#4823](https://github.com/Shopify/polaris-react/pull/4823)) - Removed the ms-high-contrast-color() function and replaced any instances with values ([#4938](https://github.com/Shopify/polaris-react/pull/4938)) - Removed the font-family() function and replaced any instances with values ([#4940](https://github.com/Shopify/polaris-react/pull/4940)) +- Removed the unstyled-list() mixin and replaced any instances with values ([#](https://github.com/Shopify/polaris-react/pull/)) ### New components From 260e652c8d1aef50e96c300fdd0fe6e2b46f80cd Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Tue, 25 Jan 2022 13:39:21 -0700 Subject: [PATCH 2/4] Update UNRELEASED-v8.md --- UNRELEASED-v8.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UNRELEASED-v8.md b/UNRELEASED-v8.md index f43d529b329..b383ae855b3 100644 --- a/UNRELEASED-v8.md +++ b/UNRELEASED-v8.md @@ -36,7 +36,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Removed the shadow() function (replaced any instances with tokens) and renamed shadow legacy tokens ([#4823](https://github.com/Shopify/polaris-react/pull/4823)) - Removed the ms-high-contrast-color() function and replaced any instances with values ([#4938](https://github.com/Shopify/polaris-react/pull/4938)) - Removed the font-family() function and replaced any instances with values ([#4940](https://github.com/Shopify/polaris-react/pull/4940)) -- Removed the unstyled-list() mixin and replaced any instances with values ([#](https://github.com/Shopify/polaris-react/pull/)) +- Removed the unstyled-list() mixin and replaced any instances with values ([#4960](https://github.com/Shopify/polaris-react/pull/4960)) ### New components From a913f6e9a28815b6da778ffdf79165faa35b48a2 Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Tue, 25 Jan 2022 13:46:28 -0700 Subject: [PATCH 3/4] Replace unstyled-list mixin with values --- src/components/Navigation/Navigation.scss | 11 ++++++++--- src/components/OptionList/OptionList.scss | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/components/Navigation/Navigation.scss b/src/components/Navigation/Navigation.scss index aaa1a752c77..170c8decaa5 100644 --- a/src/components/Navigation/Navigation.scss +++ b/src/components/Navigation/Navigation.scss @@ -252,7 +252,9 @@ $secondary-item-font-size: 15px; } .List { - @include unstyled-list; + margin: 0; + padding: 0; + list-style: none; } .Item { @@ -326,11 +328,12 @@ $secondary-item-font-size: 15px; // Section styles .Section { - @include unstyled-list; flex: 0 0 auto; + margin: 0; padding: var(--p-space-4) 0; padding-top: 0; @include safe-area-for(padding-left, 0, left); + list-style: none; + .Section { padding-top: var(--p-space-1); @@ -438,7 +441,9 @@ $secondary-item-font-size: 15px; } .List { - @include unstyled-list; + margin: 0; + padding: 0; + list-style: none; } .Indicator { diff --git a/src/components/OptionList/OptionList.scss b/src/components/OptionList/OptionList.scss index fd0c6aa3eaa..9dba875d991 100644 --- a/src/components/OptionList/OptionList.scss +++ b/src/components/OptionList/OptionList.scss @@ -1,12 +1,15 @@ @import '../../styles/common'; .OptionList { - @include unstyled-list; + margin: 0; padding: var(--p-space-2); + list-style: none; } .Options { - @include unstyled-list; + margin: 0; + padding: 0; + list-style: none; } .Title { From aa7d9d4f391a073f2b1918d59aa8f91894ece9fc Mon Sep 17 00:00:00 2001 From: Laura Griffee Date: Tue, 25 Jan 2022 13:48:48 -0700 Subject: [PATCH 4/4] Remove unstyled-list() mixin --- src/styles/_common.scss | 1 - src/styles/_public-api.scss | 1 - src/styles/shared/_lists.scss | 5 ----- 3 files changed, 7 deletions(-) delete mode 100644 src/styles/shared/_lists.scss diff --git a/src/styles/_common.scss b/src/styles/_common.scss index d7d99ada3bd..84a47c5e0ac 100644 --- a/src/styles/_common.scss +++ b/src/styles/_common.scss @@ -19,7 +19,6 @@ @import './shared/icons'; @import './shared/layout'; @import './shared/links'; -@import './shared/lists'; @import './shared/page'; @import './shared/typography'; @import './shared/skeleton'; diff --git a/src/styles/_public-api.scss b/src/styles/_public-api.scss index 4ca6e299bdd..dbdded73eb7 100644 --- a/src/styles/_public-api.scss +++ b/src/styles/_public-api.scss @@ -29,7 +29,6 @@ @import './shared/icons'; @import './shared/layout'; @import './shared/links'; -@import './shared/lists'; @import './shared/page'; @import './shared/typography'; @import './shared/skeleton'; diff --git a/src/styles/shared/_lists.scss b/src/styles/shared/_lists.scss deleted file mode 100644 index ffd72f2433a..00000000000 --- a/src/styles/shared/_lists.scss +++ /dev/null @@ -1,5 +0,0 @@ -@mixin unstyled-list { - margin: 0; - padding: 0; - list-style: none; -}