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

Add $display-font-family and $display-font-style #36711

Merged
merged 1 commit into from Jul 11, 2022
Merged

Add $display-font-family and $display-font-style #36711

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
2 changes: 2 additions & 0 deletions scss/_type.scss
View file
Open in desktop
Expand Up @@ -35,6 +35,8 @@
@each $display, $font-size in $display-font-sizes {
.display-#{$display} {
@include font-size($font-size);
font-family: $display-font-family;
font-style: $display-font-style;
font-weight: $display-font-weight;
line-height: $display-line-height;
}
Expand Down
2 changes: 2 additions & 0 deletions scss/_variables.scss
View file
Open in desktop
Expand Up @@ -604,6 +604,8 @@ $display-font-sizes: (
6: 2.5rem
) !default;

$display-font-family: null !default;
$display-font-style: null !default;
$display-font-weight: 300 !default;
$display-line-height: $headings-line-height !default;
// scss-docs-end display-headings
Expand Down
2 changes: 2 additions & 0 deletions site/content/docs/5.2/content/typography.md
View file
Open in desktop
Expand Up @@ -88,6 +88,8 @@ Traditional heading elements are designed to work best in the meat of your page

Display headings are configured via the `$display-font-sizes` Sass map and two variables, `$display-font-weight` and `$display-line-height`.

Display headings are customizable via two variables, `$display-font-family` and `$display-font-style`.

{{< scss-docs name="display-headings" file="scss/_variables.scss" >}}

## Lead
Expand Down