File tree Expand file tree Collapse file tree 6 files changed +64
-2
lines changed Expand file tree Collapse file tree 6 files changed +64
-2
lines changed Original file line number Diff line number Diff line change 9
9
< script type ="module ">
10
10
import '@vaadin/date-time-picker' ;
11
11
import '@vaadin/tooltip' ;
12
+ import '@vaadin/vaadin-lumo-styles/lumo.css' ;
12
13
</ script >
13
14
</ head >
14
15
< body >
Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ import { defineCustomElement } from '@vaadin/component-base/src/define.js';
10
10
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js' ;
11
11
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js' ;
12
12
import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js' ;
13
+ import { CSSInjectionMixin } from '@vaadin/vaadin-themable-mixin/css-injection-mixin.js' ;
13
14
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js' ;
14
15
import { DateTimePickerMixin } from './vaadin-date-time-picker-mixin.js' ;
15
16
@@ -97,7 +98,9 @@ import { DateTimePickerMixin } from './vaadin-date-time-picker-mixin.js';
97
98
* @mixes ThemableMixin
98
99
* @mixes DateTimePickerMixin
99
100
*/
100
- class DateTimePicker extends DateTimePickerMixin ( ThemableMixin ( ElementMixin ( PolylitMixin ( LitElement ) ) ) ) {
101
+ class DateTimePicker extends DateTimePickerMixin (
102
+ ThemableMixin ( ElementMixin ( CSSInjectionMixin ( PolylitMixin ( LitElement ) ) ) ) ,
103
+ ) {
101
104
static get is ( ) {
102
105
return 'vaadin-date-time-picker' ;
103
106
}
Original file line number Diff line number Diff line change 1
1
import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js' ;
2
2
import { visualDiff } from '@web/test-runner-visual-regression' ;
3
+ import '@vaadin/vaadin-lumo-styles/props.css' ;
4
+ import '@vaadin/vaadin-lumo-styles/components/date-time-picker.css' ;
3
5
import '../common.js' ;
4
- import '../../../theme/lumo/ vaadin-date-time-picker.js' ;
6
+ import '../../../vaadin-date-time-picker.js' ;
5
7
6
8
describe ( 'date-time-picker' , ( ) => {
7
9
let div , element ;
Original file line number Diff line number Diff line change 8
8
@import './components/combo-box.css' ;
9
9
@import './components/custom-field.css' ;
10
10
@import './components/date-picker.css' ;
11
+ @import './components/date-time-picker.css' ;
11
12
@import './components/details-summary.css' ;
12
13
@import './components/details.css' ;
13
14
@import './components/email-field.css' ;
Original file line number Diff line number Diff line change
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 './date-picker.css' ;
7
+ @import './time-picker.css' ;
8
+
9
+ @import '../src/mixins/base-layer-reset.css' vaadin-date-time-picker;
10
+ @import '../src/mixins/field-label.css' vaadin-date-time-picker;
11
+ @import '../src/mixins/field-required.css' vaadin-date-time-picker;
12
+ @import '../src/mixins/field-error-message.css' vaadin-date-time-picker;
13
+ @import '../src/mixins/field-button.css' vaadin-date-time-picker;
14
+ @import '../src/mixins/field-helper.css' vaadin-date-time-picker;
15
+ @import '../src/mixins/field-base.css' vaadin-date-time-picker;
16
+ @import '../src/components/custom-field.css' vaadin-date-time-picker;
17
+ @import '../src/components/date-time-picker.css' vaadin-date-time-picker;
18
+
19
+ html {
20
+ --vaadin-date-time-picker-css-inject : 1 ;
21
+ }
Original file line number Diff line number Diff line change
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
+ .vaadin-date-time-picker-container {
7
+ --vaadin-field-default-width : auto;
8
+ }
9
+
10
+ .slots {
11
+ display : flex;
12
+ --vaadin-field-default-width : 12em ;
13
+ }
14
+
15
+ .slots ::slotted ([slot = 'date-picker' ]) {
16
+ min-width : 0 ;
17
+ flex : 1 1 auto;
18
+ }
19
+
20
+ .slots ::slotted ([slot = 'time-picker' ]) {
21
+ min-width : 0 ;
22
+ flex : 1 1.65 auto;
23
+ }
24
+
25
+ ::slotted ([slot = 'date-picker' ]) {
26
+ margin-inline-end : 2px ;
27
+ --vaadin-input-field-top-end-radius : 0 ;
28
+ --vaadin-input-field-bottom-end-radius : 0 ;
29
+ }
30
+
31
+ ::slotted ([slot = 'time-picker' ]) {
32
+ --vaadin-input-field-top-start-radius : 0 ;
33
+ --vaadin-input-field-bottom-start-radius : 0 ;
34
+ }
You can’t perform that action at this time.
0 commit comments