Skip to content

Commit 3af0d8a

Browse files
authored
fix(material-experimental): consolidate mixins in e2e theme file (#18385)
1 parent 6a97f02 commit 3af0d8a

File tree

2 files changed

+6
-42
lines changed

2 files changed

+6
-42
lines changed

src/e2e-app/BUILD.bazel

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,8 @@ sass_binary(
7373
"external/npm/node_modules",
7474
],
7575
deps = [
76-
"//src/material-experimental/mdc-button:mdc_button_scss_lib",
77-
"//src/material-experimental/mdc-card:mdc_card_scss_lib",
78-
"//src/material-experimental/mdc-checkbox:mdc_checkbox_scss_lib",
79-
"//src/material-experimental/mdc-chips:mdc_chips_scss_lib",
80-
"//src/material-experimental/mdc-helpers:mdc_scss_deps_lib",
81-
"//src/material-experimental/mdc-menu:mdc_menu_scss_lib",
82-
"//src/material-experimental/mdc-progress-bar:mdc_progress_bar_scss_lib",
83-
"//src/material-experimental/mdc-radio:mdc_radio_scss_lib",
84-
"//src/material-experimental/mdc-slide-toggle:mdc_slide_toggle_scss_lib",
85-
"//src/material-experimental/mdc-tabs:mdc_tabs_scss_lib",
76+
"//src/material-experimental/mdc-theming:all_themes",
77+
"//src/material-experimental/mdc-typography:all_typography",
8678
"//src/material/core:theming_scss_lib",
8779
],
8880
)

src/e2e-app/theme.scss

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,14 @@
11
@import '../material/core/theming/all-theme';
2-
@import '../material-experimental/mdc-button/mdc-button';
3-
@import '../material-experimental/mdc-card/mdc-card';
4-
@import '../material-experimental/mdc-checkbox/mdc-checkbox';
5-
@import '../material-experimental/mdc-chips/mdc-chips';
6-
@import '../material-experimental/mdc-helpers/mdc-helpers';
7-
@import '../material-experimental/mdc-menu/mdc-menu';
8-
@import '../material-experimental/mdc-radio/mdc-radio';
9-
@import '../material-experimental/mdc-slide-toggle/mdc-slide-toggle';
10-
@import '../material-experimental/mdc-tabs/mdc-tabs';
11-
@import '../material-experimental/mdc-progress-bar/mdc-progress-bar';
2+
@import '../material-experimental/mdc-theming/all-theme';
3+
@import '../material-experimental/mdc-typography/all-typography';
124

135
// Plus imports for other components in your app.
146

157
// Include the common styles for Angular Material. We include this here so that you only
168
// have to load a single css file for Angular Material in your app.
179
// **Be sure that you only ever include this mixin once!**
1810
@include mat-core();
19-
@include mat-button-typography-mdc(mat-typography-config());
20-
@include mat-icon-button-typography-mdc(mat-typography-config());
21-
@include mat-fab-typography-mdc(mat-typography-config());
22-
@include mat-card-typography-mdc(mat-typography-config());
23-
@include mat-checkbox-typography-mdc(mat-typography-config());
24-
@include mat-chips-typography-mdc(mat-typography-config());
25-
@include mat-menu-typography-mdc(mat-typography-config());
26-
@include mat-radio-typography-mdc(mat-typography-config());
27-
@include mat-slide-toggle-typography-mdc(mat-typography-config());
28-
@include mat-tabs-typography-mdc(mat-typography-config());
29-
@include mat-progress-bar-typography-mdc(mat-typography-config());
11+
@include angular-material-typography-mdc();
3012

3113
// Define the default theme (same as the example above).
3214
$candy-app-primary: mat-palette($mat-indigo);
@@ -35,14 +17,4 @@ $candy-app-theme: mat-light-theme($candy-app-primary, $candy-app-accent);
3517

3618
// Include the default theme styles.
3719
@include angular-material-theme($candy-app-theme);
38-
@include mat-button-theme-mdc($candy-app-theme);
39-
@include mat-icon-button-theme-mdc($candy-app-theme);
40-
@include mat-fab-theme-mdc($candy-app-theme);
41-
@include mat-card-theme-mdc($candy-app-theme);
42-
@include mat-checkbox-theme-mdc($candy-app-theme);
43-
@include mat-chips-theme-mdc($candy-app-theme);
44-
@include mat-menu-theme-mdc($candy-app-theme);
45-
@include mat-radio-theme-mdc($candy-app-theme);
46-
@include mat-slide-toggle-theme-mdc($candy-app-theme);
47-
@include mat-tabs-theme-mdc($candy-app-theme);
48-
@include mat-progress-bar-theme-mdc($candy-app-theme);
20+
@include angular-material-theme-mdc($candy-app-theme);

0 commit comments

Comments
 (0)