From 95af59aedb80cd26a605e3b1cb73f30f7c96c142 Mon Sep 17 00:00:00 2001 From: Andrew Seguin Date: Sat, 1 Oct 2022 05:52:07 -0600 Subject: [PATCH 1/2] fix(material/core): remove core style parameters --- src/material/core/_core.scss | 3 +-- src/material/legacy-core/_core.scss | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/material/core/_core.scss b/src/material/core/_core.scss index 64d1239e3f5d..2b7ec741fb19 100644 --- a/src/material/core/_core.scss +++ b/src/material/core/_core.scss @@ -5,8 +5,7 @@ @use './focus-indicators/private'; // Mixin that renders all of the core styles that are not theme-dependent. -// TODO: Remove the mixin's parameters after all internal clients migrated -@mixin core($typography-config: null, $exclude-typography: false) { +@mixin core() { @include ripple.ripple(); @include cdk.a11y-visually-hidden(); @include cdk.overlay(); diff --git a/src/material/legacy-core/_core.scss b/src/material/legacy-core/_core.scss index 4c70c9f9b509..00b3e5ae4abe 100644 --- a/src/material/legacy-core/_core.scss +++ b/src/material/legacy-core/_core.scss @@ -5,10 +5,9 @@ @use '../core/focus-indicators/private'; // Mixin that renders all of the core styles that are not theme-dependent. -// TODO: Remove the mixin's parameters after all internal clients migrated /// @deprecated Use `mat.core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating. /// @breaking-change 17.0.0 -@mixin core($typography-config: null, $exclude-typography: false) { +@mixin core() { @include ripple.ripple(); @include cdk.a11y-visually-hidden(); @include cdk.overlay(); From 96f6c465000bd1d5d721fe56424b971fcce9778e Mon Sep 17 00:00:00 2001 From: Andrew Seguin Date: Mon, 3 Oct 2022 05:44:38 -0600 Subject: [PATCH 2/2] fix(material/core): dev-app theme --- integration/yarn-pnp-compat/src/styles.scss | 2 +- src/dev-app/theme.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/yarn-pnp-compat/src/styles.scss b/integration/yarn-pnp-compat/src/styles.scss index a0d758b41022..04ed744a1e9b 100644 --- a/integration/yarn-pnp-compat/src/styles.scss +++ b/integration/yarn-pnp-compat/src/styles.scss @@ -8,7 +8,7 @@ $theme: mat.define-light-theme(( density: 0 )); -@include mat.core($theme); +@include mat.core(); @include mat.all-legacy-component-themes($theme); @include mat.all-component-themes($theme); diff --git a/src/dev-app/theme.scss b/src/dev-app/theme.scss index 50a18ab5b868..d191f29345fb 100644 --- a/src/dev-app/theme.scss +++ b/src/dev-app/theme.scss @@ -21,7 +21,7 @@ $candy-app-theme: mat.define-light-theme(( // 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($candy-app-theme); +@include mat.core(); // Include the default theme styles. @include mat.all-component-themes($candy-app-theme);