Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(material/core): add option to disable core typography #25706

Merged
merged 1 commit into from Sep 27, 2022
Merged

feat(material/core): add option to disable core typography #25706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/material/core/_core.scss
View file
Open in desktop
Expand Up @@ -6,8 +6,12 @@
@use './typography/all-typography';

// Mixin that renders all of the core styles that are not theme-dependent.
@mixin core($typography-config: null) {
@include all-typography.all-component-typographies($typography-config);
// TODO: Remove the `$exclude-typography` parameter once `ng update` automatically migrates
// client theme applications to manually include the typography mixin.
@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: 6 additions & 2 deletions src/material/legacy-core/_core.scss
View file
Open in desktop
Expand Up @@ -7,10 +7,14 @@
@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.
/// @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) {
@include all-typography.all-legacy-component-typographies($typography-config);
@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