From 80f9a784e84a833bcd44fafd136f4c54390962cc Mon Sep 17 00:00:00 2001 From: Aaron Casanova <32409546+aaronccasanova@users.noreply.github.com> Date: Mon, 31 Jan 2022 14:42:03 -0800 Subject: [PATCH 1/3] feat: Remove skeleton-page-header-layout mixin --- src/components/SkeletonPage/SkeletonPage.scss | 2 +- src/styles/shared/_skeleton.scss | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/SkeletonPage/SkeletonPage.scss b/src/components/SkeletonPage/SkeletonPage.scss index 97a11673a19..30259e67e6d 100644 --- a/src/components/SkeletonPage/SkeletonPage.scss +++ b/src/components/SkeletonPage/SkeletonPage.scss @@ -22,7 +22,7 @@ $skeleton-display-text-max-width: 120px; .Header { @include page-header-layout; - @include skeleton-page-header-layout; + padding-bottom: var(--p-space-2); } .BreadcrumbAction { diff --git a/src/styles/shared/_skeleton.scss b/src/styles/shared/_skeleton.scss index de0f8364e77..623319d3714 100644 --- a/src/styles/shared/_skeleton.scss +++ b/src/styles/shared/_skeleton.scss @@ -40,7 +40,3 @@ $thumbnail-sizes: ( justify-content: flex-end; align-items: center; } - -@mixin skeleton-page-header-layout { - padding-bottom: var(--p-space-2); -} From c84d4f1d9fb2964383d0a5bcbf4afd7d83ef8cbd Mon Sep 17 00:00:00 2001 From: Aaron Casanova <32409546+aaronccasanova@users.noreply.github.com> Date: Mon, 31 Jan 2022 14:43:25 -0800 Subject: [PATCH 2/3] feat: Remove skeleton-page-secondary-actions-layout mixin --- src/components/SkeletonPage/SkeletonPage.scss | 6 +++++- src/styles/shared/_skeleton.scss | 8 -------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/components/SkeletonPage/SkeletonPage.scss b/src/components/SkeletonPage/SkeletonPage.scss index 30259e67e6d..5d9ede38c7f 100644 --- a/src/components/SkeletonPage/SkeletonPage.scss +++ b/src/components/SkeletonPage/SkeletonPage.scss @@ -88,7 +88,11 @@ $skeleton-display-text-max-width: 120px; } .Actions { - @include skeleton-page-secondary-actions-layout; + margin-top: var(--p-space-2); + display: flex; + flex-direction: row-reverse; + justify-content: flex-end; + align-items: center; } .Action { diff --git a/src/styles/shared/_skeleton.scss b/src/styles/shared/_skeleton.scss index 623319d3714..39743ba2b70 100644 --- a/src/styles/shared/_skeleton.scss +++ b/src/styles/shared/_skeleton.scss @@ -32,11 +32,3 @@ $thumbnail-sizes: ( } } } - -@mixin skeleton-page-secondary-actions-layout { - margin-top: var(--p-space-2); - display: flex; - flex-direction: row-reverse; - justify-content: flex-end; - align-items: center; -} From f3f22c0339f82283c67546808eb0a9b7f5810e91 Mon Sep 17 00:00:00 2001 From: Aaron Casanova <32409546+aaronccasanova@users.noreply.github.com> Date: Mon, 31 Jan 2022 14:54:10 -0800 Subject: [PATCH 3/3] docs: Update the v9 unreleased file --- UNRELEASED-v9.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UNRELEASED-v9.md b/UNRELEASED-v9.md index 7dc0e14acef..696f901a75d 100644 --- a/UNRELEASED-v9.md +++ b/UNRELEASED-v9.md @@ -42,6 +42,8 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Removed the `unstyled-list()` mixin and replaced any instances with values ([#4960](https://github.com/Shopify/polaris-react/pull/4960)) - Removed `high-contrast-outline()` and `high-contrast-border()` mixins and replaced any instances with tokens and values ([#4962](https://github.com/Shopify/polaris-react/pull/4962)) - Removed the `map-extend` scss function ([#4970](https://github.com/Shopify/polaris-react/pull/4970)) +- Removed the `skeleton-page-header-layout` scss mixin ([#4991](https://github.com/Shopify/polaris-react/pull/4991)) +- Removed the `skeleton-page-secondary-actions-layout` scss mixin ([#4991](https://github.com/Shopify/polaris-react/pull/4991)) ### New components