Skip to content

Commit 9710ed0

Browse files
desig9steinSisIvanovasimeonoffrkaraivanov
authored
Refactor calendar themes to use correct variables (#1899)
--------- Co-authored-by: Silvia Ivanova <[email protected]> Co-authored-by: Simeon Simeonoff <[email protected]> Co-authored-by: Radoslav Karaivanov <[email protected]>
1 parent ae82900 commit 9710ed0

File tree

7 files changed

+1467
-925
lines changed

7 files changed

+1467
-925
lines changed

src/components/calendar/days-view/days-view.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ export default class IgcDaysViewComponent extends EventEmitterMixin<
276276
// XXX: Ranges
277277

278278
private isFirstInRange(day: CalendarDay) {
279-
if (this._isSingle || !this._hasValues) {
279+
if (!this._isRange || !this._hasValues) {
280280
return false;
281281
}
282282

@@ -288,7 +288,7 @@ export default class IgcDaysViewComponent extends EventEmitterMixin<
288288
}
289289

290290
private isLastInRange(day: CalendarDay) {
291-
if (this._isSingle || !this._hasValues) {
291+
if (!this._isRange || !this._hasValues) {
292292
return false;
293293
}
294294

src/components/calendar/themes/days.ts

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,38 @@
11
import { css } from 'lit';
22

33
import type { Themes } from '../../../theming/types.js';
4-
// Dark Overrides
5-
import { styles as bootstrapDark } from './dark/calendar.bootstrap.css.js';
6-
import { styles as fluentDark } from './dark/calendar.fluent.css.js';
7-
import { styles as indigoDark } from './dark/calendar.indigo.css.js';
8-
import { styles as materialDark } from './dark/calendar.material.css.js';
9-
// Light Overrides
10-
import { styles as bootstrapLight } from './light/calendar.bootstrap.css.js';
11-
import { styles as fluentLight } from './light/calendar.fluent.css.js';
12-
import { styles as indigoLight } from './light/calendar.indigo.css.js';
13-
import { styles as materialLight } from './light/calendar.material.css.js';
14-
import { styles as shared } from './light/calendar.shared.css.js';
15-
// Shared Styles
164
import { styles as bootstrap } from './shared/bootstrap/days-view.bootstrap.css.js';
175
import { styles as fluent } from './shared/fluent/days-view.fluent.css.js';
186
import { styles as indigo } from './shared/indigo/days-view.indigo.css.js';
197
import { styles as material } from './shared/material/days-view.material.css.js';
208

219
const light = {
22-
shared: css`
23-
${shared}
24-
`,
2510
bootstrap: css`
26-
${bootstrap} ${bootstrapLight}
11+
${bootstrap}
2712
`,
2813
material: css`
29-
${material} ${materialLight}
14+
${material}
3015
`,
3116
fluent: css`
32-
${fluent} ${fluentLight}
17+
${fluent}
3318
`,
3419
indigo: css`
35-
${indigo} ${indigoLight}
20+
${indigo}
3621
`,
3722
};
3823

3924
const dark = {
40-
shared: css`
41-
${shared}
42-
`,
4325
bootstrap: css`
44-
${bootstrap} ${bootstrapDark}
26+
${bootstrap}
4527
`,
4628
material: css`
47-
${material} ${materialDark}
29+
${material}
4830
`,
4931
fluent: css`
50-
${fluent} ${fluentDark}
32+
${fluent}
5133
`,
5234
indigo: css`
53-
${indigo} ${indigoDark}
35+
${indigo}
5436
`,
5537
};
5638

0 commit comments

Comments
 (0)