Skip to content

Commit 5125df4

Browse files
authored
feat: port dashboard Lumo styles to CSS files (#9390)
1 parent 7f238c0 commit 5125df4

15 files changed

Lines changed: 749 additions & 6 deletions

‎dev/dashboard-layout.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import '@vaadin/dashboard/vaadin-dashboard-layout.js';
1212
import '@vaadin/dashboard/vaadin-dashboard-widget.js';
1313
import '@vaadin/dashboard/vaadin-dashboard-section.js';
14+
import '@vaadin/vaadin-lumo-styles/lumo.css';
1415
</script>
1516

1617
<style>

‎dev/dashboard.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
<script type="module">
3535
import '@vaadin/dashboard';
36+
import '@vaadin/vaadin-lumo-styles/lumo.css';
3637

3738
const dashboard = document.querySelector('vaadin-dashboard');
3839

‎packages/dashboard/src/vaadin-dashboard-button.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ import { defineCustomElement } from '@vaadin/component-base/src/define.js';
1515
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1616
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
1717
import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
18+
import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js';
1819
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1920

20-
class DashboardButton extends ButtonMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
21+
class DashboardButton extends ButtonMixin(ElementMixin(ThemableMixin(CSSInjectionMixin(PolylitMixin(LitElement))))) {
2122
static get is() {
2223
return 'vaadin-dashboard-button';
2324
}

‎packages/dashboard/src/vaadin-dashboard-layout.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { html, LitElement } from 'lit';
1212
import { defineCustomElement } from '@vaadin/component-base/src/define.js';
1313
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1414
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
15+
import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js';
1516
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1617
import { dashboardLayoutStyles } from './styles/vaadin-dashboard-layout-core-styles.js';
1718
import { DashboardLayoutMixin } from './vaadin-dashboard-layout-mixin.js';
@@ -56,7 +57,9 @@ import { DashboardLayoutMixin } from './vaadin-dashboard-layout-mixin.js';
5657
* @mixes ElementMixin
5758
* @mixes ThemableMixin
5859
*/
59-
class DashboardLayout extends DashboardLayoutMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
60+
class DashboardLayout extends DashboardLayoutMixin(
61+
ElementMixin(ThemableMixin(CSSInjectionMixin(PolylitMixin(LitElement)))),
62+
) {
6063
static get is() {
6164
return 'vaadin-dashboard-layout';
6265
}

‎packages/dashboard/src/vaadin-dashboard-section.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { html, LitElement } from 'lit';
1212
import { defineCustomElement } from '@vaadin/component-base/src/define.js';
1313
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1414
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
15+
import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js';
1516
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1617
import { dashboardSectionStyles } from './styles/vaadin-dashboard-section-core-styles.js';
1718
import { DashboardItemMixin } from './vaadin-dashboard-item-mixin.js';
@@ -69,7 +70,9 @@ import { getDefaultI18n } from './vaadin-dashboard-item-mixin.js';
6970
* @mixes ThemableMixin
7071
* @mixes DashboardItemMixin
7172
*/
72-
class DashboardSection extends DashboardItemMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
73+
class DashboardSection extends DashboardItemMixin(
74+
ElementMixin(ThemableMixin(CSSInjectionMixin(PolylitMixin(LitElement)))),
75+
) {
7376
static get is() {
7477
return 'vaadin-dashboard-section';
7578
}

‎packages/dashboard/src/vaadin-dashboard-widget.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { html, LitElement } from 'lit';
1212
import { defineCustomElement } from '@vaadin/component-base/src/define.js';
1313
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1414
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
15+
import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js';
1516
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1617
import { dashboardWidgetStyles } from './styles/vaadin-dashboard-widget-core-styles.js';
1718
import { findAncestorInstance, SYNCHRONIZED_ATTRIBUTES, WRAPPER_LOCAL_NAME } from './vaadin-dashboard-helpers.js';
@@ -103,7 +104,9 @@ import { DashboardSection } from './vaadin-dashboard-section.js';
103104
* @mixes ThemableMixin
104105
* @mixes DashboardItemMixin
105106
*/
106-
class DashboardWidget extends DashboardItemMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
107+
class DashboardWidget extends DashboardItemMixin(
108+
ElementMixin(ThemableMixin(CSSInjectionMixin(PolylitMixin(LitElement)))),
109+
) {
107110
static get is() {
108111
return 'vaadin-dashboard-widget';
109112
}

‎packages/dashboard/src/vaadin-dashboard.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { defineCustomElement } from '@vaadin/component-base/src/define.js';
1515
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1616
import { I18nMixin } from '@vaadin/component-base/src/i18n-mixin.js';
1717
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
18+
import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js';
1819
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1920
import { dashboardStyles } from './styles/vaadin-dashboard-core-styles.js';
2021
import {
@@ -105,7 +106,7 @@ import { WidgetResizeController } from './widget-resize-controller.js';
105106
* @mixes ThemableMixin
106107
*/
107108
class Dashboard extends DashboardLayoutMixin(
108-
I18nMixin(getDefaultI18n(), ElementMixin(ThemableMixin(PolylitMixin(LitElement)))),
109+
I18nMixin(getDefaultI18n(), ElementMixin(ThemableMixin(CSSInjectionMixin(PolylitMixin(LitElement))))),
109110
) {
110111
static get is() {
111112
return 'vaadin-dashboard';

‎packages/dashboard/test/visual/lumo/dashboard.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { sendKeys } from '@vaadin/test-runner-commands';
22
import { fixtureSync, nextFrame } from '@vaadin/testing-helpers';
33
import { visualDiff } from '@web/test-runner-visual-regression';
4-
import '../../../theme/lumo/vaadin-dashboard.js';
4+
import '@vaadin/vaadin-lumo-styles/props.css';
5+
import '@vaadin/vaadin-lumo-styles/components/dashboard.css';
6+
import '../../../vaadin-dashboard.js';
57
import { html, render } from 'lit';
68
import type { Dashboard } from '../../../src/vaadin-dashboard.js';
79
import {

‎packages/vaadin-lumo-styles/components.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
@import './components/confirm-dialog.css';
1616
@import './components/context-menu.css';
1717
@import './components/custom-field.css';
18+
@import './components/dashboard.css';
1819
@import './components/date-picker.css';
1920
@import './components/date-time-picker.css';
2021
@import './components/details-summary.css';
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/**
2+
* @license
3+
* Copyright (c) 2017 - 2025 Vaadin Ltd.
4+
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
5+
*/
6+
@import '../src/mixins/base-layer-reset.css' vaadin-dashboard-layout;
7+
@import '../src/components/dashboard-layout.css' vaadin-dashboard-layout;
8+
9+
@import '../src/mixins/base-layer-reset.css' vaadin-dashboard;
10+
@import '../src/components/dashboard-layout.css' vaadin-dashboard;
11+
@import '../src/components/dashboard.css' vaadin-dashboard;
12+
13+
@import '../src/mixins/base-layer-reset.css' vaadin-dashboard-widget;
14+
@import '../src/mixins/dashboard-item.css' vaadin-dashboard-widget;
15+
@import '../src/components/dashboard-widget.css' vaadin-dashboard-widget;
16+
17+
@import '../src/mixins/base-layer-reset.css' vaadin-dashboard-section;
18+
@import '../src/mixins/dashboard-item.css' vaadin-dashboard-section;
19+
@import '../src/components/dashboard-section.css' vaadin-dashboard-section;
20+
21+
@import '../src/mixins/base-layer-reset.css' vaadin-dashboard-button;
22+
@import '../src/components/button.css' vaadin-dashboard-button;
23+
24+
html {
25+
--vaadin-dashboard-css-inject: 1;
26+
--vaadin-dashboard-widget-css-inject: 1;
27+
--vaadin-dashboard-section-css-inject: 1;
28+
--vaadin-dashboard-layout-css-inject: 1;
29+
--vaadin-dashboard-button-css-inject: 1;
30+
}

0 commit comments

Comments
 (0)