Skip to content

Commit 5fa8c55

Browse files
authored
fix(calendar) fix fluent range radius (#1650)
1 parent 0f7b620 commit 5fa8c55

File tree

1 file changed

+23
-9
lines changed

1 file changed

+23
-9
lines changed

src/components/calendar/themes/shared/fluent/days-view.fluent.scss

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ $row-gap: rem(6px);
1313
height: var-get($theme, 'size');
1414
border-top: $border-size solid transparent;
1515
border-bottom: $border-size solid transparent;
16-
}
17-
18-
[part~='date'],
19-
[part~='date-inner'] {
20-
border-radius: var-get($theme, 'date-border-radius');
16+
border-radius: 0;
2117
}
2218

2319
[part~='date-inner'],
@@ -81,6 +77,7 @@ $row-gap: rem(6px);
8177
[part~='date-inner'] {
8278
width: var-get($theme, 'size');
8379
height: var-get($theme, 'size');
80+
border-radius: var-get($theme, 'date-border-radius');
8481

8582
&::after {
8683
content: '';
@@ -108,6 +105,7 @@ $row-gap: rem(6px);
108105
&[part~='selected'][part~='first'][part~='last'] {
109106
background: transparent;
110107
border-color: var-get($theme, 'date-range-preview-border-color');
108+
border-radius: var-get($theme, 'date-range-border-radius');
111109
}
112110

113111
&[part~='disabled'] {
@@ -146,6 +144,10 @@ $row-gap: rem(6px);
146144
color: var-get($theme, 'date-selected-foreground');
147145
background: var-get($theme, 'date-selected-background');
148146
border-color: transparent;
147+
border-start-start-radius: var-get($theme, 'date-range-border-radius');
148+
border-end-start-radius: var-get($theme, 'date-range-border-radius');
149+
border-start-end-radius: var-get($theme, 'date-border-radius');
150+
border-end-end-radius: var-get($theme, 'date-border-radius');
149151

150152
&:hover {
151153
color: var-get($theme, 'date-selected-hover-foreground');
@@ -167,6 +169,10 @@ $row-gap: rem(6px);
167169
color: var-get($theme, 'date-selected-foreground');
168170
background: var-get($theme, 'date-selected-background');
169171
border-color: transparent;
172+
border-start-end-radius: var-get($theme, 'date-range-border-radius');
173+
border-end-end-radius: var-get($theme, 'date-range-border-radius');
174+
border-start-start-radius: var-get($theme, 'date-border-radius');
175+
border-end-start-radius: var-get($theme, 'date-border-radius');
170176

171177
&:hover {
172178
color: var-get($theme, 'date-selected-hover-foreground');
@@ -285,7 +291,7 @@ $row-gap: rem(6px);
285291
}
286292
}
287293

288-
&[part~='selected'][part~='special'] {
294+
&[part~='selected'][part~='special']:not([part~='current']) {
289295
&::after {
290296
border-color: var-get($theme, 'date-selected-special-border-color');
291297
}
@@ -402,7 +408,7 @@ $row-gap: rem(6px);
402408
&::before {
403409
content: '';
404410
position: absolute;
405-
width: calc(var-get($theme, 'size') / 2 + #{$border-size});
411+
width: var-get($theme, 'size');
406412
border-block: $border-size solid var-get($theme, 'date-range-border-color');
407413
z-index: 3;
408414
pointer-events: none;
@@ -411,19 +417,27 @@ $row-gap: rem(6px);
411417

412418
&[part~='first'] {
413419
&::before {
414-
inset-inline-end: calc(50% - #{$border-size});
420+
inset-inline-end: initial;
415421
border-inline: $border-size solid;
416422
border-inline-start-color: var-get($theme, 'date-range-border-color');
417423
border-inline-end-color: transparent;
424+
border-start-start-radius: var-get($theme, 'date-range-border-radius');
425+
border-end-start-radius: var-get($theme, 'date-range-border-radius');
426+
border-start-end-radius: 0;
427+
border-end-end-radius: 0;
418428
}
419429
}
420430

421431
&[part~='last'] {
422432
&::before {
423-
inset-inline-start: calc(50% - #{$border-size});
433+
inset-inline-start: initial;
424434
border-inline: $border-size solid;
425435
border-inline-start-color: transparent;
426436
border-inline-end-color: var-get($theme, 'date-range-border-color');
437+
border-start-end-radius: var-get($theme, 'date-range-border-radius');
438+
border-end-end-radius: var-get($theme, 'date-range-border-radius');
439+
border-start-start-radius: 0;
440+
border-end-start-radius: 0;
427441
}
428442
}
429443

0 commit comments

Comments
 (0)