Skip to content

Commit 1e6c5de

Browse files
authored
refactor: don't adjust container padding based on border-radius (#11365)
1 parent 98bc745 commit 1e6c5de

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

packages/aura/src/components/button.css

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,23 @@ Increase padding, but only for buttons that don't have an icon in the default sl
3939
Buttons that place an icon in the default slot are assumed to be icon-only buttons.
4040
*/
4141
/* prettier-ignore */
42-
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit):not(:has(> :is(vaadin-icon, svg, i[class*='fa-'], vaadin-avatar):not([slot]))) {
43-
--vaadin-button-padding: round(var(--vaadin-padding-s) / 1.4, 1px)
44-
max(var(--vaadin-padding-m), round(var(--vaadin-radius-m) / 1.5, 1px));
42+
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-crud-edit):not(:has(> :is(vaadin-icon, svg, i[class*='fa-'], vaadin-avatar):not([slot]))) {
43+
--vaadin-button-padding: var(--vaadin-padding-block-container)
44+
var(--vaadin-padding-m);
4545
}
4646

4747
/* Decrease padding when an icon is placed in the prefix or suffix slot */
4848
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button):has(
4949
> [slot='prefix']:is(vaadin-icon, svg, i[class*='fa-'], vaadin-avatar)
50-
),
51-
vaadin-drawer-toggle:empty {
52-
padding-inline-start: max(var(--vaadin-padding-s), round(var(--vaadin-radius-m) / 1.75, 1px));
50+
) {
51+
padding-inline-start: var(--vaadin-padding-s);
5352
}
5453

5554
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button):has(
5655
> [slot='suffix']:is(vaadin-icon, svg, i[class*='fa-'], vaadin-avatar)
5756
),
58-
vaadin-drawer-toggle:empty,
5957
vaadin-menu-bar-button[aria-haspopup='true']:not([slot='overflow']) {
60-
padding-inline-end: max(var(--vaadin-padding-s), round(var(--vaadin-radius-m) / 1.75, 1px));
58+
padding-inline-end: var(--vaadin-padding-s);
6159
}
6260

6361
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit):where(

packages/aura/src/size.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
--vaadin-gap-xl: round(var(--aura-base-size) * 1.5 * 1px, 1px);
2020

2121
--vaadin-padding-block-container: round(var(--vaadin-padding-s) / 1.4, 1px);
22-
--vaadin-padding-inline-container: max(var(--vaadin-padding-s), round(var(--vaadin-radius-m) / 2, 1px));
22+
--vaadin-padding-inline-container: var(--vaadin-padding-s);
2323

2424
--vaadin-padding-xs: round(var(--aura-base-size) * 0.25 * 1px, 1px);
2525
--vaadin-padding-s: round(var(--aura-base-size) * 0.5 * 1px, 1px);

0 commit comments

Comments
 (0)