From 02464bc9eceda61afb370ad1322f4420af1548d1 Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Wed, 2 Feb 2022 10:14:07 -0500 Subject: [PATCH 1/8] Fixes unexpected textwrap on Firefox in secondaryAction in Banner --- src/components/Banner/Banner.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Banner/Banner.scss b/src/components/Banner/Banner.scss index 691f06b72c1..2642c8316f2 100644 --- a/src/components/Banner/Banner.scss +++ b/src/components/Banner/Banner.scss @@ -268,6 +268,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(); + display: block; } .Button { From bdc06357002a5655e475bc3e2709a41bdfbea37e Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Wed, 2 Feb 2022 10:17:03 -0500 Subject: [PATCH 2/8] Updates unreleased.md --- UNRELEASED.md | 1 + 1 file changed, 1 insertion(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index c62c1fd9fcf..2b4d7786108 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -30,6 +30,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Fixed a bug where the `Checkbox` in a `Combobox` with `allowMultiple` would steal focus and close the `Popover` when clicked ([#4895](https://github.com/Shopify/polaris-react/pull/4895)) - Fixed an issue where `TextField` was the wrong height on initial render ([#4903](https://github.com/Shopify/polaris-react/pull/4903)) - Fixed an issue where token values in px weren't converted to rems ([#5000](https://github.com/Shopify/polaris-react/pull/5000)) +- Fixed `display` on `Banner` `secondaryAction` in Firefox ([#5001](https://github.com/Shopify/polaris-react/pull/5001)) ### Documentation From 77439cd8ea68e4d4e7e90ccbad19c935b46de88d Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Wed, 2 Feb 2022 10:19:18 -0500 Subject: [PATCH 3/8] Added clearer unreleased notes --- UNRELEASED.md | 1 + 1 file changed, 1 insertion(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index 2b4d7786108..7ee125abdd8 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -31,6 +31,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Fixed an issue where `TextField` was the wrong height on initial render ([#4903](https://github.com/Shopify/polaris-react/pull/4903)) - Fixed an issue where token values in px weren't converted to rems ([#5000](https://github.com/Shopify/polaris-react/pull/5000)) - Fixed `display` on `Banner` `secondaryAction` in Firefox ([#5001](https://github.com/Shopify/polaris-react/pull/5001)) +- Fixed `display` on `Banner` `secondaryAction` on focus in Firefox ([#5001](https://github.com/Shopify/polaris-react/pull/5001)) ### Documentation From 37acad320b0f47aea3e3334b2c7d925868d21ac4 Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Wed, 2 Feb 2022 14:55:30 -0500 Subject: [PATCH 4/8] Update to use line height to satisfy chromatic diff --- src/components/Banner/Banner.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Banner/Banner.scss b/src/components/Banner/Banner.scss index 2642c8316f2..c8fe1917e73 100644 --- a/src/components/Banner/Banner.scss +++ b/src/components/Banner/Banner.scss @@ -269,6 +269,7 @@ $spinner-size: rem(20px); will-change: box-shadow; transition: box-shadow duration() easing(); display: block; + line-height: line-height(button); } .Button { From ba8ea3105c897a14e913f33501362d86775161ce Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Wed, 2 Feb 2022 14:58:53 -0500 Subject: [PATCH 5/8] Update Unreleased and add clarity --- UNRELEASED.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UNRELEASED.md b/UNRELEASED.md index 7ee125abdd8..22066f84f84 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -31,7 +31,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Fixed an issue where `TextField` was the wrong height on initial render ([#4903](https://github.com/Shopify/polaris-react/pull/4903)) - Fixed an issue where token values in px weren't converted to rems ([#5000](https://github.com/Shopify/polaris-react/pull/5000)) - Fixed `display` on `Banner` `secondaryAction` in Firefox ([#5001](https://github.com/Shopify/polaris-react/pull/5001)) -- Fixed `display` on `Banner` `secondaryAction` on focus in Firefox ([#5001](https://github.com/Shopify/polaris-react/pull/5001)) +- Fixed `display` and `line-height` on `Banner` `secondaryAction` on focus in Firefox ([#5001](https://github.com/Shopify/polaris-react/pull/5001)) ### Documentation From 0bcec346b7e81b42cad15aed87b2afaa0b1ebda8 Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Wed, 2 Feb 2022 15:00:29 -0500 Subject: [PATCH 6/8] Fix duplicate in Unreleased --- UNRELEASED.md | 1 - 1 file changed, 1 deletion(-) diff --git a/UNRELEASED.md b/UNRELEASED.md index 22066f84f84..4f29ee47ae7 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -30,7 +30,6 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Fixed a bug where the `Checkbox` in a `Combobox` with `allowMultiple` would steal focus and close the `Popover` when clicked ([#4895](https://github.com/Shopify/polaris-react/pull/4895)) - Fixed an issue where `TextField` was the wrong height on initial render ([#4903](https://github.com/Shopify/polaris-react/pull/4903)) - Fixed an issue where token values in px weren't converted to rems ([#5000](https://github.com/Shopify/polaris-react/pull/5000)) -- Fixed `display` on `Banner` `secondaryAction` in Firefox ([#5001](https://github.com/Shopify/polaris-react/pull/5001)) - Fixed `display` and `line-height` on `Banner` `secondaryAction` on focus in Firefox ([#5001](https://github.com/Shopify/polaris-react/pull/5001)) ### Documentation From f1f5c90831bf5a5a8d88f2c18c715684c829ba25 Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Wed, 2 Feb 2022 16:21:33 -0500 Subject: [PATCH 7/8] Fix the underline on chrome without using line height --- src/components/Banner/Banner.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Banner/Banner.scss b/src/components/Banner/Banner.scss index c8fe1917e73..458e871588f 100644 --- a/src/components/Banner/Banner.scss +++ b/src/components/Banner/Banner.scss @@ -260,6 +260,7 @@ $spinner-size: rem(20px); @include focus-ring($style: 'focused'); box-shadow: none; background-color: transparent; + display: block; } } @@ -268,8 +269,6 @@ $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(); - display: block; - line-height: line-height(button); } .Button { From 24b79e471eca63d46e344b9c08a8e4d5649a3880 Mon Sep 17 00:00:00 2001 From: Amy Fairbrother Date: Wed, 2 Feb 2022 16:23:44 -0500 Subject: [PATCH 8/8] Fix unreleased notes --- UNRELEASED.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UNRELEASED.md b/UNRELEASED.md index 4f29ee47ae7..a4e70a3cb7e 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -30,7 +30,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t - Fixed a bug where the `Checkbox` in a `Combobox` with `allowMultiple` would steal focus and close the `Popover` when clicked ([#4895](https://github.com/Shopify/polaris-react/pull/4895)) - Fixed an issue where `TextField` was the wrong height on initial render ([#4903](https://github.com/Shopify/polaris-react/pull/4903)) - Fixed an issue where token values in px weren't converted to rems ([#5000](https://github.com/Shopify/polaris-react/pull/5000)) -- Fixed `display` and `line-height` on `Banner` `secondaryAction` on focus in Firefox ([#5001](https://github.com/Shopify/polaris-react/pull/5001)) +- Fixed `display` on `Banner` `secondaryAction` on focus in Firefox ([#5001](https://github.com/Shopify/polaris-react/pull/5001)) ### Documentation