Skip to content

Commit 9ea525c

Browse files
desig9steindesig9stein
committed
fix(calendar): fix material and indigo theme styles to match webC
1 parent 641768d commit 9ea525c

File tree

2 files changed

+352
-222
lines changed

2 files changed

+352
-222
lines changed

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

Lines changed: 100 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -110,26 +110,22 @@
110110
@extend %days-view-row !optional;
111111
}
112112

113-
@include e(date) {
114-
@extend %date !optional;
115-
}
116-
117113
@include e(date-inner) {
118114
@extend %date-inner !optional;
119115
}
120116

117+
@include e(date) {
118+
@extend %date !optional;
119+
}
120+
121121
@include e(date, 'week-number') {
122122
@extend %date-week-number !optional;
123123
}
124124

125-
@include e(date, 'inactive') {
125+
@include e(date, 'inactive', $not: (range, selected, first, last, current, special, disabled)) {
126126
@extend %date-inactive !optional;
127127
}
128128

129-
@include e(date, $mods: ('inactive', 'special')) {
130-
@extend %date-inactive-special !optional;
131-
}
132-
133129
@include e(date, 'active') {
134130
@extend %date-active !optional;
135131
}
@@ -146,6 +142,18 @@
146142
@extend %date-selected-special !optional;
147143
}
148144

145+
@include e(date, $mods: ('selected', 'special', 'first')) {
146+
@extend %date-selected-special-first !optional;
147+
}
148+
149+
@include e(date, $mods: ('selected', 'special', 'last')) {
150+
@extend %date-selected-special-last !optional;
151+
}
152+
153+
@include e(date, $mods: ('selected', 'special', 'first', 'last')) {
154+
@extend %date-selected-special-first-last !optional;
155+
}
156+
149157
@include e(date, $mods: ('selected', 'special', 'active')) {
150158
@extend %date-selected-special-active !optional;
151159
}
@@ -175,12 +183,12 @@
175183
}
176184
}
177185

178-
@include e(date, 'range-preview') {
179-
@extend %date-range-preview !optional;
186+
@include e(date, 'range', $not: ('first', 'last', 'current', 'special')) {
187+
@extend %date-range-not-first-last-current-special !optional;
180188
}
181189

182-
@include e(date, $mods: ('range-preview', 'inactive')) {
183-
@extend %date-range-preview-inactive !optional;
190+
@include e(date, 'range-preview') {
191+
@extend %date-range-preview !optional;
184192
}
185193

186194
@include e(date, $mods: ('range-preview', 'current')) {
@@ -199,10 +207,6 @@
199207
@extend %date-range-selected !optional;
200208
}
201209

202-
@include e(date, $mods: ('range', 'selected', 'first')) {
203-
@extend %date-range-selected-first !optional;
204-
}
205-
206210
@include e(date, $mods: ('first', 'last')) {
207211
@extend %date-first-last !optional;
208212
}
@@ -219,10 +223,22 @@
219223
@extend %date-range-selected-current-last !optional;
220224
}
221225

226+
@include e(date, $mods: ('range', 'selected', 'first')) {
227+
@extend %date-range-selected-first !optional;
228+
}
229+
222230
@include e(date, $mods: ('range', 'selected', 'last')) {
223231
@extend %date-range-selected-last !optional;
224232
}
225233

234+
@include e(date, $mods: ('range', 'first')) {
235+
@extend %date-range-first !optional;
236+
}
237+
238+
@include e(date, $mods: ('range', 'last')) {
239+
@extend %date-range-last !optional;
240+
}
241+
226242
@include e(date, $mods: ('range', 'selected', 'special', 'last')) {
227243
@extend %date-range-selected-special-last !optional;
228244
}
@@ -236,11 +252,11 @@
236252
}
237253

238254
@include e(date, $mods: ('selected', 'special', 'current', 'preview', 'first')) {
239-
@extend %date-selected-special-current-last !optional;
255+
@extend %date-selected-special-current-first !optional;
240256
}
241257

242258
@include e(date, $mods: ('selected', 'special', 'current', 'preview', 'last')) {
243-
@extend %date-selected-special-current-first !optional;
259+
@extend %date-selected-special-current-last !optional;
244260
}
245261

246262
@include e(date, $mods: ('range', 'selected', 'active')) {
@@ -263,11 +279,11 @@
263279
@extend %date-selected-current-range-active !optional;
264280
}
265281

