Skip to content

Commit 46b31a6

Browse files
committed
fix(calendar): update Fluent theme styles to align with design guidelines
- Adjust date selection, hover, and focus styles. - Add support for range previews and various states specific to Fluent theme. - Refactor styles to accommodate Fluent theme-specific variants.
1 parent 9ea525c commit 46b31a6

File tree

4 files changed

+761
-120
lines changed

4 files changed

+761
-120
lines changed

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-component.scss

Lines changed: 121 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@
126126
@extend %date-inactive !optional;
127127
}
128128

129+
@include e(date, $mods: ('inactive', 'range-preview')) {
130+
@extend %date-inactive-range-preview !optional;
131+
}
132+
129133
@include e(date, 'active') {
130134
@extend %date-active !optional;
131135
}
@@ -134,6 +138,46 @@
134138
@extend %date-selected !optional;
135139
}
136140

141+
@include e(date, $mods: ('selected', 'first', 'last')) {
142+
@extend %date-selected-first-last !optional;
143+
}
144+
145+
@include e(date, $mods: ('selected', 'first', 'last', 'active')) {
146+
@extend %date-selected-first-last-active !optional;
147+
}
148+
149+
@include e(date, $mods: ('selected', 'first', 'last'), $not: ('special', 'current')) {
150+
@extend %date-selected-first-last-not-special-currnet !optional;
151+
}
152+
153+
@include e(date, $mods: ('selected', 'first', 'range-preview'), $not: ('special', 'current')) {
154+
@extend %date-selected-first-last-not-special-currnet !optional;
155+
}
156+
157+
@include e(date, $mods: ('selected', 'last', 'range-preview'), $not: ('special', 'current')) {
158+
@extend %date-selected-first-last-not-special-currnet !optional;
159+
}
160+
161+
@include e(date, $mods: ('selected', 'first', 'last', 'active'), $not: ('special', 'current')) {
162+
@extend %date-selected-first-last-active-not-special-currnet !optional;
163+
}
164+
165+
@include e(date, $mods: ('selected', 'weekend', 'first', 'last'), $not: ('special', 'current')) {
166+
@extend %date-selected-weekend-first-last-not-special-currnet !optional;
167+
}
168+
169+
@include e(date, $mods: ('selected', 'weekend', 'first', 'range-preview'), $not: ('special', 'current')) {
170+
@extend %date-selected-weekend-first-last-not-special-currnet !optional;
171+
}
172+
173+
@include e(date, $mods: ('selected', 'weekend', 'last', 'range-preview'), $not: ('special', 'current')) {
174+
@extend %date-selected-weekend-first-last-not-special-currnet !optional;
175+
}
176+
177+
@include e(date, $mods: ('selected', 'weekend', 'first', 'last', 'active'), $not: ('special', 'current')) {
178+
@extend %date-selected-weekend-first-last-active-not-special-currnet !optional;
179+
}
180+
137181
@include e(date, $mods: ('selected', 'active')) {
138182
@extend %date-selected-active !optional;
139183
}
@@ -191,10 +235,28 @@
191235
@extend %date-range-preview !optional;
192236
}
193237

238+
@include e(date, $mods: ('range-preview', 'active')) {
239+
@extend %date-range-preview-active !optional;
240+
}
241+
242+
243+
@include e(date, $mods: ('range-preview', 'weekend')) {
244+
@extend %date-range-preview-weekend !optional;
245+
}
246+
247+
@include e(date, $mods: ('range-preview', 'weekend', active)) {
248+
@extend %date-range-preview-weekend-active !optional;
249+
}
250+
251+
194252
@include e(date, $mods: ('range-preview', 'current')) {
195253
@extend %date-range-preview-current !optional;
196254
}
197255

256+
@include e(date, $mods: ('range-preview', 'current', 'active')) {
257+
@extend %date-range-preview-current-active !optional;
258+
}
259+
198260
@include e(date, $mods: ('range-preview', 'special')) {
199261
@extend %date-range-preview-special !optional;
200262
}
@@ -239,6 +301,22 @@
239301
@extend %date-range-last !optional;
240302
}
241303

304+
@include e(date, $mods: ('range', 'selected', 'special')) {
305+
@extend %date-range-selected-special !optional;
306+
}
307+
308+
@include e(date, $mods: ('range', 'selected', 'special', 'active')) {
309+
@extend %date-range-selected-special-active !optional;
310+
}
311+
312+
@include e(date, $mods: ('range', 'selected', 'special', 'current')) {
313+
@extend %date-range-selected-special-current !optional;
314+
}
315+
316+
@include e(date, $mods: ('range', 'selected', 'special', 'current', 'active')) {
317+
@extend %date-range-selected-special-current-active !optional;
318+
}
319+
242320
@include e(date, $mods: ('range', 'selected', 'special', 'last')) {
243321
@extend %date-range-selected-special-last !optional;
244322
}
@@ -279,12 +357,21 @@
279357
@extend %date-selected-current-range-active !optional;
280358
}
281359

360+
361+
@include e(date, $mods: ('range', 'selected', 'current', 'special')) {
362+
@extend %date-selected-current-range-special!optional;
363+
}
364+
365+
@include e(date, $mods: ('range', 'selected', 'current', 'special', 'active')) {
366+
@extend %date-selected-current-range-special-active !optional;
367+
}
368+
282369
@include e(date, $mods: ('range', 'selected', 'current', 'special'), $not: ('first', 'last')) {
283-
@extend %date-selected-current-range-special !optional;
370+
@extend %date-selected-current-range-special-not-first-last !optional;
284371
}
285372

286373
@include e(date, $mods: ('range', 'selected', 'current', 'special', 'active'), $not: ('first', 'last')) {
287-
@extend %date-selected-current-range-special-active !optional;
374+
@extend %date-selected-current-range-special-active-not-first-last !optional;
288375
}
289376

290377
@include e(date, $mods: ('range', 'selected', 'current', 'first')) {
@@ -375,6 +462,38 @@
375462
@extend %date-special-range !optional;
376463
}
377464

465+
@include e(date, $mods: ('special', 'range-preview')) {
466+
@extend %date-special-range-preview !optional;
467+
}
468+
469+
@include e(date, $mods: ('special', 'current', 'range-preview')) {
470+
@extend %date-special-current-range-preview !optional;
471+
}
472+
473+
@include e(date, $mods: ('special', 'selected', 'first', 'last')) {
474+
@extend %date-special-range-preview !optional;
475+
}
476+
477+
@include e(date, $mods: ('special', 'current', 'selected', 'first', 'last')) {
478+
@extend %date-special-current-range-preview !optional;
479+
}
480+
481+
@include e(date, $mods: ('special', 'range-preview', 'active')) {
482+
@extend %date-special-range-preview-active !optional;
483+
}
484+
485+
@include e(date, $mods: ('special', 'current', 'range-preview', 'active')) {
486+
@extend %date-special-current-range-preview-active !optional;
487+
}
488+
489+
@include e(date, $mods: ('special', 'selected', 'active', 'first', 'last')) {
490+
@extend %date-special-range-preview-active !optional;
491+
}
492+
493+
@include e(date, $mods: ('special', 'current', 'selected', 'active', 'first', 'last')) {
494+
@extend %date-special-current-range-preview-active !optional;
495+
}
496+
378497
@include e(date, $mods: ('special', 'current')) {
379498
@extend %date-special-current !optional;
380499
}

0 commit comments

Comments
 (0)