Skip to content

Rearrange some type styles #41697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 28, 2025
Merged

Rearrange some type styles #41697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions scss/_reboot.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,32 +90,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);
}
Expand Down Expand Up @@ -208,14 +214,16 @@ strong {
//
// Add the correct font size in all browsers

small {
small,
.small {
@include font-size($small-font-size);
}


// Mark

mark {
mark,
.mark {
padding: $mark-padding;
color: var(--#{$prefix}highlight-color);
background-color: var(--#{$prefix}highlight-bg);
Expand Down
35 changes: 0 additions & 35 deletions scss/_type.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,6 @@
//
// Headings
//
.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);
Expand All @@ -42,17 +18,6 @@
}
}

//
// Emphasis
//
.small {
@extend small;
}

.mark {
@extend mark;
}

//
// Lists
//
Expand Down