Skip to content

Commit 3b769b3

Browse files
authored
feat(material/core): remove typography styles from core mixin (#25723)
* feat(material/core): remove typography styles from core mixin * fix(material/core): remove import * fix(material/core): update comment
1 parent df50b07 commit 3b769b3

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

src/material/core/_core.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,10 @@
33
// Core styles that can be used to apply material design treatments to any element.
44
@use './ripple/ripple';
55
@use './focus-indicators/private';
6-
@use './typography/all-typography';
76

87
// Mixin that renders all of the core styles that are not theme-dependent.
9-
// TODO: Remove the `$exclude-typography` parameter once `ng update` automatically migrates
10-
// client theme applications to manually include the typography mixin.
8+
// TODO: Remove the mixin's parameters after all internal clients migrated
119
@mixin core($typography-config: null, $exclude-typography: false) {
12-
@if not $exclude-typography {
13-
@include all-typography.all-component-typographies($typography-config);
14-
}
1510
@include ripple.ripple();
1611
@include cdk.a11y-visually-hidden();
1712
@include cdk.overlay();

src/material/legacy-core/_core.scss

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
@use '@angular/cdk';
22

33
// Core styles that can be used to apply material design treatments to any element.
4-
@use './typography/all-typography';
5-
64
@use '../core/ripple/ripple';
75
@use '../core/focus-indicators/private';
86

97
// Mixin that renders all of the core styles that are not theme-dependent.
10-
// TODO: Remove the `$exclude-typography` parameter once `ng update` automatically migrates
11-
// client theme applications to manually include the typography mixin.
8+
// TODO: Remove the mixin's parameters after all internal clients migrated
129
/// @deprecated Use `mat.core` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
1310
/// @breaking-change 17.0.0
1411
@mixin core($typography-config: null, $exclude-typography: false) {
15-
@if not $exclude-typography {
16-
@include all-typography.all-legacy-component-typographies($typography-config);
17-
}
1812
@include ripple.ripple();
1913
@include cdk.a11y-visually-hidden();
2014
@include cdk.overlay();

0 commit comments

Comments
 (0)