266-
@include e(date, $mods: ('range', 'selected', 'current', 'special')) {
282+
@include e(date, $mods: ('range', 'selected', 'current', 'special'), $not: ('first', 'last')) {
267283
@extend %date-selected-current-range-special !optional;
268284
}
269285

270-
@include e(date, $mods: ('range', 'selected', 'current', 'special', 'active')) {
286+
@include e(date, $mods: ('range', 'selected', 'current', 'special', 'active'), $not: ('first', 'last')) {
271287
@extend %date-selected-current-range-special-active !optional;
272288
}
273289

@@ -319,6 +335,30 @@
319335
@extend %date-selected-current-active !optional;
320336
}
321337

338+
@include e(date, $mods: ('current', 'selected', 'first')) {
339+
@extend %date-selected-current-first !optional;
340+
}
341+
342+
@include e(date, $mods: ('current', 'selected', 'last')) {
343+
@extend %date-selected-current-last !optional;
344+
}
345+
346+
@include e(date, $mods: ('current', 'selected', 'first', 'last')) {
347+
@extend %date-selected-current-first-last !optional;
348+
}
349+
350+
@include e(date, $mods: ('current', 'selected', 'first', 'active')) {
351+
@extend %date-selected-current-first-active !optional;
352+
}
353+
354+
@include e(date, $mods: ('current', 'selected', 'last', 'active')) {
355+
@extend %date-selected-current-last-active !optional;
356+
}
357+
358+
@include e(date, $mods: ('current', 'selected', 'first', 'last', 'active')) {
359+
@extend %date-selected-current-first-last-active !optional;
360+
}
361+
322362
@include e(date, $mods: ('current', 'selected', 'special')) {
323363
@extend %date-selected-current-special !optional;
324364
}
@@ -331,6 +371,10 @@
331371
@extend %date-special !optional;
332372
}
333373

374+
@include e(date, $mods: ('special', 'range')) {
375+
@extend %date-special-range !optional;
376+
}
377+
334378
@include e(date, $mods: ('special', 'current')) {
335379
@extend %date-special-current !optional;
336380
}
@@ -343,12 +387,15 @@
343387
@extend %date-special-current-selected-active !optional;
344388
}
345389

346-
@include e(date, $mods: ('special' 'active')) {
390+
@include e(date, $mods: ('special', 'active')) {
347391
@extend %date-special-active !optional;
348392
}
349393

394+
@include e(date, $mods: ('special', 'range', 'active')) {
395+
@extend %date-special-range-active !optional;
396+
}
397+
350398
@include e(date, $mods: ('special', 'current', 'active')) {
351-
@extend %date-special-current !optional;
352399
@extend %date-special-current-active !optional;
353400
}
354401

@@ -361,6 +408,18 @@
361408
@extend %date-first !optional;
362409
}
363410

411+
@include e(date, $mods: ('first', 'special')) {
412+
@extend %date-first-special !optional;
413+
}
414+
415+
@include e(date, $mods: ('first', 'current')) {
416+
@extend %date-first-current !optional;
417+
}
418+
419+
@include e(date, $mods: ('first', 'special', 'current')) {
420+
@extend %date-first-special-current !optional;
421+
}
422+
364423
@include e(date, $mods: ('first', 'range-preview')) {
365424
@extend %date-first-preview !optional;
366425
}
@@ -441,6 +500,18 @@
441500
@extend %date-last !optional;
442501
}
443502

503+
@include e(date, $mods: ('last', 'special')) {
504+
@extend %date-last-special !optional;
505+
}
506+
507+
@include e(date, $mods: ('last', 'current')) {
508+
@extend %date-last-current !optional;
509+
}
510+
511+
@include e(date, $mods: ('last', 'special', 'current')) {
512+
@extend %date-last-special-current !optional;
513+
}
514+
444515
@include e(label) {
445516
@extend %date !optional;
446517
@extend %weekday-label !optional;
@@ -462,7 +533,11 @@
462533
@extend %date-disabled !optional;
463534
}
464535

465-
@include e(date, $mods: ('disabled', 'range')) {
536+
@include e(date, 'disabled', $not: ('range', 'special', 'current', 'first', 'last')) {
537+
@extend %only-date-disabled !optional;
538+
}
539+
540+
@include e(date, $mods: ('disabled', 'range'), $not: ('special', 'current', 'first', 'last')) {
466541
@extend %date-disabled-range !optional;
467542
}
468543

@@ -507,7 +582,7 @@
507582
}
508583

509584
@include e(date, $mods: ('range', 'selected', 'last', 'disabled')) {
510-
@extend %date-range-selected-first-disabled !optional;
585+
@extend %date-range-selected-last-disabled !optional;
511586
}
512587
}
513588

0 commit comments

Comments
 (0)