From 8848add3c53c0c80f8f91880acfe4bb9a0ac3371 Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Tue, 1 Feb 2022 15:49:55 -0500 Subject: [PATCH 1/3] Replaces focus border on secondary action button in banners --- src/components/Banner/Banner.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Banner/Banner.scss b/src/components/Banner/Banner.scss index 859bc5ea4cb..9c22811bb75 100644 --- a/src/components/Banner/Banner.scss +++ b/src/components/Banner/Banner.scss @@ -257,7 +257,9 @@ $spinner-size: rem(20px); &:focus > .Text { @include plain-button-backdrop; @include high-contrast-button-outline; + @include focus-ring($style: 'focused'); box-shadow: none; + background-color: transparent; } } @@ -265,6 +267,7 @@ $spinner-size: rem(20px); box-shadow: 0 -2px 0 0 rgba(var(--p-rgb-text), 0.25) inset; will-change: box-shadow; transition: box-shadow duration() easing(); + @include focus-ring; } .Button { From 93ae8c2f00a10ddba7625ea5cf35f91a319983c2 Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Tue, 1 Feb 2022 15:54:29 -0500 Subject: [PATCH 2/3] Add release notes to Unreleased.md --- UNRELEASED.md | 1 + 1 file changed, 1 insertion(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index 053cfbdbb99..9cb12e91030 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -21,6 +21,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Removed `min-height` from `Page` `additionalNavigation` ([#4952](https://github.com/Shopify/polaris-react/pull/4952)) - Fixed overly dark `bottom-border` on `DataTable` header cell and total cell ([#4975](https://github.com/Shopify/polaris-react/pull/4975)) - Removed `min-height` on `Autocomplete` `action` ([#4977](https://github.com/Shopify/polaris-react/pull/4977)) +- Fixed `focus-ring` on `Banner` `secondaryAction` ([#4997](https://github.com/Shopify/polaris-react/pull/4997)) ### Documentation From 98b3f5e511457e0c8d4271174ff74b895bf4dc56 Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Tue, 1 Feb 2022 16:04:43 -0500 Subject: [PATCH 3/3] Update order of mixins so it matches --- src/components/Banner/Banner.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Banner/Banner.scss b/src/components/Banner/Banner.scss index 9c22811bb75..691f06b72c1 100644 --- a/src/components/Banner/Banner.scss +++ b/src/components/Banner/Banner.scss @@ -264,10 +264,10 @@ $spinner-size: rem(20px); } .Text { + @include focus-ring; box-shadow: 0 -2px 0 0 rgba(var(--p-rgb-text), 0.25) inset; will-change: box-shadow; transition: box-shadow duration() easing(); - @include focus-ring; } .Button {