Move heading classes back to Reboot to prevent a dependency

diff --git a/scss/content/_reboot.scss b/scss/content/_reboot.scss
index bf2088561d91795d18d38504bd137124efaf8f0d..536f2d341a35e9b0bcf549389e7920e391cb148b 100644 (file)
--- a/scss/content/_reboot.scss
+++ b/scss/content/_reboot.scss
@@ -96,32 +96,38 @@ hr {
   color: var(--#{$prefix}heading-color);
 }
 
-h1 {
+h1,
+.h1 {
   @extend %heading;
   @include font-size($h1-font-size);
 }
 
-h2 {
+h2,
+.h2 {
   @extend %heading;
   @include font-size($h2-font-size);
 }
 
-h3 {
+h3,
+.h3 {
   @extend %heading;
   @include font-size($h3-font-size);
 }
 
-h4 {
+h4,
+.h4 {
   @extend %heading;
   @include font-size($h4-font-size);
 }
 
-h5 {
+h5,
+.h5 {
   @extend %heading;
   @include font-size($h5-font-size);
 }
 
-h6 {
+h6,
+.h6 {
   @extend %heading;
   @include font-size($h6-font-size);
 }

diff --git a/scss/content/_type.scss b/scss/content/_type.scss
index e7a9a0ab924e01a8bb53447b8524a15693c88224..802bae42da49c23c41da0678051b7ca3b23e08f2 100644 (file)
--- a/scss/content/_type.scss
+++ b/scss/content/_type.scss
@@ -3,35 +3,6 @@
 @use "../mixins/lists" as *;
 @use "../vendor/rfs" as *;
 
-//
-// Headings
-//
-// mdo-do: remove extend
-// .h1 {
-//   @extend h1;
-// }
-
-// .h2 {
-//   @extend h2;
-// }
-
-// .h3 {
-//   @extend h3;
-// }
-
-// .h4 {
-//   @extend h4;
-// }
-
-// .h5 {
-//   @extend h5;
-// }
-
-// .h6 {
-//   @extend h6;
-// }
-
-
 .lead {
   @include font-size($lead-font-size);
   font-weight: $lead-font-weight;