Skip to content

Commit b0ef82a

Browse files
authored
refactor: update aura menu item and item overlay styles (#10615)
1 parent d1fc124 commit b0ef82a

File tree

3 files changed

+25
-14
lines changed

3 files changed

+25
-14
lines changed

packages/aura/src/components/item-overlay.css

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
:where(:root),
22
:where(:host) {
3-
--vaadin-item-overlay-padding: var(--vaadin-gap-xs);
4-
--vaadin-item-border-radius: max(var(--vaadin-radius-s), var(--vaadin-radius-m) - var(--vaadin-item-overlay-padding));
3+
--aura-item-overlay-padding-inline: var(--vaadin-padding-xs);
4+
--aura-item-overlay-padding-block: var(--vaadin-padding-xs);
5+
--vaadin-item-overlay-padding: var(--aura-item-overlay-padding-block) var(--aura-item-overlay-padding-inline);
6+
--vaadin-item-border-radius: clamp(
7+
0px,
8+
var(--aura-item-overlay-padding-inline) * 100,
9+
var(--vaadin-radius-m) - min(var(--aura-item-overlay-padding-inline), var(--aura-item-overlay-padding-block))
10+
);
511
--vaadin-item-checkmark-color: var(--aura-accent-text-color);
612
--vaadin-item-gap: var(--vaadin-gap-s);
713
}
@@ -14,7 +20,7 @@
1420
vaadin-item,
1521
vaadin-menu-bar-item,
1622
vaadin-multi-select-combo-box-item,
17-
vaadin-select-item[role]
23+
vaadin-select-item:where([role])
1824
) {
1925
font-weight: var(--aura-font-weight-medium);
2026
--vaadin-item-checkmark-color: var(--aura-accent-text-color);
@@ -24,20 +30,22 @@
2430
oklch(from var(--aura-accent-color-light) min(0.9, l) c h / max(0.05, l / 4)),
2531
oklch(from var(--aura-accent-color-dark) max(0.6, l) c h / max(0.2, l / 4))
2632
);
33+
padding-inline-start: max(0px, var(--vaadin-padding-inline-container) - var(--aura-item-overlay-padding-inline));
2734
gap: 0;
2835

2936
&::part(checkmark) {
3037
--vaadin-icon-visual-size: 75%;
31-
margin-inline-start: calc(var(--vaadin-gap-xs) * -1);
3238
}
3339

34-
&[aria-haspopup='true']::after {
35-
--vaadin-icon-visual-size: 90%;
36-
margin-inline-end: calc(var(--vaadin-gap-xs) * -1);
40+
&[aria-haspopup='true'] {
41+
padding-inline-end: max(0px, var(--vaadin-padding-inline-container) - var(--aura-item-overlay-padding-inline));
42+
43+
&::after {
44+
--vaadin-icon-visual-size: 90%;
45+
}
3746
}
3847

3948
&::part(content) {
40-
display: flex;
4149
padding-inline: var(--vaadin-gap-xs);
4250
gap: var(--vaadin-item-gap);
4351
}

packages/aura/src/components/menu-bar.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,12 @@ vaadin-menu-bar-button[slot='overflow'] {
1919
vaadin-menu-bar-button[aria-haspopup='true']::part(suffix)::after {
2020
--vaadin-icon-visual-size: 90%;
2121
}
22+
23+
vaadin-menu-bar-button vaadin-menu-bar-item {
24+
padding-inline: 0;
25+
}
26+
27+
vaadin-menu-bar-button vaadin-menu-bar-item::part(content) {
28+
padding-inline: 0;
29+
gap: var(--vaadin-button-gap, var(--vaadin-gap-s));
30+
}
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
vaadin-select-item::part(content) {
2-
display: flex;
3-
align-items: center;
4-
gap: inherit;
5-
}
6-
71
vaadin-select-value-button {
82
font-weight: var(--aura-font-weight-medium);
93
}

0 commit comments

Comments
 (0)