Skip to content

Commit 8ecad25

Browse files
authored
refactor: cleanup duplicate combo-box item styles (#3000)
1 parent 40af58b commit 8ecad25

2 files changed

Lines changed: 2 additions & 43 deletions

File tree

‎packages/combo-box/theme/lumo/vaadin-combo-box-item-styles.js‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,18 @@ import '@vaadin/vaadin-lumo-styles/style.js';
44
import { item } from '@vaadin/item/theme/lumo/vaadin-item-styles.js';
55
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
66

7-
/* TODO partly duplicated from vaadin-list-box styles. Should find a way to make it DRY */
87
const comboBoxItem = css`
98
:host {
10-
cursor: default;
11-
-webkit-tap-highlight-color: var(--lumo-primary-color-10pct);
12-
padding-left: calc(var(--lumo-border-radius-m) / 4);
13-
padding-right: calc(var(--lumo-space-l) + var(--lumo-border-radius-m) / 4);
149
transition: background-color 100ms;
15-
border-radius: var(--lumo-border-radius-m);
1610
overflow: hidden;
1711
--_lumo-item-selected-icon-display: block;
1812
}
1913
20-
:host(:hover) {
21-
background-color: var(--lumo-primary-color-10pct);
22-
}
23-
24-
:host([focused]:not([disabled])) {
25-
box-shadow: inset 0 0 0 2px var(--lumo-primary-color-50pct);
26-
}
27-
28-
@media (pointer: coarse) {
29-
:host(:hover) {
30-
background-color: transparent;
31-
}
32-
14+
@media (any-hover: hover) {
3315
:host([focused]:not([disabled])) {
34-
box-shadow: none;
16+
box-shadow: inset 0 0 0 2px var(--lumo-primary-color-50pct);
3517
}
3618
}
37-
38-
/* RTL specific styles */
39-
:host([dir='rtl']) {
40-
padding-right: calc(var(--lumo-border-radius-m) / 4);
41-
padding-left: calc(var(--lumo-space-l) + var(--lumo-border-radius-m) / 4);
42-
}
4319
`;
4420

4521
registerStyles('vaadin-combo-box-item', [item, comboBoxItem], {

‎packages/combo-box/theme/material/vaadin-combo-box-item-styles.js‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,8 @@ const comboBoxItem = css`
99
cursor: pointer;
1010
-webkit-tap-highlight-color: transparent;
1111
padding: 4px 10px;
12-
min-height: 36px;
13-
font-size: var(--material-small-font-size);
1412
--_material-item-selected-icon-display: block;
1513
}
16-
17-
:host(:hover) {
18-
background-color: var(--material-secondary-background-color);
19-
}
20-
21-
:host([focused]) {
22-
background-color: var(--material-divider-color);
23-
}
24-
25-
@media (pointer: coarse) {
26-
:host(:hover),
27-
:host([focused]) {
28-
background-color: transparent;
29-
}
30-
}
3114
`;
3215

3316
registerStyles('vaadin-combo-box-item', [item, comboBoxItem], {

0 commit comments

Comments
 (0)