rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #19079 from twbs/fix-18992

Browse Source 
Revert separation of <hN> and .hN heading styles
This commit is contained in:
Chris Rebert 2016-02-04 00:11:48 -08:00
commit 040522ce7a
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scss/_type.scss
View File

@ -11,22 +11,12 @@ h1, h2, h3, h4, h5, h6,
color: $headings-color; color: $headings-color;
} }
h1 { font-size: $font-size-h1; } h1, .h1 { font-size: $font-size-h1; }
h2 { font-size: $font-size-h2; } h2, .h2 { font-size: $font-size-h2; }
h3 { font-size: $font-size-h3; } h3, .h3 { font-size: $font-size-h3; }
h4 { font-size: $font-size-h4; } h4, .h4 { font-size: $font-size-h4; }
h5 { font-size: $font-size-h5; } h5, .h5 { font-size: $font-size-h5; }
h6 { font-size: $font-size-h6; } h6, .h6 { font-size: $font-size-h6; }
// These declarations are kept separate from and placed after
// the previous tag-based declarations so that the classes beat the tags in
// the CSS cascade, and thus <h1 class="h2"> will be styled like an h2.
.h1 { font-size: $font-size-h1; }
.h2 { font-size: $font-size-h2; }
.h3 { font-size: $font-size-h3; }
.h4 { font-size: $font-size-h4; }
.h5 { font-size: $font-size-h5; }
.h6 { font-size: $font-size-h6; }
.lead { .lead {
font-size: $lead-font-size; font-size: $lead-font-size;