Skip to content

Commit a899468

Browse files
authored
refactor!: use --lumo-clickable-cursor for clickable elements (#2114)
1 parent f65330c commit a899468

15 files changed

Lines changed: 32 additions & 13 deletions

File tree

‎packages/vaadin-button/theme/lumo/vaadin-button-styles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ registerStyles(
2323
color: var(--_lumo-button-color, var(--lumo-primary-text-color));
2424
background-color: var(--_lumo-button-background-color, var(--lumo-contrast-5pct));
2525
border-radius: var(--lumo-border-radius-m);
26-
cursor: default;
26+
cursor: var(--lumo-clickable-cursor);
2727
-webkit-tap-highlight-color: transparent;
2828
-webkit-font-smoothing: antialiased;
2929
-moz-osx-font-smoothing: grayscale;

‎packages/vaadin-checkbox/theme/lumo/vaadin-checkbox-styles.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ registerStyles(
2828
transition: transform 0.2s cubic-bezier(0.12, 0.32, 0.54, 2), background-color 0.15s;
2929
pointer-events: none;
3030
line-height: 1.2;
31+
cursor: var(--lumo-clickable-cursor);
3132
}
3233
3334
:host([indeterminate]) [part='checkbox'],

‎packages/vaadin-crud/theme/lumo/vaadin-crud-styles.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styl
22
import '@vaadin/vaadin-lumo-styles/typography.js';
33
import '@vaadin/vaadin-lumo-styles/color.js';
44
import '@vaadin/vaadin-lumo-styles/font-icons.js';
5+
import '@vaadin/vaadin-lumo-styles/style.js';
56
import '../vaadin-dialog-layout-overlay-styles.js';
67

78
registerStyles(
@@ -17,6 +18,7 @@ registerStyles(
1718
border-radius: var(--lumo-border-radius-m);
1819
width: var(--lumo-size-s);
1920
height: var(--lumo-size-s);
21+
cursor: var(--lumo-clickable-cursor);
2022
}
2123
2224
:host::before {

‎packages/vaadin-date-picker/theme/lumo/vaadin-date-picker-overlay-content-styles.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ registerStyles(
5656
box-shadow: inset 2px 0 4px 0 var(--lumo-shade-5pct);
5757
-webkit-mask-image: linear-gradient(transparent, #000 35%, #000 65%, transparent);
5858
mask-image: linear-gradient(transparent, #000 35%, #000 65%, transparent);
59+
cursor: var(--lumo-clickable-cursor);
5960
}
6061
6162
[part='year-number'],

‎packages/vaadin-date-picker/theme/lumo/vaadin-month-calendar-styles.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ registerStyles(
6565
transition: color 0.1s;
6666
}
6767
68+
[part='date']:not(:empty) {
69+
cursor: var(--lumo-clickable-cursor);
70+
}
71+
6872
/* Today date */
6973
7074
[part='date'][today] {

‎packages/vaadin-details/theme/lumo/vaadin-details-styles.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ registerStyles(
4848
line-height: 1;
4949
color: var(--lumo-contrast-60pct);
5050
font-family: 'lumo-icons';
51+
cursor: var(--lumo-clickable-cursor);
5152
}
5253
5354
:host([disabled]) [part='summary'],
5455
:host([disabled]) [part='toggle'] {
5556
color: var(--lumo-disabled-text-color);
57+
cursor: default;
5658
}
5759
5860
@media (hover: hover) {

‎packages/vaadin-grid/test/sorting.test.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,6 @@ describe('sorting', () => {
194194
flushGrid(grid);
195195
});
196196

197-
it('should be clickable', () => {
198-
const title = sorterFirst.querySelector('.title');
199-
expect(window.getComputedStyle(title).cursor).to.equal('pointer');
200-
});
201-
202197
it('should ignore sorter', () => {
203198
sorterFirst.direction = '';
204199
const sortOrders = grid._mapSorters();

‎packages/vaadin-grid/theme/lumo/vaadin-grid-sorter-styles.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
22
import '@vaadin/vaadin-lumo-styles/color.js';
3+
import '@vaadin/vaadin-lumo-styles/style.js';
4+
import '@vaadin/vaadin-lumo-styles/spacing.js';
35

46
registerStyles(
57
'vaadin-grid-sorter',
@@ -10,6 +12,7 @@ registerStyles(
1012
-webkit-user-select: none;
1113
-moz-user-select: none;
1214
user-select: none;
15+
cursor: var(--lumo-clickable-cursor);
1316
}
1417
1518
[part='content'] {
@@ -30,6 +33,11 @@ registerStyles(
3033
color: var(--lumo-primary-text-color);
3134
}
3235
36+
:host(:hover) [part='indicators'] {
37+
color: var(--lumo-body-text-color);
38+
opacity: 0.6;
39+
}
40+
3341
[part='order'] {
3442
font-size: var(--lumo-font-size-xxs);
3543
line-height: 1;

‎packages/vaadin-grid/theme/lumo/vaadin-grid-tree-toggle-styles.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
22
import '@vaadin/vaadin-lumo-styles/color.js';
33
import '@vaadin/vaadin-lumo-styles/spacing.js';
4+
import '@vaadin/vaadin-lumo-styles/style.js';
45

56
registerStyles(
67
'vaadin-grid-tree-toggle',
@@ -25,6 +26,7 @@ registerStyles(
2526
height: 1em;
2627
text-align: center;
2728
color: var(--lumo-contrast-50pct);
29+
cursor: var(--lumo-clickable-cursor);
2830
/* Increase touch target area */
2931
padding: calc(1em / 3);
3032
margin: calc(1em / -3);

‎packages/vaadin-list-box/theme/lumo/vaadin-list-box-styles.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@ registerStyles(
1414
/* Normal item */
1515
[part='items'] ::slotted(vaadin-item) {
1616
-webkit-tap-highlight-color: var(--lumo-primary-color-10pct);
17-
cursor: default;
18-
}
19-
20-
[part='items'] ::slotted(vaadin-item) {
17+
cursor: var(--lumo-clickable-cursor);
2118
outline: none;
2219
border-radius: var(--lumo-border-radius-m);
2320
padding-left: var(--_lumo-list-box-item-padding-left, calc(var(--lumo-border-radius-m) / 4));
2421
padding-right: calc(var(--lumo-space-l) + var(--lumo-border-radius-m) / 4);
2522
}
2623
24+
[part='items'] ::slotted(vaadin-item[disabled]) {
25+
cursor: default;
26+
}
27+
2728
/* Workaround to display checkmark in IE11 when list-box is not used in dropdown-menu */
2829
[part='items'] ::slotted(vaadin-item)::before {
2930
display: var(--_lumo-item-selected-icon-display);

0 commit comments

Comments
 (0)