Skip to content

refactor(calendar): reduce themes styles, update bootstrap theme #1864

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

Closed
wants to merge 4 commits into from
Closed

refactor(calendar): reduce themes styles, update bootstrap theme #1864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e1ca34
refactor(calendar): reduce themes styles, update bootstrap theme
desig9stein Sep 29, 2025
992074a
fix(calendar): correct selected current date border color styles in i…
desig9stein Oct 1, 2025
4c58c9b
refactor(calendar): fix inconsistency with angular implementation
desig9stein Oct 12, 2025
06d7d11
refactor(calendar): fix inconsistency with angular implementation
desig9stein Oct 13, 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
34 changes: 8 additions & 26 deletions src/components/calendar/themes/days.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,38 @@
import { css } from 'lit';

import type { Themes } from '../../../theming/types.js';
// Dark Overrides
import { styles as bootstrapDark } from './dark/calendar.bootstrap.css.js';
import { styles as fluentDark } from './dark/calendar.fluent.css.js';
import { styles as indigoDark } from './dark/calendar.indigo.css.js';
import { styles as materialDark } from './dark/calendar.material.css.js';
// Light Overrides
import { styles as bootstrapLight } from './light/calendar.bootstrap.css.js';
import { styles as fluentLight } from './light/calendar.fluent.css.js';
import { styles as indigoLight } from './light/calendar.indigo.css.js';
import { styles as materialLight } from './light/calendar.material.css.js';
import { styles as shared } from './light/calendar.shared.css.js';
// Shared Styles
import { styles as bootstrap } from './shared/bootstrap/days-view.bootstrap.css.js';
import { styles as fluent } from './shared/fluent/days-view.fluent.css.js';
import { styles as indigo } from './shared/indigo/days-view.indigo.css.js';
import { styles as material } from './shared/material/days-view.material.css.js';

const light = {
shared: css`
${shared}
`,
bootstrap: css`
${bootstrap} ${bootstrapLight}
${bootstrap}
`,
material: css`
${material} ${materialLight}
${material}
`,
fluent: css`
${fluent} ${fluentLight}
${fluent}
`,
indigo: css`
${indigo} ${indigoLight}
${indigo}
`,
};

const dark = {
shared: css`
${shared}
`,
bootstrap: css`
${bootstrap} ${bootstrapDark}
${bootstrap}
`,
material: css`
${material} ${materialDark}
${material}
`,
fluent: css`
${fluent} ${fluentDark}
${fluent}
`,
indigo: css`
${indigo} ${indigoDark}
${indigo}
`,
};

Expand Down
92 changes: 51 additions & 41 deletions src/components/calendar/themes/shared/bootstrap/days-view.bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ $border-size: rem(1px);

[part~='days-row'] {
padding: 0 pad-inline(rem(12px));

&:nth-child(2) {
[part='week-number-inner'] {
border-top-left-radius: var-get($theme, 'week-number-border-radius');
border-top-right-radius: var-get($theme, 'week-number-border-radius');
}
}
}

