Skip to content

Commit a32ed95

Browse files
committed
fix(calendar): update Indigo theme styles for improved consistency
1 parent 1aff4d7 commit a32ed95

File tree

1 file changed

+66
-10
lines changed

1 file changed

+66
-10
lines changed

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

Lines changed: 66 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -551,9 +551,8 @@
551551
content: '';
552552
position: absolute;
553553
background: var-get($theme, 'week-number-background');
554-
border-inline: rem(1px) solid var-get($theme, 'week-number-background');
555-
inset-block-start: 100%;
556-
height: calc(#{$date-view-row-gap} + #{rem(if($variant == 'indigo', 0px, 2px))});
554+
inset-block-start: calc(100% + #{$border-size});
555+
height: $date-view-row-gap;
557556
width: $date-size;
558557
}
559558
}
@@ -775,15 +774,18 @@
775774
color: var-get($theme, 'week-number-foreground');
776775
background: var-get($theme, 'week-number-background');
777776

778-
// This is not an actual date and should not change it's border when changing the date border
779-
border-color: var-get($theme, 'week-number-background');
780-
781777
&::before {
782778
content: '';
783779
position: absolute;
784780
background: var-get($theme, 'week-number-background');
785-
inset-block-start: 100%;
786-
height: calc(#{$date-view-row-gap} + #{rem(if($variant == 'indigo', 0, 2px))});
781+
782+
@if $variant != 'indigo' {
783+
inset-block-start: calc(100% + #{$border-size});
784+
} @else {
785+
inset-block-start: 100%;
786+
}
787+
788+
height: $date-view-row-gap;
787789
width: $date-size;
788790
}
789791
}
@@ -1707,6 +1709,10 @@
17071709
background: var-get($theme, 'date-selected-current-range-background');
17081710
}
17091711

1712+
@if $variant == 'indigo' {
1713+
border-color: var-get($theme, 'date-selected-current-border-color');
1714+
}
1715+
17101716
@if $variant == 'fluent' {
17111717
&::before {
17121718
background: var-get($theme, 'date-selected-current-range-background');
@@ -1720,6 +1726,9 @@
17201726
&:hover {
17211727
color: var-get($theme, 'date-selected-current-range-hover-foreground');
17221728

1729+
@if $variant == 'indigo' {
1730+
border-color: var-get($theme, 'date-selected-current-hover-border-color');
1731+
}
17231732

17241733
@if $variant != 'fluent' {
17251734
background: var-get($theme, 'date-selected-current-range-hover-background');
@@ -1743,6 +1752,10 @@
17431752
%date-inner {
17441753
color: var-get($theme, 'date-selected-current-range-focus-foreground');
17451754

1755+
@if $variant == 'indigo' {
1756+
border-color: var-get($theme, 'date-selected-current-focus-border-color');
1757+
}
1758+
17461759
@if $variant != 'fluent' {
17471760
background: var-get($theme, 'date-selected-current-range-focus-background');
17481761
}
@@ -1759,7 +1772,7 @@
17591772
}
17601773
}
17611774

1762-
@if $variant == 'bootstrap' {
1775+
@if $variant == 'bootstrap' or $variant == 'indigo' {
17631776
%date-selected-current-range-not-first-last {
17641777
%date-inner {
17651778
border-color: var-get($theme, 'date-current-border-color');
@@ -1777,6 +1790,24 @@
17771790
}
17781791
}
17791792

1793+
@if $variant == 'indigo' {
1794+
%date-selected-current-range-not-first-last {
1795+
%date-inner {
1796+
color: var-get($theme, 'date-current-foreground');
1797+
1798+
&:hover {
1799+
color: var-get($theme, 'date-current-hover-foreground');
1800+
}
1801+
}
1802+
}
1803+
1804+
%date-selected-current-range-active-not-first-last {
1805+
%date-inner {
1806+
color: var-get($theme, 'date-current-focus-foreground');
1807+
}
1808+
}
1809+
}
1810+
17801811
%date-selected-current-range-first,
17811812
%date-selected-current-range-last {
17821813
%date-inner {
@@ -1961,6 +1992,7 @@
19611992
%date-inner {
19621993
color: var-get($theme, 'date-selected-foreground');
19631994
background: var-get($theme, 'date-selected-background');
1995+
border-color: var-get($theme, 'date-selected-current-border-color');
19641996

19651997
&::after {
19661998
width: calc($date-inner-size - #{rem(4px)});
@@ -1971,6 +2003,7 @@
19712003
&:hover {
19722004
color: var-get($theme, 'date-selected-hover-foreground');
19732005
background: var-get($theme, 'date-selected-hover-background');
2006+
border-color: var-get($theme, 'date-selected-current-hover-border-color');
19742007

19752008
// stylelint-disable-next-line
19762009
&::after {
@@ -1987,6 +2020,7 @@
19872020
%date-inner {
19882021
color: var-get($theme, 'date-selected-focus-foreground') !important;
19892022
background: var-get($theme, 'date-selected-focus-background') !important;
2023+
border-color: var-get($theme, 'date-selected-current-focus-border-color');
19902024

19912025
&::after {
19922026
width: calc($date-inner-size - #{rem(4px)});
@@ -2608,7 +2642,9 @@
26082642
}
26092643

26102644
%date-inner {
2611-
border-color: var-get($theme, 'date-selected-focus-border-color');
2645+
@if $variant != 'indigo' {
2646+
border-color: var-get($theme, 'date-selected-focus-border-color');
2647+
}
26122648
}
26132649

26142650
@if $variant == 'bootstrap' {
@@ -2674,6 +2710,26 @@
26742710
}
26752711
}
26762712

2713+
@if $variant == 'material' {
2714+
%date-first-preview-current,
2715+
%date-last-preview-current {
2716+
%date-inner {
2717+
border-color: var-get($theme, 'date-current-border-color');
2718+
2719+
&:hover {
2720+
border-color: var-get($theme, 'date-current-hover-border-color');
2721+
}
2722+
}
2723+
}
2724+
2725+
%date-first-preview-current-active,
2726+
%date-last-preview-current-active {
2727+
%date-inner {
2728+
border-color: var-get($theme, 'date-current-focus-border-color');
2729+
}
2730+
}
2731+
}
2732+
26772733
%date-first-preview {
26782734
background: transparent;
26792735
border-block-color: transparent ;

0 commit comments

Comments
 (0)