Skip to content

Commit 7d487ef

Browse files
committed
refactor(calendar): add hover and focus styles for inactive and weekend states across themes
1 parent 1ea6951 commit 7d487ef

File tree

3 files changed

+56
-13
lines changed

3 files changed

+56
-13
lines changed

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

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ $border-size: rem(1px);
7171
color: var-get($theme, 'weekday-color');
7272
}
7373

74-
[part~='weekend'] {
75-
color: var-get($theme, 'weekend-color');
76-
}
77-
7874
[part~='date'] {
7975
height: var-get($theme, 'size');
8076
border-top: $border-size solid transparent;
@@ -143,13 +139,17 @@ $border-size: rem(1px);
143139
border-color: var-get($theme, 'date-focus-border-color');
144140
}
145141

146-
&[part~='inactive'][part~='preview']:not([part~='disabled']),
147-
&[part~='inactive'][part~='range']:not([part~='first'], [part~='last']) {
148-
color: var-get($theme, 'date-selected-range-foreground');
149-
}
150142

151-
&[part~='inactive']:not([part~='disabled']) {
143+
&[part~='inactive']:not([part~='selected'][part~='range'], [part~='range'], [part~='disabled'], [part~='first'], [part~='last']) {
152144
color: var-get($theme, 'inactive-color');
145+
146+
&:hover {
147+
color: var-get($theme, 'date-hover-foreground');
148+
}
149+
150+
&:focus {
151+
color: var-get($theme, 'date-focus-foreground');
152+
}
153153
}
154154

155155
&[part~='preview'][part~='first'],
@@ -189,6 +189,18 @@ $border-size: rem(1px);
189189
color: var-get($theme, 'date-hover-foreground');
190190
}
191191

192+
&[part~='weekend']:not([part~='selected'][part~='range'], [part~='current'], [part~='special'], [part~='selected'], [part~='preview'], [part~='disabled']) {
193+
color: var-get($theme, 'weekend-color');
194+
195+
&:hover {
196+
color: var-get($theme, 'date-hover-foreground');
197+
}
198+
199+
&:focus {
200+
color: var-get($theme, 'date-focus-foreground');
201+
}
202+
}
203+
192204
&[part~='range'][part~='selected']:not([part~='current'], [part~='special'], [part~='first'], [part~='last'], [part~='first'][part~='last']),
193205
&[part~='range'][part~='preview']:not([part~='current'], [part~='special'], [part~='first'], [part~='last'], [part~='disabled'], [part~='first'][part~='last']) {
194206
color: var-get($theme, 'date-selected-range-foreground');

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,16 @@ $week-number-radius: var-get($theme, 'week-number-border-radius');
105105
background: var-get($theme, 'date-hover-background');
106106
}
107107

108-
&[part~='inactive']:not([part~='selected'][part~='range'] , [part~='disabled']) {
108+
&[part~='inactive']:not([part~='selected'][part~='range'], [part~='disabled']) {
109109
color: var-get($theme, 'inactive-color');
110+
111+
&:hover {
112+
color: var-get($theme, 'date-hover-foreground');
113+
}
114+
115+
&:focus {
116+
color: var-get($theme, 'date-focus-foreground');
117+
}
110118
}
111119

112120
&[part~='disabled']:not([part~='selected'],[part~='special'],[part~='current']) {
@@ -132,8 +140,16 @@ $week-number-radius: var-get($theme, 'week-number-border-radius');
132140
border-color: var-get($theme, 'date-focus-border-color');
133141
}
134142

135-
[part~='weekend'] {
143+
&[part~='weekend']:not([part~='selected'][part~='range'], [part~='current'], [part~='special'], [part~='selected'], [part~='disabled']) {
136144
color: var-get($theme, 'weekend-color');
145+
146+
&:hover {
147+
color: var-get($theme, 'date-hover-foreground');
148+
}
149+
150+
&:focus {
151+
color: var-get($theme, 'date-focus-foreground');
152+
}
137153
}
138154

139155
&[part~='selected'] {

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,15 @@ $week-number-radius: var-get($theme, 'week-number-border-radius');
108108

109109
&[part~='inactive']:not([part~='selected'][part~='range'], [part~='disabled']) {
110110
color: var-get($theme, 'inactive-color');
111-
}
112111

112+
&:hover {
113+
color: var-get($theme, 'date-hover-foreground');
114+
}
115+
116+
&:focus {
117+
color: var-get($theme, 'date-focus-foreground');
118+
}
119+
}
113120

114121
&[part~='disabled']:not([part~='selected'],[part~='special'],[part~='current']) {
115122
color: var-get($theme, 'date-disabled-foreground');
@@ -135,8 +142,16 @@ $week-number-radius: var-get($theme, 'week-number-border-radius');
135142
border-color: var-get($theme, 'date-focus-border-color');
136143
}
137144

138-
&[part~='weekend'] {
145+
&[part~='weekend']:not([part~='selected'][part~='range'], [part~='current'], [part~='special'], [part~='selected'], [part~='disabled']) {
139146
color: var-get($theme, 'weekend-color');
147+
148+
&:hover {
149+
color: var-get($theme, 'date-hover-foreground');
150+
}
151+
152+
&:focus {
153+
color: var-get($theme, 'date-focus-foreground');
154+
}
140155
}
141156

142157
&[part~='selected'] {

0 commit comments

Comments
 (0)