Skip to content

Commit 5698d66

Browse files
authored
Merge pull request #7816 from IgniteUI/SIvanova/fix-indigo-calendar
fix(calendar): fix indigo calendar disabled days
2 parents 19ba672 + 010207c commit 5698d66

File tree

2 files changed

+48
-31
lines changed

2 files changed

+48
-31
lines changed

projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_calendar.scss

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,49 +39,38 @@ $_dark-bootstrap-calendar: extend(
3939

4040
/// Generates a dark indigo calendar schema.
4141
/// @type {Map}
42-
/// @prop {Map} content-text-color [igx-color: ('grays', 700)] - The main content text color.
43-
/// @prop {Map} inactive-text-color [igx-contrast-color: ('surface'), rgba: .4] - The text color for previous and next month dates.
44-
/// @prop {Map} label-color [igx-contrast-color: ('surface'), rgba: .4] - The text color for weekday labels.
45-
/// @prop {Map} weekend-text-color [igx-contrast-color: ('surface'), rgba: .4] - The text color for weekend days.
46-
/// @prop {Map} date-current-text-color [igx-contrast-color: ('surface')] - The text color for the current date.
47-
/// @prop {Color} date-current-bg-color [transparent] - The background color for the current date.
42+
/// @prop {Map} content-text-color [igx-contrast-color: ('surface')] - The main content text color.
43+
/// @prop {Map} inactive-text-color [igx-color: ('grays', 700)] - The text color for previous and next month dates.
44+
/// @prop {Map} label-color [igx-color: ('grays', 700)] - The text color for weekday labels.
45+
/// @prop {Map} weekend-text-color [igx-color: ('grays', 700)] - The text color for weekend days.
4846
/// @prop {Map} picker-arrow-color [igx-color: ('grays', 800)] - The idle picker arrow color.
4947
/// @prop {Map} picker-arrow-hover-color [igx-contrast-color: ('surface')] - The picker hover arrow color.
5048
/// @prop {Map} picker-text-color [igx-color: ('grays', 800)]- The idle picker month/year color.
5149
/// @prop {Map} picker-text-hover-color [igx-contrast-color: ('surface')]- The hover picker month/year color.
52-
/// @prop {Map} month-hover-text-color [igx-contrast-color: ('surface')] - The month hover text color.
53-
/// @prop {Map} year-hover-text-color [igx-contrast-color: ('surface')] - The year hover text color.
54-
/// @prop {Map} year-current-text-color [igx-contrast-color: ('surface')] - The text color for the current/selected year.
55-
/// @prop {Map} month-current-text-color [igx-contrast-color: ('surface')]- The text color for the current/selected month.
56-
/// @prop {Map} month-hover-current-text-color [igx-contrast-color: ('surface')]- The text color for the current/selected month on hover.
50+
/// @prop {Map} month-hover-text-color [igx-color: ('primary', 300)] - The month hover text color.
51+
/// @prop {Map} year-hover-text-color [igx-color: ('primary', 300)] - The year hover text color.
52+
/// @prop {Map} year-current-text-color [igx-color: ('primary', 300)] - The text color for the current/selected year.
53+
/// @prop {Map} month-current-text-color [igx-color: ('primary', 300)]- The text color for the current/selected month.
54+
/// @prop {Map} month-hover-current-text-color [igx-color: ('primary', 300)]- The text color for the current/selected month on hover.
5755
/// @requires extend
5856
/// @requires $_indigo-calendar
5957
$_dark-indigo-calendar: extend(
6058
$_indigo-calendar,
6159
(
6260
content-text-color: (
63-
igx-color: ('grays', 700)
61+
igx-contrast-color: ('surface')
6462
),
6563

6664
inactive-text-color: (
67-
igx-contrast-color: ('surface'),
68-
rgba: .4
69-
),
70-
71-
date-current-text-color: (
72-
igx-contrast-color: ('surface')
65+
igx-color: ('grays', 700)
7366
),
7467

75-
date-current-bg-color: transparent,
76-
7768
label-color: (
78-
igx-contrast-color: ('surface'),
79-
rgba: .4
69+
igx-color: ('grays', 700)
8070
),
8171

8272
weekend-text-color: (
83-
igx-contrast-color: ('surface'),
84-
rgba: .4
73+
igx-color: ('grays', 700)
8574
),
8675

8776
picker-arrow-color: (
@@ -101,23 +90,23 @@ $_dark-indigo-calendar: extend(
10190
),
10291

10392
month-hover-text-color: (
104-
igx-contrast-color: ('surface')
93+
igx-color: ('primary', 300)
10594
),
10695

10796
year-hover-text-color: (
108-
igx-contrast-color: ('surface')
97+
igx-color: ('primary', 300)
10998
),
11099

111100
month-current-text-color: (
112-
igx-contrast-color: ('surface')
101+
igx-color: ('primary', 300)
113102
),
114103

115104
month-hover-current-text-color: (
116-
igx-contrast-color: ('surface')
105+
igx-color: ('primary', 300)
117106
),
118107

119108
year-current-text-color: (
120-
igx-contrast-color: ('surface')
109+
igx-color: ('primary', 300)
121110
)
122111
)
123112
);

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_calendar.scss

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,16 @@ $_bootstrap-calendar: extend(
352352

353353
/// Generates an indigo calendar schema.
354354
/// @type {Map}
355-
/// @prop {Map} date-current-text-color [igx-color: ('primary', 500)] - The text color for the current date.
355+
/// @prop {Map} content-text-color [igx-color: ('grays', 900)] - The main content text color.
356+
/// @prop {Map} date-current-text-color [igx-color: ('primary', 300)] - The text color for the current date.
356357
/// @prop {Color} date-current-bg-color [transparent] - The background color for the current date.
357358
/// @prop {map} date-selected-background [igx-color: ('primary', 500)] - The background color for the selected date.
358359
/// @prop {Map} date-selected-text-color [igx-contrast-color: ('primary', 500)] - The text color for the selected date.
360+
/// @prop {Map} date-disabled-text-color [igx-color: ('grays', 300)] - The text color for disabled dates.
361+
/// @prop {Map} inactive-text-color [igx-color: ('grays', 600)] - The text color for previous and next month dates.
362+
/// @prop {Map} label-color [igx-color: ('grays', 600)] - The text color for weekday labels.
363+
/// @prop {Map} weekend-text-color [igx-color: ('grays', 600)] - The text color for weekend days.
364+
/// @prop {Color} month-hover-background [transparent] - The month hover text color.
359365
/// @prop {Map} month-hover-text-color [igx-color: ('primary', 500)] - The month hover text color.
360366
///
361367
/// @prop {Number} border-radius [3px] - The border radius used for calendar.
@@ -370,8 +376,12 @@ $_indigo-calendar: extend(
370376
(
371377
variant: 'indigo-design',
372378

379+
content-text-color: (
380+
igx-color: ('grays', 900)
381+
),
382+
373383
date-current-text-color: (
374-
igx-color: ('primary', 500)
384+
igx-color: ('primary', 300)
375385
),
376386

377387
date-current-bg-color: transparent,
@@ -384,6 +394,24 @@ $_indigo-calendar: extend(
384394
igx-contrast-color: ('primary', 500)
385395
),
386396

397+
date-disabled-text-color: (
398+
igx-color: ('grays', 300),
399+
),
400+
401+
inactive-text-color: (
402+
igx-color: ('grays', 600)
403+
),
404+
405+
label-color: (
406+
igx-color: ('grays', 600)
407+
),
408+
409+
weekend-text-color: (
410+
igx-color: ('grays', 600)
411+
),
412+
413+
month-hover-background: transparent,
414+
387415
month-hover-text-color: (
388416
igx-color: ('primary', 500)
389417
),

0 commit comments

Comments
 (0)