Skip to content

DateCalendar, DateRangeCalendar: use px instead of rem, use theme-ready variables #105264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ciampo merged 2 commits into from
Aug 20, 2025
Merged

DateCalendar, DateRangeCalendar: use px instead of rem, use theme-ready variables #105264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0570f21
DateCalendar, DateRangeCalendar: use px instead of rem
ciampo Aug 19, 2025
1fe58f7
Use variables when possible
ciampo Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 24 additions & 23 deletions packages/ui/src/calendar/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "@wordpress/base-styles/colors";
@use '@wordpress/base-styles/mixins';
@use '@wordpress/base-styles/variables';
@use '../utils/theme-variables' as theme;

/* Root of the component. */
Expand All @@ -7,9 +8,9 @@

// Internal variables
--a8c-calendar-outline-focus: 1.5px solid #{theme.$components-color-accent};
--a8c-calendar-button-height: 2rem;
--a8c-calendar-button-width: 2rem;
--a8c-calendar-nav-height: 2rem;
--a8c-calendar-button-height: #{variables.$grid-unit-40};
--a8c-calendar-button-width: #{variables.$grid-unit-40};
--a8c-calendar-nav-height: #{variables.$grid-unit-40};

// TODO: themify / align to DS tokens
--a8c-calendar-range-middle-background-color: color-mix(in srgb, #{theme.$components-color-accent} 4%, transparent);
Expand All @@ -18,10 +19,10 @@
position: relative; /* Required to position the navigation toolbar. */
box-sizing: border-box;
display: inline flow-root;
color: colors.$gray-900;
background-color: colors.$white;
font-size: 13px;
font-weight: 400;
color: theme.$components-color-foreground;
background-color: theme.$components-color-background;
font-size: variables.$font-size-medium;
font-weight: variables.$font-weight-regular;
z-index: 0; // Create a stacking context and render on top of the background.

*, *::before, *::after {
Expand All @@ -38,7 +39,7 @@
// date follows the same color as the button's text, since the button
// inherits its text color.
&:has(.calendar__day-button:disabled) {
color: colors.$gray-600;
color: theme.$components-color-disabled;
}
&:has(.calendar__day-button:hover:not(:disabled)),
&:has(.calendar__day-button:focus-visible) {
Expand All @@ -60,7 +61,7 @@
height: var(--a8c-calendar-button-height);

border: none;
border-radius: 2px;
border-radius: variables.$radius-small;

font: inherit;
font-variant-numeric: tabular-nums;
Expand All @@ -76,7 +77,7 @@
z-index: -1;
inset: 0;
border: none; // No default border to avoid polluting high-contrast mode.
border-radius: 2px;
border-radius: variables.$radius-small;
}

// Use the button's ::after to show the selection preview.
Expand Down Expand Up @@ -120,7 +121,7 @@
.calendar__button-next,
.calendar__button-previous {
border: none;
border-radius: 2px;
border-radius: variables.$radius-small;
background: none;
padding: 0;
margin: 0;
Expand All @@ -142,7 +143,7 @@
&[aria-disabled="true"] {
cursor: revert;

color: colors.$gray-600;
color: theme.$components-color-disabled;
}

&:focus-visible {
Expand All @@ -153,8 +154,8 @@
.calendar__chevron {
display: inline-block;
fill: currentColor;
width: 16px;
height: 16px;
width: variables.$grid-unit-20;
height: variables.$grid-unit-20;
}

.calendar[dir="rtl"] .calendar__nav .calendar__chevron {
Expand All @@ -168,21 +169,21 @@
align-content: center;

height: var(--a8c-calendar-nav-height);
margin-bottom: 12px;
margin-bottom: variables.$grid-unit-15;
}

.calendar__months {
position: relative;
display: flex;
justify-content: center;
flex-wrap: wrap;
gap: 1rem;
gap: variables.$grid-unit-20;
max-width: fit-content;
}

.calendar__month-grid {
border-collapse: separate;
border-spacing: 0 4px;
border-spacing: 0 variables.$grid-unit-05;
}

.calendar__nav {
Expand All @@ -203,7 +204,7 @@
height: var(--a8c-calendar-button-height);
padding: 0;

color: colors.$gray-700;
color: theme.$components-color-gray-700;
text-align: center;
text-transform: uppercase;
}
Expand All @@ -225,24 +226,24 @@
// Selected date button (individual date, range start, and range end)
.calendar__day--selected:not(.calendar__range-middle) {
&:has(.calendar__day-button, .calendar__day-button:hover:not(:disabled)) {
color: colors.$white;
color: theme.$components-color-foreground-inverted;
}

.calendar__day-button {
&::before {
background-color: colors.$gray-900;
background-color: theme.$components-color-foreground;
// Render a transparent border to highlight the selected day in
// forced-colors (high-contrast) mode, since the background is not
// visible.
border: 1px solid transparent;
}

&:disabled::before {
background-color: colors.$gray-600;
background-color: theme.$components-color-disabled;
}

&:hover:not(:disabled)::before {
background-color: colors.$gray-800;
background-color: theme.$components-color-gray-800;
}
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/ui/src/utils/_theme-variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ $components-color-gray-800: var(--wp-components-color-gray-800, colors.$gray-800

// Semantic aliases (prefer these over raw gray values when applicable).
$components-color-border: #{ $components-color-gray-600 };
$components-color-disabled: #{ $components-color-gray-600 };