Revert separation of <hN> and .hN heading styles

This reverts commit deeb74e321f8ba676dce8f13809c2aace0e0c537.

Reverts #18038
Fixes #18992
[skip sauce]
[skip validator]

diff --git a/scss/_type.scss b/scss/_type.scss
index 57214e81875ab343b3be3e7d92d16ffb40cfad65..9fe8194db56bf826a3a68c63d000f7655c950057 100644 (file)
--- 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;