Skip to content

Commit f4e2732

Browse files
committed
fix(calendar): refine fluent theme date styles
- Adjust hover, focus, and border styles for improved clarity and consistency. - Add specific styles for selected, range, preview, and current date combinations. - Update range preview styles and refine special+current+range states.
1 parent 23c1a3a commit f4e2732

File tree

1 file changed

+72
-23
lines changed

1 file changed

+72
-23
lines changed

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

Lines changed: 72 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $fake-bg-position: calc(50% - (var-get($theme, 'size') / 2));
4040
background: var-get($theme, 'week-number-background');
4141
border-inline-start: rem(1px) solid var-get($theme, 'week-number-background');
4242
border-inline-end: rem(1px) solid var-get($theme, 'week-number-background');
43-
border-inline-end-color: var-get($theme, 'date-border-color');
43+
border-inline-end-color: var-get($theme, 'week-number-background');
4444
}
4545
}
4646

@@ -124,18 +124,27 @@ $fake-bg-position: calc(50% - (var-get($theme, 'size') / 2));
124124
&:hover {
125125
color: var-get($theme, 'date-hover-foreground');
126126
background: var-get($theme, 'date-hover-background');
127-
border-color: var-get($theme, 'date-hover-border-color');
128127
}
129128

130129
&:focus {
131130
color: var-get($theme, 'date-focus-foreground');
132131
background: var-get($theme, 'date-focus-background');
133-
border-color: var-get($theme, 'date-focus-border-color');
134132
}
135133
}
136134

137135
[part~='date-inner']:not([part~='inactive']) {
138-
border-color: var-get($theme, 'date-border-color');
136+
&:not([part~='selected'], [part~='preview'], [part~='range'], [part~='first'][part~='last'])
137+
{
138+
border-color: var-get($theme, 'date-border-color');
139+
140+
&:hover {
141+
border-color: var-get($theme, 'date-hover-border-color');
142+
}
143+
144+
&:focus {
145+
border-color: var-get($theme, 'date-focus-border-color');
146+
}
147+
}
139148

140149
// This selector works only in range selection since firs and last are present only in the range selection
141150
&[part~='selected'][part~='first'][part~='last'] {
@@ -215,22 +224,6 @@ $fake-bg-position: calc(50% - (var-get($theme, 'size') / 2));
215224
}
216225
}
217226

218-
&[part~='selected'][part~='current']:not([part~='inactive']) {
219-
color: var-get($theme, 'date-selected-current-foreground');
220-
221-
&:focus {
222-
color: var-get($theme, 'date-selected-current-focus-foreground');
223-
}
224-
225-
&:hover {
226-
color: var-get($theme, 'date-selected-current-hover-foreground');
227-
}
228-
}
229-
230-
&[part~='selected'][part~='current'] {
231-
color: var-get($theme, 'date-selected-foreground');
232-
}
233-
234227
&[part~='preview'] {
235228
background: transparent !important;
236229

@@ -335,17 +328,20 @@ $fake-bg-position: calc(50% - (var-get($theme, 'size') / 2));
335328
&[part~='current'][part~='selected'] {
336329
&::before {
337330
border-color: var-get($theme, 'date-selected-current-border-color');
331+
background: var-get($theme, 'date-selected-current-background');
338332
}
339333

340334
&:hover {
341335
&::before {
342336
border-color: var-get($theme, 'date-selected-current-hover-border-color');
337+
background: var-get($theme, 'date-selected-current-hover-background');
343338
}
344339
}
345340

346341
&:focus {
347342
&::before {
348343
border-color: var-get($theme, 'date-selected-current-focus-border-color');
344+
background: var-get($theme, 'date-selected-current-focus-background');
349345
}
350346
}
351347
}
@@ -426,6 +422,7 @@ $fake-bg-position: calc(50% - (var-get($theme, 'size') / 2));
426422

427423
&::after {
428424
background: var-get($theme, 'date-selected-current-hover-background');
425+
border-color: var-get($theme, 'date-selected-current-hover-foreground');
429426
}
430427
}
431428

@@ -439,9 +436,37 @@ $fake-bg-position: calc(50% - (var-get($theme, 'size') / 2));
439436
}
440437
}
441438

439+
&[part~='current'][part~='special'][part~='range']:not([part~='preview'], [part~='first'][part~='last']),
440+
&[part~='current'][part~='range']:not([part~='preview'], [part~='first'][part~='last']) {
441+
color: var-get($theme, 'date-selected-current-range-foreground');
442+
443+
&::before,
444+
&::after {
445+
background: var-get($theme, 'date-selected-current-range-background');
446+
}
447+
448+
&:hover {
449+
color: var-get($theme, 'date-selected-current-range-hover-foreground');
450+
451+
&::before,
452+
&::after {
453+
background: var-get($theme, 'date-selected-current-range-hover-background');
454+
}
455+
}
456+
457+
&:focus {
458+
color: var-get($theme, 'date-selected-current-range-focus-foreground');
459+
460+
&::before,
461+
&::after {
462+
background: var-get($theme, 'date-selected-current-range-focus-background');
463+
}
464+
}
465+
}
466+
442467
// RANGE
443468
// special + range
444-
&[part~='special'][part~='range']:where(:not([part~='current'], [part~='preview'])) {
469+
&[part~='special'][part~='range'][part~='selected']:where(:not([part~='current'], [part~='preview'])) {
445470
color: var-get($theme, 'date-special-range-foreground');
446471

447472
&::after {
@@ -574,13 +599,29 @@ $fake-bg-position: calc(50% - (var-get($theme, 'size') / 2));
574599
}
575600
}
576601

602+
&[part~='preview'][part~='first'] {
603+
&::before {
604+
border-inline-start-color: var-get($theme, 'date-range-preview-border-color');
605+
}
606+
}
607+
608+
&[part~='preview'][part~='last'] {
609+
&::before {
610+
border-inline-end-color: var-get($theme, 'date-range-preview-border-color');
611+
}
612+
}
613+
577614
&[part~='preview'][part~='first'],
578615
&[part~='preview'][part~='last'] {
579616
border-block-color: transparent;
580617

618+
&::before {
619+
border-block-color: var-get($theme, 'date-range-preview-border-color');
620+
}
621+
581622
&::after {
582623
background: transparent !important;
583-
border-block-color: var-get($theme, 'date-range-border-color');
624+
border-block-color: var-get($theme, 'date-range-preview-border-color');
584625
}
585626
}
586627

@@ -599,9 +640,17 @@ $fake-bg-position: calc(50% - (var-get($theme, 'size') / 2));
599640
}
600641
}
601642

643+
&[part~='selected'][part~='preview'][part~='first'],
644+
&[part~='selected'][part~='preview'][part~='last'] {
645+
&::after {
646+
border-block-color: var-get($theme, 'date-range-preview-border-color');
647+
}
648+
}
649+
650+
602651
&[part~='preview'] {
603652
background: transparent;
604-
border-block-color: var-get($theme, 'date-range-border-color');
653+
border-block-color: var-get($theme, 'date-range-preview-border-color');
605654
}
606655

607656
&[part~='first'][part~='disabled'],

0 commit comments

Comments
 (0)