Move heading classes back to Reboot to prevent a dependency

mdo · mdo · commit dc65ef49a9b6 · 2025-06-22T09:26:30.000-07:00
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -96,32 +96,38 @@ hr {`
`96`	`96`	`color: var(--#{$prefix}heading-color);`
`97`	`97`	`}`
`98`	`98`
`99`		`-h1 {`
	`99`	`+h1,`
	`100`	`+.h1 {`
`100`	`101`	`@extend %heading;`
`101`	`102`	`@include font-size($h1-font-size);`
`102`	`103`	`}`
`103`	`104`
`104`		`-h2 {`
	`105`	`+h2,`
	`106`	`+.h2 {`
`105`	`107`	`@extend %heading;`
`106`	`108`	`@include font-size($h2-font-size);`
`107`	`109`	`}`
`108`	`110`
`109`		`-h3 {`
	`111`	`+h3,`
	`112`	`+.h3 {`
`110`	`113`	`@extend %heading;`
`111`	`114`	`@include font-size($h3-font-size);`
`112`	`115`	`}`
`113`	`116`
`114`		`-h4 {`
	`117`	`+h4,`
	`118`	`+.h4 {`
`115`	`119`	`@extend %heading;`
`116`	`120`	`@include font-size($h4-font-size);`
`117`	`121`	`}`
`118`	`122`
`119`		`-h5 {`
	`123`	`+h5,`
	`124`	`+.h5 {`
`120`	`125`	`@extend %heading;`
`121`	`126`	`@include font-size($h5-font-size);`
`122`	`127`	`}`
`123`	`128`
`124`		`-h6 {`
	`129`	`+h6,`
	`130`	`+.h6 {`
`125`	`131`	`@extend %heading;`
`126`	`132`	`@include font-size($h6-font-size);`
`127`	`133`	`}`