Skip to content

Commit a609112

Browse files
authored
refactor: simplify themable-mixin imports in src (#3009)
1 parent 1d8dede commit a609112

26 files changed

Lines changed: 26 additions & 35 deletions

‎packages/avatar-group/src/vaadin-avatar-group-overlay.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
66
import { OverlayElement } from '@vaadin/vaadin-overlay/src/vaadin-overlay.js';
7-
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
7+
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
88

99
registerStyles(
1010
'vaadin-avatar-group-overlay',

‎packages/combo-box/src/vaadin-combo-box-overlay.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
import { OverlayElement } from '@vaadin/vaadin-overlay/src/vaadin-overlay.js';
77
import { PositionMixin } from '@vaadin/vaadin-overlay/src/vaadin-overlay-position-mixin.js';
8-
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
8+
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
99

1010
registerStyles(
1111
'vaadin-combo-box-overlay',

‎packages/combo-box/src/vaadin-combo-box.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import { InputControlMixin } from '@vaadin/field-base/src/input-control-mixin.js
1212
import { InputController } from '@vaadin/field-base/src/input-controller.js';
1313
import { PatternMixin } from '@vaadin/field-base/src/pattern-mixin.js';
1414
import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js';
15-
import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
16-
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
15+
import { registerStyles, ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1716
import { ComboBoxDataProviderMixin } from './vaadin-combo-box-data-provider-mixin.js';
1817
import { ComboBoxMixin } from './vaadin-combo-box-mixin.js';
1918

‎packages/context-menu/src/vaadin-context-menu-overlay.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
import { OverlayElement } from '@vaadin/vaadin-overlay/src/vaadin-overlay.js';
77
import { PositionMixin } from '@vaadin/vaadin-overlay/src/vaadin-overlay-position-mixin.js';
8-
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
8+
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
99

1010
registerStyles(
1111
'vaadin-context-menu-overlay',

‎packages/date-picker/src/vaadin-date-picker.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import { AriaLabelController } from '@vaadin/field-base/src/aria-label-controlle
1414
import { InputControlMixin } from '@vaadin/field-base/src/input-control-mixin.js';
1515
import { InputController } from '@vaadin/field-base/src/input-controller.js';
1616
import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js';
17-
import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
18-
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
17+
import { registerStyles, ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1918
import { DatePickerMixin } from './vaadin-date-picker-mixin.js';
2019
import { datePickerStyles } from './vaadin-date-picker-styles.js';
2120

‎packages/date-time-picker/src/vaadin-date-time-picker.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import { SlotMixin } from '@vaadin/component-base/src/slot-mixin.js';
1212
import { dateEquals } from '@vaadin/date-picker/src/vaadin-date-picker-helper.js';
1313
import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
1414
import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js';
15-
import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
16-
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
15+
import { registerStyles, ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1716

1817
registerStyles('vaadin-date-time-picker', inputFieldShared, { moduleId: 'vaadin-date-time-picker' });
1918

‎packages/dialog/src/vaadin-dialog-resizable-mixin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
1+
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
22
import { eventInWindow, getMouseOrFirstTouchEvent } from './vaadin-dialog-utils.js';
33

44
registerStyles(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
99
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1010
import { processTemplates } from '@vaadin/component-base/src/templates.js';
1111
import { OverlayElement } from '@vaadin/vaadin-overlay/src/vaadin-overlay.js';
12-
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
12+
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1313
import { ThemePropertyMixin } from '@vaadin/vaadin-themable-mixin/vaadin-theme-property-mixin.js';
1414
import { DialogDraggableMixin } from './vaadin-dialog-draggable-mixin.js';
1515
import { DialogResizableMixin } from './vaadin-dialog-resizable-mixin.js';

‎packages/email-field/src/vaadin-email-field.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
66
import { TextField } from '@vaadin/text-field/src/vaadin-text-field.js';
7-
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
7+
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
88

99
// See https://github.com/vaadin/vaadin-text-field/issues/466
1010
registerStyles(

‎packages/grid/src/vaadin-grid-styles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2021 Vaadin Ltd.
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
6-
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
6+
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
77

88
registerStyles(
99
'vaadin-grid',

0 commit comments

Comments
 (0)