Skip to content

Commit 1aff4d7

Browse files
committed
fix(calendar): fix calendar bootstrap theme parity with web components
1 parent e04056f commit 1aff4d7

File tree

2 files changed

+353
-40
lines changed

2 files changed

+353
-40
lines changed

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

Lines changed: 85 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@
138138
@extend %date-selected !optional;
139139
}
140140

141+
@include e(date, 'selected', $not: ('range')) {
142+
@extend %date-selected-not-in-range !optional;
143+
}
144+
141145
@include e(date, $mods: ('selected', 'first', 'last')) {
142146
@extend %date-selected-first-last !optional;
143147
}
@@ -182,6 +186,10 @@
182186
@extend %date-selected-active !optional;
183187
}
184188

189+
@include e(date, $mods: ('selected', 'active'), $not: ('range')) {
190+
@extend %date-selected-active-not-in-range !optional;
191+
}
192+
185193
@include e(date, $mods: ('selected', 'special')) {
186194
@extend %date-selected-special !optional;
187195
}
@@ -198,6 +206,18 @@
198206
@extend %date-selected-special-first-last !optional;
199207
}
200208

209+
@include e(date, $mods: ('selected', 'special', 'first', 'active')) {
210+
@extend %date-selected-special-first-active !optional;
211+
}
212+
213+
@include e(date, $mods: ('selected', 'special', 'last', 'active')) {
214+
@extend %date-selected-special-last-active !optional;
215+
}
216+
217+
@include e(date, $mods: ('selected', 'special', 'first', 'last', 'active')) {
218+
@extend %date-selected-special-first-last-active !optional;
219+
}
220+
201221
@include e(date, $mods: ('selected', 'special', 'active')) {
202222
@extend %date-selected-special-active !optional;
203223
}
@@ -235,19 +255,29 @@
235255
@extend %date-range-preview !optional;
236256
}
237257

258+
@include e(date, $mods: ('range-preview', 'inactive')) {
259+
@extend %date-range-preview-inactive !optional;
260+
}
261+
238262
@include e(date, $mods: ('range-preview', 'active')) {
239263
@extend %date-range-preview-active !optional;
240264
}
241265

242-
243266
@include e(date, $mods: ('range-preview', 'weekend')) {
244267
@extend %date-range-preview-weekend !optional;
245268
}
246269

247-
@include e(date, $mods: ('range-preview', 'weekend', active)) {
248-
@extend %date-range-preview-weekend-active !optional;
270+
@include e(date, $mods: ('range-preview', 'weekend', 'first')) {
271+
@extend %date-range-preview-weekend-first !optional;
272+
}
273+
274+
@include e(date, $mods: ('range-preview', 'weekend', 'last')) {
275+
@extend %date-range-preview-weekend-last !optional;
249276
}
250277

278+
@include e(date, $mods: ('range-preview', 'weekend', 'active')) {
279+
@extend %date-range-preview-weekend-active !optional;
280+
}
251281

252282
@include e(date, $mods: ('range-preview', 'current')) {
253283
@extend %date-range-preview-current !optional;
@@ -261,10 +291,6 @@
261291
@extend %date-range-preview-special !optional;
262292
}
263293

264-
@include e(date, $mods: ('range-preview', 'special', 'current')) {
265-
@extend %date-range-preview-special-current !optional;
266-
}
267-
268294
@include e(date, $mods: ('range', 'selected')) {
269295
@extend %date-range-selected !optional;
270296
}
@@ -277,6 +303,10 @@
277303
@extend %date-range-selected-current-first !optional;
278304
}
279305

306+
@include e(date, $mods: ('range', 'selected', 'current', 'first', 'active')) {
307+
@extend %date-range-selected-current-first-active !optional;
308+
}
309+
280310
@include e(date, $mods: ('range', 'selected', 'special', 'first')) {
281311
@extend %date-range-selected-special-first !optional;
282312
}
@@ -285,6 +315,10 @@
285315
@extend %date-range-selected-current-last !optional;
286316
}
287317