:host([part='days-view']) + :host([part='days-view']) {
Expand All @@ -21,16 +28,7 @@ $border-size: rem(1px);
[part~='days-row'][part~='first'] {
background: var-get($theme, 'header-background');
position: relative;

&::after {
content: '';
position: absolute;
width: 100%;
inset-block-start: 100%;
inset-inline-start: 0;
height: rem(1px);
background: var-get($theme, 'border-color');
}
border-block-end: rem(1px) solid var-get($theme, 'border-color');
}

[part~='week-number'] {
Expand All @@ -47,19 +45,22 @@ $border-size: rem(1px);

&::after {
width: var-get($theme, 'size');
inset-block-end: 100%;
inset-block-start: 100%;
background: var-get($theme, 'week-number-background');
}
}

[part='week-number-inner first'] {
border-top-left-radius: var-get($theme, 'week-number-border-radius');
border-top-right-radius: var-get($theme, 'week-number-border-radius');
background: transparent;
}

[part='week-number-inner last'] {
border-bottom-left-radius: var-get($theme, 'week-number-border-radius');
border-bottom-right-radius: var-get($theme, 'week-number-border-radius');

&::after {
display: none;
}
}

[part~='label'] {
Expand All @@ -82,16 +83,20 @@ $border-size: rem(1px);

[part~='date'] {
height: var-get($theme, 'size');
border-top: $border-size solid transparent;
border-bottom: $border-size solid transparent;
border-block: $border-size solid transparent;

&[part~='range'],
&[part~='range'][part~='preview'] {
background: var-get($theme, 'date-selected-range-background');
border-top-style: solid;
border-bottom-style: solid;
border-top-color: var-get($theme, 'date-range-preview-border-color');
border-bottom-color: var-get($theme, 'date-range-preview-border-color');
border-block-style: solid;
}

&[part~='range'][part~='preview'] {
border-block-color: var-get($theme, 'date-range-preview-border-color');

&::after {
border-block-color: var-get($theme, 'date-range-preview-border-color');
}
}

&[part~='range'][part~='selected'][part~='first'],
Expand All @@ -100,15 +105,13 @@ $border-size: rem(1px);
&[part~='range'][part~='preview'][part~='last'] {
&::after {
background: var-get($theme, 'date-selected-range-background');
border-color: transparent;
}
}

&[part~='range'][part~='first'],
&[part~='range'][part~='last'] {
background: transparent;
border-top-color: transparent;
border-bottom-color: transparent;
border-block-color: transparent;

&::before {
height: var-get($theme, 'size');
Expand All @@ -127,8 +130,14 @@ $border-size: rem(1px);
&[part~='range'][part~='preview'][part~='first'],
&[part~='range'][part~='preview'][part~='last'] {
background: transparent;
border-top-color: transparent;
border-bottom-color: transparent;
border-block-color: transparent;
}

&[part~='range'][part~='first']:not([part~='preview']),
&[part~='range'][part~='last']:not([part~='preview']) {
&::after {
border-block-color: transparent;
}
}
}

Expand All @@ -145,9 +154,9 @@ $border-size: rem(1px);
}

&:focus {
color: var-get($theme, 'date-hover-foreground');
background: var-get($theme, 'date-hover-background');
border-color: var-get($theme, 'date-hover-border-color');
color: var-get($theme, 'date-focus-foreground');
background: var-get($theme, 'date-focus-background');
border-color: var-get($theme, 'date-focus-border-color');
}

&::after {
Expand Down Expand Up @@ -298,31 +307,31 @@ $border-size: rem(1px);
border-color: var-get($theme, 'date-selected-current-border-color');

&:hover {
color: var-get($theme, 'date-selected-current-hover-foreground');
color: var-get($theme, 'date-selected-hover-foreground');
border-color: var-get($theme, 'date-selected-current-hover-border-color');
}

&:focus {
color: var-get($theme, 'date-selected-current-focus-foreground');
color: var-get($theme, 'date-selected-focus-foreground');
border-color: var-get($theme, 'date-selected-current-focus-border-color');
}
}

&[part~='range'][part~='selected'][part~='current'][part~='first'],
&[part~='range'][part~='selected'][part~='current'][part~='last'] {
color: var-get($theme, 'date-selected-current-foreground');
background: var-get($theme, 'date-selected-current-background');
color: var-get($theme, 'date-selected-foreground');
background: var-get($theme, 'date-selected-background');
border-color: var-get($theme, 'date-selected-current-border-color');

&:hover {
color: var-get($theme, 'date-selected-current-hover-foreground');
background: var-get($theme, 'date-selected-current-hover-background');
color: var-get($theme, 'date-selected-hover-foreground');
background: var-get($theme, 'date-selected-hover-background');
border-color: var-get($theme, 'date-selected-current-hover-border-color');
}

&:focus {
color: var-get($theme, 'date-selected-current-focus-foreground');
background: var-get($theme, 'date-selected-current-focus-background');
color: var-get($theme, 'date-selected-focus-foreground');
background: var-get($theme, 'date-selected-focus-background');
border-color: var-get($theme, 'date-selected-current-focus-border-color');
}
}
Expand Down Expand Up @@ -356,7 +365,8 @@ $border-size: rem(1px);
}
}

&[part~='special'] {
&[part~='special'],
&[part~='special'][part~='range'] {
color: var-get($theme, 'date-special-foreground');
background: var-get($theme, 'date-special-background');

Expand All @@ -365,17 +375,17 @@ $border-size: rem(1px);
}

&:hover {
color: var-get($theme, 'date-hover-foreground');
background: var-get($theme, 'date-hover-background');
color: var-get($theme, 'date-special-hover-foreground');
background: var-get($theme, 'date-special-hover-background');

&::after {
border-color: var-get($theme, 'date-special-hover-border-color');
}
}

&:focus {
color: var-get($theme, 'date-focus-foreground');
background: var-get($theme, 'date-focus-background');
color: var-get($theme, 'date-special-focus-foreground');
background: var-get($theme, 'date-special-focus-background');

&::after {
border-color: var-get($theme, 'date-special-hover-border-color');
Expand All @@ -388,7 +398,7 @@ $border-size: rem(1px);
background: var-get($theme, 'date-selected-background');

&::after {
border-color: var-get($theme, 'date-selected-special-border-color');
border-color: var-get($theme, 'date-special-foreground');
}

&:hover {
Expand Down
Loading
Loading