Skip to content

Commit 119d752

Browse files
Merge branch 'next' into ROU-11884
2 parents a8fa672 + 5458e06 commit 119d752

File tree

23 files changed

+17
-4
lines changed

23 files changed

+17
-4
lines changed

core/src/components/datetime/datetime.ionic.scss

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
--background-activated: #{globals.$ion-primitives-neutral-200};
105105
--background-hover: #{globals.$ion-primitives-neutral-200};
106106
--background-hover-opacity: 1;
107+
min-height: globals.$ion-scale-1000;
107108
}
108109

109110
// TODO(ROU-11119): Rewrite this when we replace the ion-button with a native button
@@ -153,7 +154,8 @@
153154
}
154155

155156
// Selected Day
156-
.calendar-day.calendar-day-active {
157+
.calendar-day.calendar-day-active,
158+
.calendar-day.calendar-day-active.calendar-day-adjacent-day {
157159
background: globals.$ion-semantics-primary-100;
158160
}
159161

@@ -170,8 +172,19 @@
170172
}
171173

172174
// Pressed Day
173-
.calendar-day:active {
174-
background: globals.$ion-semantics-primary-300;
175+
.calendar-day:active,
176+
.calendar-day.calendar-day-adjacent-day:active {
177+
background: globals.$ion-bg-primary-subtle-press;
178+
}
179+
180+
// Adjacent Day
181+
.calendar-day.calendar-day-adjacent-day {
182+
color: globals.$ion-text-subtlest;
183+
}
184+
185+
// Selected Adjacent Day
186+
.calendar-day.calendar-day-active.calendar-day-adjacent-day {
187+
color: globals.$ion-text-default;
175188
}
176189

177190
// Time / Header

core/src/components/datetime/test/show-adjacent-days/datetime.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { configs, test } from '@utils/test/playwright';
44
/**
55
* This behavior does not vary across directions
66
*/
7-
configs({ directions: ['ltr'] }).forEach(({ title, screenshot, config }) => {
7+
configs({ modes: ['ios', 'md', 'ionic-md'], directions: ['ltr'] }).forEach(({ title, screenshot, config }) => {
88
test.describe(title('datetime: show adjacent days'), () => {
99
test('should not have visual regressions', async ({ page }) => {
1010
await page.goto('/src/components/datetime/test/show-adjacent-days', config);
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)