Skip to content

Commit

Permalink
feat(material/core): remove typography styles from core mixin (#25723)
Browse files Browse the repository at this point in the history
* feat(material/core): remove typography styles from core mixin

* fix(material/core): remove import

* fix(material/core): update comment
  • Loading branch information
andrewseguin committed Sep 29, 2022
1 parent df50b07 commit 3b769b3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
7 changes: 1 addition & 6 deletions src/material/core/_core.scss
Expand Up @@ -3,15 +3,10 @@
// Core styles that can be used to apply material design treatments to any element.
@use './ripple/ripple';
@use './focus-indicators/private';
@use './typography/all-typography';

// Mixin that renders all of the core styles that are not theme-dependent.
// TODO: Remove the `$exclude-typography` parameter once `ng update` automatically migrates
// client theme applications to manually include the typography mixin.
// TODO: Remove the mixin's parameters after all internal clients migrated
@mixin core($typography-config: null, $exclude-typography: false) {
@if not $exclude-typography {
@include all-typography.all-component-typographies($typography-config);
}
@include ripple.ripple();
@include cdk.a11y-visually-hidden();
@include cdk.overlay();
Expand Down
8 changes: 1 addition & 7 deletions src/material/legacy-core/_core.scss
@@ -1,20 +1,14 @@
@use '@angular/cdk';

// Core styles that can be used to apply material design treatments to any element.
@use './typography/all-typography';

@use '../core/ripple/ripple';
@use '../core/focus-indicators/private';

// Mixin that renders all of the core styles that are not theme-dependent.
// TODO: Remove the `$exclude-typography` parameter once `ng update` automatically migrates
// client theme applications to manually include the typography mixin.
// 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) {
@if not $exclude-typography {
@include all-typography.all-legacy-component-typographies($typography-config);
}
@include ripple.ripple();
@include cdk.a11y-visually-hidden();
@include cdk.overlay();
Expand Down

0 comments on commit 3b769b3

Please sign in to comment.