Skip to content

Commit c356dd5

Browse files
authored
Use non-logical poperties for button padding (#11363)
Tested in Safari 14.1 🧭 👍 | Before | After | | --- | --- | | <img width="465" alt="before" src="https://github.com/Shopify/polaris/assets/11774595/856b3485-055b-4c39-84f8-ffe7113b92e0"> | <img width="465" alt="after" src="https://github.com/Shopify/polaris/assets/11774595/416746c6-a4b7-471d-8d16-1d33e8b008a3"> |
1 parent 42df68c commit c356dd5

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.changeset/hot-keys-develop.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@shopify/polaris': patch
3+
---
4+
5+
Fixed Button padding regression in Safari 14

polaris-react/src/components/Button/Button.module.scss

+6-8
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
display: inline-flex;
2929
align-items: center;
3030
gap: var(--pc-button-gap);
31-
padding-block: var(--pc-button-padding-block);
32-
padding-inline: var(--pc-button-padding-inline);
33-
31+
padding: var(--pc-button-padding-block) var(--pc-button-padding-inline);
3432
background: var(--pc-button-bg);
3533
border: none;
3634
border-radius: var(--p-border-radius-200);
@@ -174,8 +172,8 @@
174172
.variantPlain,
175173
.variantMonochromePlain {
176174
--pc-button-bg_disabled: transparent;
177-
margin-block: calc(-1 * var(--pc-button-padding-block));
178-
margin-inline: calc(-1 * var(--pc-button-padding-inline));
175+
margin: calc(-1 * var(--pc-button-padding-block))
176+
calc(-1 * var(--pc-button-padding-inline));
179177
font-size: var(--p-font-size-325);
180178
font-weight: var(--p-font-weight-regular);
181179
line-height: var(--p-font-line-height-400);
@@ -301,8 +299,8 @@
301299
}
302300

303301
.iconOnly:is(.variantTertiary) {
304-
margin-block: calc(-1 * var(--pc-button-padding-block));
305-
margin-inline: calc(-1 * var(--pc-button-padding-inline));
302+
margin: calc(-1 * var(--pc-button-padding-block))
303+
calc(-1 * var(--pc-button-padding-inline));
306304
}
307305

308306
.iconOnly:is(.variantTertiary, .variantPlain, .variantMonochromePlain):not(.toneCritical) {
@@ -351,7 +349,7 @@
351349

352350
// ICON
353351
.Icon {
354-
margin-block: calc(-1 * var(--p-space-050));
352+
margin: calc(-1 * var(--p-space-050)) 0;
355353
}
356354

357355
// SPINNER

0 commit comments

Comments
 (0)