Skip to content

Commit 416fcbd

Browse files
devversionandrewseguin
authored andcommitted
refactor: switch "universal-app" away from cross-package relative Sass imports
1 parent 5bf7b04 commit 416fcbd

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

src/universal-app/BUILD.bazel

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,8 @@ sass_binary(
4848
"external/npm/node_modules",
4949
],
5050
deps = [
51-
"//src/material:theming_bundle",
52-
"//src/material-experimental/mdc-theming:all_themes",
53-
"//src/material-experimental/mdc-typography:all_typography",
54-
"//src/material/core:theming_scss_lib",
51+
"//src/material:sass_lib",
52+
"//src/material-experimental:sass_lib",
5553
],
5654
)
5755

src/universal-app/theme.scss

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
@use '../material' as mat;
2-
@use '../material-experimental/mdc-theming/all-theme' as mdc-all-theme;
3-
@use '../material-experimental/mdc-typography/all-typography' as mdc-all-typography;
1+
@use '@angular/material' as mat;
2+
@use '@angular/material-experimental' as experimental;
43

54
// Plus imports for other components in your app.
65

76
// Include the common styles for Angular Material. We include this here so that you only
87
// have to load a single css file for Angular Material in your app.
98
// **Be sure that you only ever include this mixin once!**
109
@include mat.core();
11-
@include mdc-all-typography.all-mdc-component-typographies();
10+
@include experimental.all-mdc-component-typographies();
1211

1312
// Define the default theme (same as the example above).
1413
$candy-app-primary: mat.define-palette(mat.$indigo-palette);
@@ -17,4 +16,4 @@ $candy-app-theme: mat.define-light-theme($candy-app-primary, $candy-app-accent);
1716

1817
// Include the default theme styles.
1918
@include mat.all-component-themes($candy-app-theme);
20-
@include mdc-all-theme.all-mdc-component-themes($candy-app-theme);
19+
@include experimental.all-mdc-component-themes($candy-app-theme);

0 commit comments

Comments
 (0)