root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Add `$display-font-family` and `$display-font-style` (#36711)

This commit is contained in:
Julien Déramond 2022-07-11 23:16:33 +02:00 committed by GitHub
parent ac654a0f66
commit a1224482f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scss/_type.scss
View File

@ -35,6 +35,8 @@
@each $display, $font-size in $display-font-sizes { @each $display, $font-size in $display-font-sizes {
.display-#{$display} { .display-#{$display} {
@include font-size($font-size); @include font-size($font-size);
font-family: $display-font-family;
font-style: $display-font-style;
font-weight: $display-font-weight; font-weight: $display-font-weight;
line-height: $display-line-height; line-height: $display-line-height;
} }

2
scss/_variables.scss
View File

@ -604,6 +604,8 @@ $display-font-sizes: (
6: 2.5rem 6: 2.5rem
) !default; ) !default;
$display-font-family: null !default;
$display-font-style: null !default;
$display-font-weight: 300 !default; $display-font-weight: 300 !default;
$display-line-height: $headings-line-height !default; $display-line-height: $headings-line-height !default;
// scss-docs-end display-headings // scss-docs-end display-headings

2
site/content/docs/5.2/content/typography.md
View File

@ -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 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" >}} {{< scss-docs name="display-headings" file="scss/_variables.scss" >}}
## Lead ## Lead