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

fix(material/core): add typography hierarchy to prebuilt #25746

Merged
merged 1 commit into from
Oct 3, 2022
Merged

fix(material/core): add typography hierarchy to prebuilt #25746

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
3 changes: 3 additions & 0 deletions src/material/core/theming/prebuilt/deeppurple-amber.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@use '../palette';
@use '../theming';
@use '../../typography/all-typography';
@use '../../typography/typography';

// Include non-theme styles for core.
@include core.core();
Expand All @@ -22,3 +23,5 @@ $theme: theming.define-light-theme((

// Include all theme styles for the components.
@include all-theme.all-component-themes($theme);

@include typography.typography-hierarchy($theme);
3 changes: 3 additions & 0 deletions src/material/core/theming/prebuilt/indigo-pink.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@use '../palette';
@use '../theming';
@use '../../typography/all-typography';
@use '../../typography/typography';


// Include non-theme styles for core.
Expand All @@ -23,3 +24,5 @@ $theme: theming.define-light-theme((

// Include all theme styles for the components.
@include all-theme.all-component-themes($theme);

@include typography.typography-hierarchy($theme);
3 changes: 3 additions & 0 deletions src/material/core/theming/prebuilt/pink-bluegrey.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@use '../palette';
@use '../theming';
@use '../../typography/all-typography';
@use '../../typography/typography';


// Include non-theme styles for core.
Expand All @@ -23,3 +24,5 @@ $theme: theming.define-dark-theme((

// Include all theme styles for the components.
@include all-theme.all-component-themes($theme);

@include typography.typography-hierarchy($theme);
3 changes: 3 additions & 0 deletions src/material/core/theming/prebuilt/purple-green.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@use '../palette';
@use '../theming';
@use '../../typography/all-typography';
@use '../../typography/typography';


// Include non-theme styles for core.
Expand All @@ -23,3 +24,5 @@ $theme: theming.define-dark-theme((

// Include all theme styles for the components.
@include all-theme.all-component-themes($theme);

@include typography.typography-hierarchy($theme);
3 changes: 3 additions & 0 deletions src/material/legacy-core/theming/prebuilt/deeppurple-amber.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@use '../../core';
@use '../../../core/theming/palette';
@use '../../../core/theming/theming';
@use '../../../core/typography/typography';
@use '../../../core/typography/all-typography';


Expand All @@ -23,3 +24,5 @@ $theme: theming.define-light-theme((

// Include all theme styles for the components.
@include all-theme.all-legacy-component-themes($theme);

@include typography.typography-hierarchy($theme);
3 changes: 3 additions & 0 deletions src/material/legacy-core/theming/prebuilt/indigo-pink.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@use '../../core';
@use '../../../core/theming/palette';
@use '../../../core/theming/theming';
@use '../../../core/typography/typography';
@use '../../../core/typography/all-typography';


Expand All @@ -23,3 +24,5 @@ $theme: theming.define-light-theme((

// Include all theme styles for the components.
@include all-theme.all-legacy-component-themes($theme);

@include typography.typography-hierarchy($theme);
3 changes: 3 additions & 0 deletions src/material/legacy-core/theming/prebuilt/pink-bluegrey.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@use '../../core';
@use '../../../core/theming/palette';
@use '../../../core/theming/theming';
@use '../../../core/typography/typography';
@use '../../../core/typography/all-typography';


Expand All @@ -23,3 +24,5 @@ $theme: theming.define-dark-theme((

// Include all theme styles for the components.
@include all-theme.all-legacy-component-themes($theme);

@include typography.typography-hierarchy($theme);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can land the changes as they are now, but for a follow-up PR: maybe we should bake this into the core-typography mixin?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah possibly - it seems weird to have to include this separately. I would have expected our theme files to be sufficient with an "all-component-themes" mixin.

3 changes: 3 additions & 0 deletions src/material/legacy-core/theming/prebuilt/purple-green.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@use '../../core';
@use '../../../core/theming/palette';
@use '../../../core/theming/theming';
@use '../../../core/typography/typography';
@use '../../../core/typography/all-typography';


Expand All @@ -23,3 +24,5 @@ $theme: theming.define-dark-theme((

// Include all theme styles for the components.
@include all-theme.all-legacy-component-themes($theme);

@include typography.typography-hierarchy($theme);