Skip to content

feat(material/core): remove typography styles from core mixin #25723

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

Merged
merged 3 commits into from
Sep 29, 2022
Merged

feat(material/core): remove typography styles from core mixin #25723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb4be00
feat(material/core): remove typography styles from core mixin
andrewseguin Sep 28, 2022
5547746
fix(material/core): remove import
andrewseguin Sep 28, 2022
473c217
fix(material/core): update comment
andrewseguin Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/material/core/_core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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