mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 17:14:04 +02:00
Code Issues Releases Wiki Activity

fixes #21511: set line-height to 1.1 for display headings

Browse Source 
- had to rearrange vars to re-use heading line-height
- align values while we're at it
This commit is contained in:
Mark Otto
2017-01-02 11:03:25 -08:00
parent b6b6deff57
commit 48f452b000
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scss/_type.scss
View File

@@ -27,18 +27,22 @@ h6, .h6 { font-size: $font-size-h6; }
.display-1 { .display-1 {
font-size: $display1-size; font-size: $display1-size;
font-weight: $display1-weight; font-weight: $display1-weight;
line-height: $display-line-height;
} }
.display-2 { .display-2 {
font-size: $display2-size; font-size: $display2-size;
font-weight: $display2-weight; font-weight: $display2-weight;
line-height: $display-line-height;
} }
.display-3 { .display-3 {
font-size: $display3-size; font-size: $display3-size;
font-weight: $display3-weight; font-weight: $display3-weight;
line-height: $display-line-height;
} }
.display-4 { .display-4 {
font-size: $display4-size; font-size: $display4-size;
font-weight: $display4-weight; font-weight: $display4-weight;
line-height: $display-line-height;
} }

13
scss/_variables.scss
View File

@@ -270,6 +270,12 @@ $font-size-h4: 1.5rem !default;
$font-size-h5: 1.25rem !default; $font-size-h5: 1.25rem !default;
$font-size-h6: 1rem !default; $font-size-h6: 1rem !default;
$headings-margin-bottom: ($spacer / 2) !default;
$headings-font-family: inherit !default;
$headings-font-weight: 500 !default;
$headings-line-height: 1.1 !default;
$headings-color: inherit !default;
$display1-size: 6rem !default; $display1-size: 6rem !default;
$display2-size: 5.5rem !default; $display2-size: 5.5rem !default;
$display3-size: 4.5rem !default; $display3-size: 4.5rem !default;
@@ -279,12 +285,7 @@ $display1-weight: 300 !default;
$display2-weight: 300 !default; $display2-weight: 300 !default;
$display3-weight: 300 !default; $display3-weight: 300 !default;
$display4-weight: 300 !default; $display4-weight: 300 !default;
$display-line-height: $headings-line-height !default;
$headings-margin-bottom: ($spacer / 2) !default;
$headings-font-family: inherit !default;
$headings-font-weight: 500 !default;
$headings-line-height: 1.1 !default;
$headings-color: inherit !default;
$lead-font-size: 1.25rem !default; $lead-font-size: 1.25rem !default;
$lead-font-weight: 300 !default; $lead-font-weight: 300 !default;