Skip to content
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

Jump to bottom

Remove font size classes that are enqueued in the global stylesheet #35182

Merged
merged 1 commit into from
Oct 13, 2021
Merged

Remove font size classes that are enqueued in the global stylesheet #35182

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
20 changes: 3 additions & 17 deletions packages/block-library/src/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,12 @@
@include gradient-colors-deprecated();
}

// Font sizes.
.has-small-font-size {
font-size: 0.8125em;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jasmussen I've noticed that in the common.scss bundled the classes used em while in the editor.scss bundled they used px. Looked at the history but this seems to be like that since the beggining. Do you happen to remember why that difference by any chance? Is it safe to substitute them with the theme.json values in px?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. There's a lot of discussion around ems vs. px, but since we have a unit selector in the interface, px provides a default that's fairly easy to understand in comparison.

So why are the values in px in the editor and em in the interface? Good question, that seems like an oversight.

Is it safe to remove? Almost certainly. Looking at the values, we have 0.8125em for "small", which maps to 13px in theme.json. The math checks out because ems are based on the parent font size, which in the case of the body element is 16px by default. And 0.8125 * 16 = 13.

Two issues:

  • The problem is that ems are not rems, and they take their value from the parent. Meaning there could be nested cases where the font size wouldn't match.
  • The other issue is if the theme sets the font size on the body element to something other than 16px, then the math will be wrong.

But in both cases, it appears those issues are in trunk and already shipping, meaning all this PR does is correct an error. It also appears that the global styles that are output have already corrected this error, meaning this is just code cleanup.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, since we load the global stylesheet for all themes, the core classes enqueued there are overriding these styles already.

}

.has-regular-font-size, // Not used now, kept because of backward compatibility.
.has-normal-font-size {
// Font sizes (not used now, kept because of backward compatibility).
.has-regular-font-size {
font-size: 1em;
}

.has-medium-font-size {
font-size: 1.25em;
}

.has-large-font-size {
font-size: 2.25em;
}

.has-larger-font-size, // Not used now, kept because of backward compatibility.
.has-huge-font-size {
.has-larger-font-size {
font-size: 2.625em;
}

Expand Down
21 changes: 4 additions & 17 deletions packages/block-library/src/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,15 @@
@include gradient-colors-deprecated();
}

// Font sizes.
// Font sizes (not used now, kept because of backward compatibility).
//
// The reason we add the editor class wrapper here is
// to avoid enqueing the classes twice: here and in ./editor.scss
.editor-styles-wrapper .has-small-font-size {
font-size: 13px;
}

.editor-styles-wrapper .has-regular-font-size, // Not used now, kept because of backward compatibility.
.editor-styles-wrapper .has-normal-font-size {
.editor-styles-wrapper .has-regular-font-size {
font-size: 16px;
}

.editor-styles-wrapper .has-medium-font-size {
font-size: 20px;
}

.editor-styles-wrapper .has-large-font-size {
font-size: 36px;
}

.editor-styles-wrapper .has-larger-font-size, // Not used now, kept because of backward compatibility.
.editor-styles-wrapper .has-huge-font-size {
.editor-styles-wrapper .has-larger-font-size {
font-size: 42px;
}

Expand Down