Skip to content

Commit fb9119e

Browse files
authored
fix(calendar): range radius (#15697)
* fix(calendar): fix range radius and some color * chore(calendar): remove commented code
1 parent d2ec0ff commit fb9119e

File tree

2 files changed

+98
-9
lines changed

2 files changed

+98
-9
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,18 @@
393393
@extend %date-last-preview-special !optional;
394394
}
395395

396+
@include e(date, $mods: ('first', 'range-preview', 'active')) {
397+
@extend %date-first-preview-active !optional;
398+
}
399+
400+
@include e(date, $mods: ('last', 'range-preview', 'active')) {
401+
@extend %date-last-preview-active !optional;
402+
}
403+
404+
@include e(date, $mods: ('first', 'last', 'selected')) {
405+
@extend %date-first-last-selected !optional;
406+
}
407+
396408
@include e(date, $mods: ('first', 'range-preview', 'special', 'current')) {
397409
@extend %date-first-preview-special-current !optional;
398410
}

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

Lines changed: 86 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,9 @@
15781578
%date-selected-special-active {
15791579
%date-inner {
15801580
&::after {
1581-
border-color: var-get($theme, 'date-selected-special-focus-border-color');
1581+
@if $variant != 'fluent' {
1582+
border-color: var-get($theme, 'date-selected-special-focus-border-color');
1583+
}
15821584
}
15831585
}
15841586
}
@@ -1641,7 +1643,9 @@
16411643
%date-selected-special-current-first-last {
16421644
%date-inner {
16431645
&::after {
1644-
border-color: var-get($theme, 'date-selected-special-border-color');
1646+
@if $variant != 'fluent' {
1647+
border-color: var-get($theme, 'date-selected-special-border-color');
1648+
}
16451649
}
16461650
}
16471651
}
@@ -1814,7 +1818,9 @@
18141818
%date-special-current-selected-active {
18151819
%date-inner {
18161820
&::after {
1817-
border-color: var-get($theme, 'date-selected-special-border-color');
1821+
@if $variant != 'fluent' {
1822+
border-color: var-get($theme, 'date-selected-special-border-color');
1823+
}
18181824
}
18191825
}
18201826
}
@@ -1887,6 +1893,16 @@
18871893
}
18881894
}
18891895

1896+
@if $variant == 'fluent' {
1897+
%date-selected-current-special {
1898+
%date-inner {
1899+
&::after {
1900+
border-color: var-get($theme, 'date-selected-current-background');
1901+
}
1902+
}
1903+
}
1904+
}
1905+
18901906
%date-inactive {
18911907
cursor: default;
18921908

@@ -2042,7 +2058,7 @@
20422058
%date-selected-current-range-special-active:not(%date-selected-current-range-special-first),
20432059
%date-selected-current-range-special-active:not(%date-selected-current-range-special-last) {
20442060
%date-inner {
2045-
@if not $bootstrap-theme {
2061+
@if not $bootstrap-theme and not $variant == 'fluent' {
20462062
color: var-get($theme, 'date-special-focus-foreground');
20472063
}
20482064

@@ -2192,7 +2208,6 @@
21922208
position: absolute;
21932209
height: $date-size;
21942210
width: $date-size;
2195-
border-radius: var-get($theme, 'date-border-radius');
21962211
}
21972212
}
21982213

@@ -2218,7 +2233,32 @@
22182233
&::after {
22192234
width: $date-inner-size;
22202235
height: $date-inner-size;
2221-
border-color: var-get($theme, 'date-selected-special-border-color');
2236+
2237+
@if $variant != 'fluent' {
2238+
border-color: var-get($theme, 'date-selected-special-border-color');
2239+
}
2240+
}
2241+
}
2242+
}
2243+
2244+
@if $variant == 'fluent' {
2245+
%date-first-preview-active {
2246+
%date-inner {
2247+
background: transparent;
2248+
border-inline-end-color: transparent;
2249+
}
2250+
}
2251+
2252+
%date-last-preview-active {
2253+
%date-inner {
2254+
background: transparent;
2255+
border-inline-start-color: transparent;
2256+
}
2257+
}
2258+
2259+
%date-first-last-selected {
2260+
%date-inner {
2261+
background: transparent;
22222262
}
22232263
}
22242264
}
@@ -2338,24 +2378,61 @@
23382378
content: '';
23392379
position: absolute;
23402380
height: $date-size;
2341-
width: calc($date-size / 2 + #{$border-size});
2381+
width: $date-size;
23422382
border: rem(1px) solid var-get($theme, 'date-range-border-color');
23432383
z-index: 3;
23442384
pointer-events: none;
23452385
}
23462386
}
23472387

23482388
%date-range-selected-first {
2389+
%date-inner {
2390+
border-start-end-radius: var-get($theme, 'date-border-radius');
2391+
border-end-end-radius: var-get($theme, 'date-border-radius');
2392+
}
2393+
23492394
&::before {
2350-
inset-inline-end: calc(50% - #{$border-size});
23512395
border-inline-end-color: transparent;
2396+
border-start-start-radius: var-get($theme, 'date-range-border-radius');
2397+
border-end-start-radius: var-get($theme, 'date-range-border-radius');
23522398
}
23532399
}
23542400

23552401
%date-range-selected-last {
2402+
%date-inner {
2403+
border-start-start-radius: var-get($theme, 'date-border-radius');
2404+
border-end-start-radius: var-get($theme, 'date-border-radius');
2405+
}
2406+
23562407
&::before {
2357-
inset-inline-start: calc(50% - #{$border-size});
23582408
border-inline-start-color: transparent;
2409+
border-start-end-radius: var-get($theme, 'date-range-border-radius');
2410+
border-end-end-radius: var-get($theme, 'date-range-border-radius');
2411+
}
2412+
}
2413+
2414+
2415+
%date-first-preview {
2416+
%date-inner {
2417+
border-start-start-radius: var-get($theme, 'date-range-border-radius');
2418+
border-end-start-radius: var-get($theme, 'date-range-border-radius');
2419+
border-start-end-radius: 0;
2420+
border-end-end-radius: 0;
2421+
}
2422+
}
2423+
2424+
%date-last-preview {
2425+
%date-inner {
2426+
border-start-end-radius: var-get($theme, 'date-range-border-radius');
2427+
border-end-end-radius: var-get($theme, 'date-range-border-radius');
2428+
border-start-start-radius: 0;
2429+
border-end-start-radius: 0;
2430+
}
2431+
}
2432+
2433+
%date-first-last {
2434+
%date-inner {
2435+
border-radius: var-get($theme, 'date-range-border-radius');
23592436
}
23602437
}
23612438
}

0 commit comments

Comments
 (0)