root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Co-locate heading and some type styles in Reboot to avoid some extends and extra dependencies once we migrate to Sass modules (#41697)

This commit is contained in:
Mark Otto 2025-08-27 20:24:43 -07:00 committed by Mark Otto
parent 868c13be7a
commit c492a4cb37
2 changed files with 16 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scss/_reboot.scss
View File

@ -90,32 +90,38 @@ hr {
color: var(--#{$prefix}heading-color); color: var(--#{$prefix}heading-color);
} }
h1 { h1,
.h1 {
@extend %heading; @extend %heading;
@include font-size($h1-font-size); @include font-size($h1-font-size);
} }
h2 { h2,
.h2 {
@extend %heading; @extend %heading;
@include font-size($h2-font-size); @include font-size($h2-font-size);
} }
h3 { h3,
.h3 {
@extend %heading; @extend %heading;
@include font-size($h3-font-size); @include font-size($h3-font-size);
} }
h4 { h4,
.h4 {
@extend %heading; @extend %heading;
@include font-size($h4-font-size); @include font-size($h4-font-size);
} }
h5 { h5,
.h5 {
@extend %heading; @extend %heading;
@include font-size($h5-font-size); @include font-size($h5-font-size);
} }
h6 { h6,
.h6 {
@extend %heading; @extend %heading;
@include font-size($h6-font-size); @include font-size($h6-font-size);
} }
@ -208,14 +214,16 @@ strong {
// //
// Add the correct font size in all browsers // Add the correct font size in all browsers
small { small,
.small {
@include font-size($small-font-size); @include font-size($small-font-size);
} }
// Mark // Mark
mark { mark,
.mark {
padding: $mark-padding; padding: $mark-padding;
color: var(--#{$prefix}highlight-color); color: var(--#{$prefix}highlight-color);
background-color: var(--#{$prefix}highlight-bg); background-color: var(--#{$prefix}highlight-bg);

35
scss/_type.scss
View File

@ -1,30 +1,6 @@
// //
// Headings // Headings
// //
.h1 {
@extend h1;
}
.h2 {
@extend h2;
}
.h3 {
@extend h3;
}
.h4 {
@extend h4;
}
.h5 {
@extend h5;
}
.h6 {
@extend h6;
}
.lead { .lead {
@include font-size($lead-font-size); @include font-size($lead-font-size);
@ -42,17 +18,6 @@
} }
} }
//
// Emphasis
//
.small {
@extend small;
}
.mark {
@extend mark;
}
// //
// Lists // Lists
// //