318+
@include e(date, $mods: ('range', 'selected', 'current', 'last', 'active')) {
319+
@extend %date-range-selected-current-last-active !optional;
320+
}
321+
288322
@include e(date, $mods: ('range', 'selected', 'first')) {
289323
@extend %date-range-selected-first !optional;
290324
}
@@ -357,6 +391,13 @@
357391
@extend %date-selected-current-range-active !optional;
358392
}
359393

394+
@include e(date, $mods: ('range', 'selected', 'current'), $not: ('first', 'last')) {
395+
@extend %date-selected-current-range-not-first-last !optional;
396+
}
397+
398+
@include e(date, $mods: ('range', 'selected', 'current', 'active'), $not: ('first', 'last')) {
399+
@extend %date-selected-current-range-active-not-first-last !optional;
400+
}
360401

361402
@include e(date, $mods: ('range', 'selected', 'current', 'special')) {
362403
@extend %date-selected-current-range-special!optional;
@@ -466,6 +507,10 @@
466507
@extend %date-special-range-preview !optional;
467508
}
468509

510+
@include e(date, $mods: ('special', 'range-preview', 'disabled')) {
511+
@extend %date-special-range-preview-disabled !optional;
512+
}
513+
469514
@include e(date, $mods: ('special', 'current', 'range-preview')) {
470515
@extend %date-special-current-range-preview !optional;
471516
}
@@ -531,6 +576,10 @@
531576
@extend %date-first-special !optional;
532577
}
533578

579+
@include e(date, $mods: ('first', 'special', 'active')) {
580+
@extend %date-first-special-active !optional;
581+
}
582+
534583
@include e(date, $mods: ('first', 'current')) {
535584
@extend %date-first-current !optional;
536585
}
@@ -551,18 +600,40 @@
551600
@extend %date-first-preview-selected !optional;
552601
}
553602

554-
@include e(date, $mods: ('first', 'range-preview', 'current', 'selected')) {
555-
@extend %date-first-preview-current-selected !optional;
603+
@include e(date, $mods: ('first', 'range-preview', 'selected', 'active')) {
604+
@extend %date-first-preview-selected-active !optional;
605+
}
606+
607+
@include e(date, $mods: ('first', 'range-preview', 'current')) {
608+
@extend %date-first-preview-current !optional;
609+
}
610+
611+
@include e(date, $mods: ('first', 'range-preview', 'current', 'active')) {
612+
@extend %date-first-preview-current-active !optional;
556613
}
557614

558615
@include e(date, $mods: ('last', 'range-preview', 'selected')) {
559616
@extend %date-last-preview-selected !optional;
560617
}
561618

562-
@include e(date, $mods: ('last', 'range-preview', 'current', 'selected')) {
619+
@include e(date, $mods: ('last', 'range-preview', 'selected', 'active')) {
620+
@extend %date-last-preview-selected-active !optional;
621+
}
622+
623+
@include e(date, $mods: ('last', 'range-preview', 'current', 'selected')) {
563624
@extend %date-last-preview-current-selected !optional;
564625
}
565626

627+
628+
629+
@include e(date, $mods: ('last', 'range-preview', 'current')) {
630+
@extend %date-last-preview-current !optional;
631+
}
632+
633+
@include e(date, $mods: ('last', 'range-preview', 'current', 'active')) {
634+
@extend %date-last-preview-current-active !optional;
635+
}
636+
566637
@include e(date, $mods: ('first', 'range-preview', 'special')) {
567638
@extend %date-first-preview-special !optional;
568639
}
@@ -623,6 +694,10 @@
623694
@extend %date-last-special !optional;
624695
}
625696

697+
@include e(date, $mods: ('last', 'special', 'active')) {
698+
@extend %date-last-special-active !optional;
699+
}
700+
626701
@include e(date, $mods: ('last', 'current')) {
627702
@extend %date-last-current !optional;
628703
}

0 commit comments

Comments
 (0)