Skip to content

Commit 09e8d10

Browse files
fix(time-picker): visual discrepancies (#345)
* fix(time-picker): visual discrepancies * refactor(time-picker): remove redundant property * fix(time-picker): active item background --------- Co-authored-by: Simeon Simeonoff <sim.simeonoff@gmail.com>
1 parent aac814e commit 09e8d10

3 files changed

Lines changed: 220 additions & 111 deletions

File tree

sass/themes/schemas/components/dark/_time-picker.scss

Lines changed: 94 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,27 @@
1010

1111
/// Generates a dark material time-picker schema.
1212
/// @type {Map}
13+
/// @prop {Map} hover-text-color [color: ('secondary', 200)] - The hover text color of an open time picker.
14+
/// @prop {Map} selected-text-color [color: ('secondary', 200)] - The text color of a selected item in time picker.
1315
/// @prop {Map} divider-color [color: ('gray', 100)] - The divider color of the time picker.
1416
/// @requires $material-time-picker
1517
$dark-material-time-picker: extend(
1618
$material-time-picker,
1719
(
20+
hover-text-color: (
21+
color: (
22+
'secondary',
23+
200,
24+
),
25+
),
26+
27+
selected-text-color: (
28+
color: (
29+
'secondary',
30+
200,
31+
),
32+
),
33+
1834
divider-color: (
1935
color: (
2036
'gray',
@@ -26,11 +42,59 @@ $dark-material-time-picker: extend(
2642

2743
/// Generates a dark fluent time-picker schema.
2844
/// @type {Map}
45+
/// @prop {Map} hover-text-color [color: ('primary', 200)] - The hover text color of an open time picker.
46+
/// @prop {Map} selected-text-color [color: ('primary', 200)] - The text color of a selected item in time picker.
47+
/// @prop {Map} header-background [color: ('primary', 200)] - The header background color of a time picker.
48+
/// @prop {Map} header-hour-text-color [contrast-color: ('primary', 200)] - The header hour text color of a time picker.
49+
/// @prop {Map} active-item-foreground [contrast-color: ('primary', 200)] - The foreground color for current item in focused column inside the time picker.
50+
/// @prop {Map} active-item-background [color: ('primary', 200)] - The background color for current item in focused column inside the time picker.
2951
/// @prop {Map} divider-color [color: ('gray', 100)] - The divider color of the time picker.
3052
/// @requires $fluent-time-picker
3153
$dark-fluent-time-picker: extend(
3254
$fluent-time-picker,
3355
(
56+
hover-text-color: (
57+
color: (
58+
'primary',
59+
200,
60+
),
61+
),
62+
63+
selected-text-color: (
64+
color: (
65+
'primary',
66+
200,
67+
),
68+
),
69+
70+
header-background: (
71+
color: (
72+
'primary',
73+
200,
74+
),
75+
),
76+
77+
header-hour-text-color: (
78+
contrast-color: (
79+
'primary',
80+
200,
81+
),
82+
),
83+
84+
active-item-foreground: (
85+
contrast-color: (
86+
'primary',
87+
200,
88+
),
89+
),
90+
91+
active-item-background: (
92+
color: (
93+
'primary',
94+
200,
95+
),
96+
),
97+
3498
divider-color: (
3599
color: (
36100
'gray',
@@ -42,8 +106,35 @@ $dark-fluent-time-picker: extend(
42106

43107
/// Generates a dark bootstrap time-picker schema.
44108
/// @type {Map}
109+
/// @prop {Map} hover-text-color [color: ('primary', 300)] - The hover text color of an open time picker.
110+
/// @prop {Map} active-item-background [color: ('primary', 500)] - The background color for current item in focused column inside the time picker.
111+
/// @prop {Map} selected-text-color [color: ('primary', 300)] - The text color of a selected item in time picker.
45112
/// @requires $bootstrap-time-picker
46-
$dark-bootstrap-time-picker: $bootstrap-time-picker;
113+
$dark-bootstrap-time-picker: extend(
114+
$bootstrap-time-picker,
115+
(
116+
hover-text-color: (
117+
color: (
118+
'primary',
119+
300,
120+
),
121+
),
122+
123+
active-item-background: (
124+
color: (
125+
'primary',
126+
500,
127+
),
128+
),
129+
130+
selected-text-color: (
131+
color: (
132+
'primary',
133+
300,
134+
),
135+
),
136+
)
137+
);
47138

48139
/// Generates a dark indigo time-picker schema.
49140
/// @type {Map}
@@ -52,10 +143,9 @@ $dark-bootstrap-time-picker: $bootstrap-time-picker;
52143
/// @prop {Map} header-background [color: ('gray', 50)] - The header background color of a time picker.
53144
/// @prop {Map} selected-text-color [color: ('primary', 200)] - The text color of a selected item in time picker.
54145
/// @prop {Map} hover-text-color [color: ('primary', 200)] - The hover text color of an open time picker.
55-
/// @prop {Color} border-color [color: ('gray', 100)] - The border-color of the time picker.
56-
/// @prop {Color} divider-color [color: ('gray', 100)] - The divider color of the time picker.
146+
/// @prop {Map} border-color [color: ('gray', 100)] - The border-color of the time picker.
147+
/// @prop {Map} divider-color [color: ('gray', 100)] - The divider color of the time picker.
57148
/// @prop {Map} header-hour-text-color [contrast-color: ('gray', 50)] - The header hour text color of a time picker.
58-
/// @prop {Map} header-time-period-color [contrast-color: ('gray', 50)] - The header AM/PM text color of a time picker.
59149
/// @requires $indigo-time-picker
60150
$dark-indigo-time-picker: extend(
61151
$indigo-time-picker,
@@ -96,13 +186,6 @@ $dark-indigo-time-picker: extend(
96186
),
97187
),
98188

99-
header-time-period-color: (
100-
contrast-color: (
101-
'gray',
102-
50,
103-
),
104-
),
105-
106189
selected-text-color: (
107190
color: (
108191
'primary',

sass/themes/schemas/components/elevation/_time-picker.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
/// @type Map
88
/// @prop {Number} modal-elevation [24] - The elevation level, between 0-24, to be used for the time picker in modal mode.
9-
/// @prop {Number} dropdown-elevation [8] - The elevation level, between 0-24, to be used for the time picker in dropdown mode.
9+
/// @prop {Number} dropdown-elevation [3] - The elevation level, between 0-24, to be used for the time picker in dropdown mode.
1010
$default-elevation-time-picker: (
1111
modal-elevation: 24,
12-
dropdown-elevation: 8,
12+
dropdown-elevation: 3,
1313
);
1414
$indigo-elevation-time-picker: (
1515
modal-elevation: 5,

0 commit comments

Comments
 (0)