Skip to content

Commit

Permalink
refactor: switch "universal-app" away from cross-package relative Sas…
Browse files Browse the repository at this point in the history
…s imports
  • Loading branch information
devversion authored and andrewseguin committed Mar 29, 2022
1 parent 5bf7b04 commit 416fcbd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
6 changes: 2 additions & 4 deletions src/universal-app/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@ sass_binary(
"external/npm/node_modules",
],
deps = [
"//src/material:theming_bundle",
"//src/material-experimental/mdc-theming:all_themes",
"//src/material-experimental/mdc-typography:all_typography",
"//src/material/core:theming_scss_lib",
"//src/material:sass_lib",
"//src/material-experimental:sass_lib",
],
)

Expand Down
9 changes: 4 additions & 5 deletions src/universal-app/theme.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
@use '../material' as mat;
@use '../material-experimental/mdc-theming/all-theme' as mdc-all-theme;
@use '../material-experimental/mdc-typography/all-typography' as mdc-all-typography;
@use '@angular/material' as mat;
@use '@angular/material-experimental' as experimental;

// Plus imports for other components in your app.

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

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

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

0 comments on commit 416fcbd

Please sign in to comment.