diff options
| author | Chris Rebert <[email protected]> | 2016-02-04 00:11:48 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-02-04 00:11:48 -0800 |
| commit | 040522ce7ab5ba3ec4a0f026c586c397c01b5087 (patch) | |
| tree | f3c4250e7416143e8cff81c05c496ee89e1bd246 | |
| parent | 1d277de0b0a9890fe405b97fe405b22f155fd154 (diff) | |
| parent | 23979a999488ce38f5e349f36ffef485ba01c897 (diff) | |
| download | bootstrap-040522ce7ab5ba3ec4a0f026c586c397c01b5087.tar.xz bootstrap-040522ce7ab5ba3ec4a0f026c586c397c01b5087.zip | |
Merge pull request #19079 from twbs/fix-18992
Revert separation of <hN> and .hN heading styles
| -rw-r--r-- | scss/_type.scss | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/scss/_type.scss b/scss/_type.scss index 57214e818..9fe8194db 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -11,22 +11,12 @@ h1, h2, h3, h4, h5, h6, color: $headings-color; } -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; } - -// 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; } +h1, .h1 { font-size: $font-size-h1; } +h2, .h2 { font-size: $font-size-h2; } +h3, .h3 { font-size: $font-size-h3; } +h4, .h4 { font-size: $font-size-h4; } +h5, .h5 { font-size: $font-size-h5; } +h6, .h6 { font-size: $font-size-h6; } .lead { font-size: $lead-font-size; |