Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <code@chrisrebert.com>2016-02-04 11:02:25 +0300
committerChris Rebert <code@chrisrebert.com>2016-02-04 11:05:02 +0300
commit23979a999488ce38f5e349f36ffef485ba01c897 (patch)
treef3c4250e7416143e8cff81c05c496ee89e1bd246 /scss/_type.scss
parent1d277de0b0a9890fe405b97fe405b22f155fd154 (diff)
Revert separation of <hN> and .hN heading styles
This reverts commit deeb74e321f8ba676dce8f13809c2aace0e0c537. Reverts #18038 Fixes #18992 [skip sauce] [skip validator]
Diffstat (limited to 'scss/_type.scss')
-rw-r--r--scss/_type.scss22
1 files changed, 6 insertions, 16 deletions
diff --git a/scss/_type.scss b/scss/_type.scss
index 57214e8187..9fe8194db5 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;