Skip to content

Commit d2258ca

Browse files
authored
fix(list): theme variables replicated for all list components (#1853)
This PR fixes a critical issue with the list component that prevents it from being styled using CSS variables alone. The component includes the CSS variables for the list theme in all list-related components (list-item, list-header, and the list host itself), forcing people to have to override the variables in all three instances. This PR includes the theme CSS variables only in the list host, while component specific overrides for the item and header are preserved and carried by each component separately.
1 parent 3f8fd3b commit d2258ca

18 files changed

+8
-182
lines changed

src/components/list/themes/dark/header/list-header.bootstrap.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/list/themes/dark/header/list-header.fluent.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/list/themes/dark/header/list-header.indigo.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/list/themes/dark/header/list-header.material.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/list/themes/dark/item/list-item.bootstrap.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/list/themes/dark/item/list-item.fluent.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/list/themes/dark/item/list-item.indigo.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/list/themes/dark/item/list-item.material.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/list/themes/header.ts

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,17 @@
11
import { css } from 'lit';
22

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

186
const light = {
19-
material: css`
20-
${materialLight}
21-
`,
22-
bootstrap: css`
23-
${bootstrapLight}
24-
`,
25-
fluent: css`
26-
${fluentLight}
27-
`,
287
indigo: css`
29-
${indigo} ${indigoLight}
8+
${indigo}
309
`,
3110
};
3211

3312
const dark = {
34-
material: css`
35-
${materialDark}
36-
`,
37-
bootstrap: css`
38-
${bootstrapDark}
39-
`,
40-
fluent: css`
41-
${fluentDark}
42-
`,
4313
indigo: css`
44-
${indigo} ${indigoDark}
14+
${indigo}
4515
`,
4616
};
4717

src/components/list/themes/item.ts

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,32 @@
11
import { css } from 'lit';
22

33
import type { Themes } from '../../../theming/types.js';
4-
// Dark Overrides
5-
import { styles as bootstrapDark } from './dark/item/list-item.bootstrap.css.js';
6-
import { styles as fluentDark } from './dark/item/list-item.fluent.css.js';
7-
import { styles as indigoDark } from './dark/item/list-item.indigo.css.js';
8-
import { styles as materialDark } from './dark/item/list-item.material.css.js';
9-
// Light Overrides
10-
import { styles as bootstrapLight } from './light/item/list-item.bootstrap.css.js';
11-
import { styles as fluentLight } from './light/item/list-item.fluent.css.js';
12-
import { styles as indigoLight } from './light/item/list-item.indigo.css.js';
13-
import { styles as materialLight } from './light/item/list-item.material.css.js';
144
// Shared Styles
155
import { styles as bootstrap } from './shared/item/list-item.bootstrap.css.js';
166
import { styles as fluent } from './shared/item/list-item.fluent.css.js';
177
import { styles as indigo } from './shared/item/list-item.indigo.css.js';
188

199
const light = {
2010
bootstrap: css`
21-
${bootstrap} ${bootstrapLight}
22-
`,
23-
material: css`
24-
${materialLight}
11+
${bootstrap}
2512
`,
2613
fluent: css`
27-
${fluent} ${fluentLight}
14+
${fluent}
2815
`,
2916
indigo: css`
30-
${indigo} ${indigoLight}
17+
${indigo}
3118
`,
3219
};
3320

3421
const dark = {
3522
bootstrap: css`
36-
${bootstrap} ${bootstrapDark}
37-
`,
38-
material: css`
39-
${materialDark}
23+
${bootstrap}
4024
`,
4125
fluent: css`
42-
${fluent} ${fluentDark}
26+
${fluent}
4327
`,
4428
indigo: css`
45-
${indigo} ${indigoDark}
29+
${indigo}
4630
`,
4731
};
4832

0 commit comments

Comments
 (0)