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.

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

Audit variables stylesheet. #26827

Merged
merged 8 commits into from
Dec 14, 2020
Merged

Audit variables stylesheet. #26827

merged 8 commits into from
Dec 14, 2020

Conversation

jasmussen
Copy link
Contributor

We have a handy stylesheet, _variables.scss, which provides a number of base styles. These variables can be accessed across the codebase, making it easy to update visuals across the entire system, when necessary, by changing a single variable.

However the sheet had a few problems:

  • A few unused variables
  • No organization system
  • Mix of web only and React Native variables
  • Some variables used only once, or only in a single file
  • Some variables being used incorrectly as a result of the other problems.

This is primarily a code quality PR, but it also hopes to address those problems in a few ways:

  • It reorganizes the stylesheet a little bit, making it hopefully easier to find the variable you're looking for.
  • It removes some dead CSS that I found while updating incorrectly used variables.
  • It retires a few variables that were used incorrectly.
  • It separates variables used only by the React Native build. Those variables appear to support the slightly different visual language for that platform. Fine to have in this stylesheet, but they should not be used by mobile web.

If you test this PR, there shouldn't be any visual changes, except in two places, that now use grid units rather than unrelated variables:

  • Code compare when resolving a block with a validation error
  • Min-height of block with a warning.

@jasmussen jasmussen added the [Type] Code Quality Issues or PRs that relate to code quality label Nov 9, 2020
@jasmussen jasmussen requested a review from jbinda November 9, 2020 13:15
@jasmussen jasmussen requested a review from ellatrix as a code owner November 9, 2020 13:15
@jasmussen jasmussen self-assigned this Nov 9, 2020
@jasmussen
Copy link
Contributor Author

Note, if you check out this PR, you have to stop and restart npm run dev, or it won't work.

@github-actions
Copy link

github-actions bot commented Nov 9, 2020

Size Change: -68 B (0%)

Total Size: 1.28 MB

Filename Size Change
build/block-directory/index.js 8.72 kB +1 B
build/block-editor/index.js 128 kB -215 B (0%)
build/block-editor/style-rtl.css 11.2 kB -50 B (0%)
build/block-editor/style.css 11.2 kB -49 B (0%)
build/block-library/index.js 150 kB +10 B (0%)
build/block-library/style-rtl.css 8.34 kB -7 B (0%)
build/block-library/style.css 8.34 kB -7 B (0%)
build/components/index.js 171 kB -3 B (0%)
build/compose/index.js 11 kB +249 B (2%)
build/core-data/index.js 15.4 kB +1 B
build/edit-navigation/index.js 11.1 kB -1 B
build/edit-post/style-rtl.css 6.47 kB +2 B (0%)
build/edit-post/style.css 6.45 kB +2 B (0%)
build/edit-widgets/index.js 26.3 kB -1 B
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.14 kB 0 B
build/annotations/index.js 3.81 kB 0 B
build/api-fetch/index.js 3.42 kB 0 B
build/autop/index.js 2.83 kB 0 B
build/blob/index.js 665 B 0 B
build/block-directory/style-rtl.css 943 B 0 B
build/block-directory/style.css 942 B 0 B
build/block-library/blocks/archives/editor-rtl.css 120 B 0 B
build/block-library/blocks/archives/editor.css 119 B 0 B
build/block-library/blocks/audio/editor-rtl.css 118 B 0 B
build/block-library/blocks/audio/editor.css 118 B 0 B
build/block-library/blocks/audio/style-rtl.css 152 B 0 B
build/block-library/blocks/audio/style.css 152 B 0 B
build/block-library/blocks/block/editor-rtl.css 211 B 0 B
build/block-library/blocks/block/editor.css 211 B 0 B
build/block-library/blocks/button/editor-rtl.css 513 B 0 B
build/block-library/blocks/button/editor.css 513 B 0 B
build/block-library/blocks/button/style-rtl.css 488 B 0 B
build/block-library/blocks/button/style.css 488 B 0 B
build/block-library/blocks/buttons/editor-rtl.css 275 B 0 B
build/block-library/blocks/buttons/editor.css 275 B 0 B
build/block-library/blocks/buttons/style-rtl.css 346 B 0 B
build/block-library/blocks/buttons/style.css 346 B 0 B
build/block-library/blocks/calendar/style-rtl.css 249 B 0 B
build/block-library/blocks/calendar/style.css 249 B 0 B
build/block-library/blocks/categories/editor-rtl.css 135 B 0 B
build/block-library/blocks/categories/editor.css 135 B 0 B
build/block-library/blocks/categories/style-rtl.css 132 B 0 B
build/block-library/blocks/categories/style.css 132 B 0 B
build/block-library/blocks/code/style-rtl.css 152 B 0 B
build/block-library/blocks/code/style.css 152 B 0 B
build/block-library/blocks/columns/editor-rtl.css 239 B 0 B
build/block-library/blocks/columns/editor.css 239 B 0 B
build/block-library/blocks/columns/style-rtl.css 467 B 0 B
build/block-library/blocks/columns/style.css 466 B 0 B
build/block-library/blocks/cover/editor-rtl.css 440 B 0 B
build/block-library/blocks/cover/editor.css 438 B 0 B
build/block-library/blocks/cover/style-rtl.css 1.27 kB 0 B
build/block-library/blocks/cover/style.css 1.27 kB 0 B
build/block-library/blocks/embed/editor-rtl.css 529 B 0 B
build/block-library/blocks/embed/editor.css 529 B 0 B
build/block-library/blocks/embed/style-rtl.css 419 B 0 B
build/block-library/blocks/embed/style.css 419 B 0 B
build/block-library/blocks/file/editor-rtl.css 246 B 0 B
build/block-library/blocks/file/editor.css 245 B 0 B
build/block-library/blocks/file/style-rtl.css 288 B 0 B
build/block-library/blocks/file/style.css 289 B 0 B
build/block-library/blocks/freeform/editor-rtl.css 2.49 kB 0 B
build/block-library/blocks/freeform/editor.css 2.49 kB 0 B
build/block-library/blocks/gallery/editor-rtl.css 692 B 0 B
build/block-library/blocks/gallery/editor.css 693 B 0 B
build/block-library/blocks/gallery/style-rtl.css 1.11 kB 0 B
build/block-library/blocks/gallery/style.css 1.11 kB 0 B
build/block-library/blocks/group/editor-rtl.css 364 B 0 B
build/block-library/blocks/group/editor.css 364 B 0 B
build/block-library/blocks/group/style-rtl.css 117 B 0 B
build/block-library/blocks/group/style.css 117 B 0 B
build/block-library/blocks/heading/editor-rtl.css 174 B 0 B
build/block-library/blocks/heading/editor.css 174 B 0 B
build/block-library/blocks/heading/style-rtl.css 137 B 0 B
build/block-library/blocks/heading/style.css 137 B 0 B
build/block-library/blocks/html/editor-rtl.css 324 B 0 B
build/block-library/blocks/html/editor.css 325 B 0 B
build/block-library/blocks/image/editor-rtl.css 738 B 0 B
build/block-library/blocks/image/editor.css 737 B 0 B
build/block-library/blocks/image/style-rtl.css 510 B 0 B
build/block-library/blocks/image/style.css 511 B 0 B
build/block-library/blocks/latest-comments/editor-rtl.css 201 B 0 B
build/block-library/blocks/latest-comments/editor.css 200 B 0 B
build/block-library/blocks/latest-comments/style-rtl.css 315 B 0 B
build/block-library/blocks/latest-comments/style.css 315 B 0 B
build/block-library/blocks/latest-posts/editor-rtl.css 183 B 0 B
build/block-library/blocks/latest-posts/editor.css 183 B 0 B
build/block-library/blocks/latest-posts/style-rtl.css 568 B 0 B
build/block-library/blocks/latest-posts/style.css 567 B 0 B
build/block-library/blocks/list/editor-rtl.css 129 B 0 B
build/block-library/blocks/list/editor.css 129 B 0 B
build/block-library/blocks/list/style-rtl.css 127 B 0 B
build/block-library/blocks/list/style.css 127 B 0 B
build/block-library/blocks/media-text/editor-rtl.css 240 B 0 B
build/block-library/blocks/media-text/editor.css 240 B 0 B
build/block-library/blocks/media-text/style-rtl.css 579 B 0 B
build/block-library/blocks/media-text/style.css 577 B 0 B
build/block-library/blocks/more/editor-rtl.css 479 B 0 B
build/block-library/blocks/more/editor.css 479 B 0 B
build/block-library/blocks/navigation-link/editor-rtl.css 438 B 0 B
build/block-library/blocks/navigation-link/editor.css 440 B 0 B
build/block-library/blocks/navigation-link/style-rtl.css 747 B 0 B
build/block-library/blocks/navigation-link/style.css 745 B 0 B
build/block-library/blocks/navigation/editor-rtl.css 1.31 kB 0 B
build/block-library/blocks/navigation/editor.css 1.31 kB 0 B
build/block-library/blocks/navigation/style-rtl.css 222 B 0 B
build/block-library/blocks/navigation/style.css 222 B 0 B
build/block-library/blocks/nextpage/editor-rtl.css 440 B 0 B
build/block-library/blocks/nextpage/editor.css 440 B 0 B
build/block-library/blocks/paragraph/editor-rtl.css 161 B 0 B
build/block-library/blocks/paragraph/editor.css 161 B 0 B
build/block-library/blocks/paragraph/style-rtl.css 279 B 0 B
build/block-library/blocks/paragraph/style.css 279 B 0 B
build/block-library/blocks/post-author/editor-rtl.css 255 B 0 B
build/block-library/blocks/post-author/editor.css 255 B 0 B
build/block-library/blocks/post-author/style-rtl.css 229 B 0 B
build/block-library/blocks/post-author/style.css 230 B 0 B
build/block-library/blocks/post-content/editor-rtl.css 187 B 0 B
build/block-library/blocks/post-content/editor.css 187 B 0 B
build/block-library/blocks/post-excerpt/editor-rtl.css 134 B 0 B
build/block-library/blocks/post-excerpt/editor.css 134 B 0 B
build/block-library/blocks/post-featured-image/editor-rtl.css 387 B 0 B
build/block-library/blocks/post-featured-image/editor.css 386 B 0 B
build/block-library/blocks/post-featured-image/style-rtl.css 149 B 0 B
build/block-library/blocks/post-featured-image/style.css 149 B 0 B
build/block-library/blocks/pullquote/editor-rtl.css 231 B 0 B
build/block-library/blocks/pullquote/editor.css 231 B 0 B
build/block-library/blocks/pullquote/style-rtl.css 359 B 0 B
build/block-library/blocks/pullquote/style.css 359 B 0 B
build/block-library/blocks/query-loop/editor-rtl.css 142 B 0 B
build/block-library/blocks/query-loop/editor.css 141 B 0 B
build/block-library/blocks/query-loop/style-rtl.css 361 B 0 B
build/block-library/blocks/query-loop/style.css 363 B 0 B
build/block-library/blocks/query/editor-rtl.css 179 B 0 B
build/block-library/blocks/query/editor.css 179 B 0 B
build/block-library/blocks/quote/editor-rtl.css 121 B 0 B
build/block-library/blocks/quote/editor.css 121 B 0 B
build/block-library/blocks/quote/style-rtl.css 215 B 0 B
build/block-library/blocks/quote/style.css 214 B 0 B
build/block-library/blocks/rss/editor-rtl.css 270 B 0 B
build/block-library/blocks/rss/editor.css 270 B 0 B
build/block-library/blocks/rss/style-rtl.css 314 B 0 B
build/block-library/blocks/rss/style.css 313 B 0 B
build/block-library/blocks/search/editor-rtl.css 213 B 0 B
build/block-library/blocks/search/editor.css 213 B 0 B
build/block-library/blocks/search/style-rtl.css 384 B 0 B
build/block-library/blocks/search/style.css 386 B 0 B
build/block-library/blocks/separator/editor-rtl.css 151 B 0 B
build/block-library/blocks/separator/editor.css 151 B 0 B
build/block-library/blocks/separator/style-rtl.css 281 B 0 B
build/block-library/blocks/separator/style.css 281 B 0 B
build/block-library/blocks/shortcode/editor-rtl.css 547 B 0 B
build/block-library/blocks/shortcode/editor.css 547 B 0 B
build/block-library/blocks/site-logo/editor-rtl.css 251 B 0 B
build/block-library/blocks/site-logo/editor.css 251 B 0 B
build/block-library/blocks/site-logo/style-rtl.css 166 B 0 B
build/block-library/blocks/site-logo/style.css 166 B 0 B
build/block-library/blocks/social-link/editor-rtl.css 211 B 0 B
build/block-library/blocks/social-link/editor.css 211 B 0 B
build/block-library/blocks/social-links/editor-rtl.css 749 B 0 B
build/block-library/blocks/social-links/editor.css 749 B 0 B
build/block-library/blocks/social-links/style-rtl.css 1.37 kB 0 B
build/block-library/blocks/social-links/style.css 1.37 kB 0 B
build/block-library/blocks/spacer/editor-rtl.css 321 B 0 B
build/block-library/blocks/spacer/editor.css 321 B 0 B
build/block-library/blocks/spacer/style-rtl.css 107 B 0 B
build/block-library/blocks/spacer/style.css 107 B 0 B
build/block-library/blocks/subhead/editor-rtl.css 148 B 0 B
build/block-library/blocks/subhead/editor.css 148 B 0 B
build/block-library/blocks/subhead/style-rtl.css 134 B 0 B
build/block-library/blocks/subhead/style.css 134 B 0 B
build/block-library/blocks/table/editor-rtl.css 530 B 0 B
build/block-library/blocks/table/editor.css 530 B 0 B
build/block-library/blocks/table/style-rtl.css 433 B 0 B
build/block-library/blocks/table/style.css 433 B 0 B
build/block-library/blocks/tag-cloud/editor-rtl.css 162 B 0 B
build/block-library/blocks/tag-cloud/editor.css 162 B 0 B
build/block-library/blocks/tag-cloud/style-rtl.css 145 B 0 B
build/block-library/blocks/tag-cloud/style.css 145 B 0 B
build/block-library/blocks/template-part/editor-rtl.css 644 B 0 B
build/block-library/blocks/template-part/editor.css 645 B 0 B
build/block-library/blocks/text-columns/editor-rtl.css 146 B 0 B
build/block-library/blocks/text-columns/editor.css 146 B 0 B
build/block-library/blocks/text-columns/style-rtl.css 209 B 0 B
build/block-library/blocks/text-columns/style.css 209 B 0 B
build/block-library/blocks/verse/editor-rtl.css 153 B 0 B
build/block-library/blocks/verse/editor.css 153 B 0 B
build/block-library/blocks/verse/style-rtl.css 117 B 0 B
build/block-library/blocks/verse/style.css 117 B 0 B
build/block-library/blocks/video/editor-rtl.css 547 B 0 B
build/block-library/blocks/video/editor.css 548 B 0 B
build/block-library/blocks/video/style-rtl.css 241 B 0 B
build/block-library/blocks/video/style.css 241 B 0 B
build/block-library/common-rtl.css 940 B 0 B
build/block-library/common.css 937 B 0 B
build/block-library/editor-rtl.css 9.07 kB 0 B
build/block-library/editor.css 9.07 kB 0 B
build/block-library/theme-rtl.css 789 B 0 B
build/block-library/theme.css 790 B 0 B
build/block-serialization-default-parser/index.js 1.88 kB 0 B
build/block-serialization-spec-parser/index.js 3.06 kB 0 B
build/blocks/index.js 48.1 kB 0 B
build/components/style-rtl.css 15.4 kB 0 B
build/components/style.css 15.4 kB 0 B
build/data-controls/index.js 827 B 0 B
build/data/index.js 8.98 kB 0 B
build/date/index.js 31.8 kB 0 B
build/deprecated/index.js 769 B 0 B
build/dom-ready/index.js 571 B 0 B
build/dom/index.js 4.95 kB 0 B
build/edit-navigation/style-rtl.css 881 B 0 B
build/edit-navigation/style.css 885 B 0 B
build/edit-post/index.js 306 kB 0 B
build/edit-site/index.js 24.5 kB 0 B
build/edit-site/style-rtl.css 3.91 kB 0 B
build/edit-site/style.css 3.91 kB 0 B
build/edit-widgets/style-rtl.css 3.1 kB 0 B
build/edit-widgets/style.css 3.1 kB 0 B
build/editor/editor-styles-rtl.css 476 B 0 B
build/editor/editor-styles.css 478 B 0 B
build/editor/index.js 43.3 kB 0 B
build/editor/style-rtl.css 3.84 kB 0 B
build/editor/style.css 3.84 kB 0 B
build/element/index.js 4.63 kB 0 B
build/escape-html/index.js 735 B 0 B
build/format-library/index.js 6.74 kB 0 B
build/format-library/style-rtl.css 547 B 0 B
build/format-library/style.css 548 B 0 B
build/hooks/index.js 2.27 kB 0 B
build/html-entities/index.js 623 B 0 B
build/i18n/index.js 3.57 kB 0 B
build/is-shallow-equal/index.js 697 B 0 B
build/keyboard-shortcuts/index.js 2.54 kB 0 B
build/keycodes/index.js 1.94 kB 0 B
build/list-reusable-blocks/index.js 3.1 kB 0 B
build/list-reusable-blocks/style-rtl.css 476 B 0 B
build/list-reusable-blocks/style.css 476 B 0 B
build/media-utils/index.js 5.32 kB 0 B
build/notices/index.js 1.85 kB 0 B
build/nux/index.js 3.42 kB 0 B
build/nux/style-rtl.css 671 B 0 B
build/nux/style.css 668 B 0 B
build/plugins/index.js 2.54 kB 0 B
build/primitives/index.js 1.43 kB 0 B
build/priority-queue/index.js 790 B 0 B
build/redux-routine/index.js 2.84 kB 0 B
build/reusable-blocks/index.js 2.92 kB 0 B
build/rich-text/index.js 13.4 kB 0 B
build/server-side-render/index.js 2.77 kB 0 B
build/shortcode/index.js 1.7 kB 0 B
build/token-list/index.js 1.27 kB 0 B
build/url/index.js 2.84 kB 0 B
build/viewport/index.js 1.86 kB 0 B
build/warning/index.js 1.14 kB 0 B
build/wordcount/index.js 1.22 kB 0 B

compressed-size-action

Copy link
Member

@mkaz mkaz left a comment

Choose a reason for hiding this comment

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

This worked fine for me, I didn't notice any visual differences or issues. Code-wise all the changes makes sense and improvements.

I don't have much opinions on the CSS, so can't offer much input if you are looking for more, otherwise feel free to merge once the conflict is resolved. 👍

@hypest
Copy link
Contributor

hypest commented Dec 14, 2020

Thanks for the native side commit Joen!

Has the variable been replaced with something else that we should start using on mobile? Reeling in @lukewalczak too that started using the block-spacing variable on native mobile.

@jasmussen
Copy link
Contributor Author

Has the variable been replaced with something else that we should start using on mobile? Reeling in @lukewalczak too that started using the block-spacing variable on native mobile.

Thank you for looking, thank you for the ping. To provide a proper answer, I have to go over the history for a bit.

In WordPress 5.4 and earlier, blocks used to have 1px gray borders all around them. These borders were outset 14px, meaning there had to be at least 28px margin between two blocks in order for these borders to not overlap when multiple blocks were selected. An additional 4px margin between those two blocks were added, so that the two gray borders wouldn't be flush against each other when multi selected. Those 4px were stored in the $block-spacing variable.

All these borders, paddings, and margins made the UI math pretty tricky, which is why the variables were stored in the global stylesheet — they were simply used across enough files that it was the right place to store them.

As of 5.5, the block UI was substantially reduced — instead of a gray outset border shown when the block is selected, a proper focus style is shown, which is painted on the exact footprint of the block, not outset. While we still have a default margin between blocks ($default-block-margin: 28px;), I would love to eventually retire that too. The goal of all this, ultimately, is to allow the theme stylesheet to handle all this — to embrace the WYSIWYG nature of what the block editor can be.

In other words, the $block-spacing variable no longer has a use for the web-interface, and is being cleaned up as vestigial.

I know that mobile native is a slightly different beast, with a longer path towards WYSIWYG. So if you have need of a variable to replace this one, it depends a bit on what it is to be used for. In context, I see this:

.outline {
	// Border Width has to be spread since width is thicker
	// on Android when border radius is decreased to 0
	border-left-width: $border-width;
	border-right-width: $border-width;
	border-top-width: $border-width;
	border-bottom-width: $border-width;
	position: absolute;
	left: -($block-spacing + $border-width);
	right: -($block-spacing + $border-width);
	top: -($block-spacing + $border-width);
	bottom: -($block-spacing + $border-width);
}

It doesn't look like the block spacing is being used to vertically space out the blocks here, so it looks like you need a variable that may be unique to mobile native. If it is to be used across multiple files, feel free to create a new one, there are a couple that are prefixed $mobile- close to the top of the sheet. If it's just meant to be used in one file, just keep the variable inline.

@jasmussen
Copy link
Contributor Author

Forgot to ask: would you mind if I merge this one, @hypest? Happy to address any comments you have.

@dratwas
Copy link
Contributor

dratwas commented Dec 14, 2020

Hey @jasmussen, thanks for that PR!

It doesn't look like the block spacing is being used to vertically space out the blocks here, so it looks like you need a variable that may be unique to mobile native.

You're totally right. I believe that this variable was used because the value of it fits to design requirements (which is kinda wrong usage)

I think that the grid variable ($grid-unit-10) should be used in the case of packages/block-library/src/file/style.native.scss

For the button, I would go with the local variable since it is specific to that block.

@jasmussen
Copy link
Contributor Author

Thank you @dratwas!

I do not have my local system set up to compile and test for mobile native. If you do, and have time/energy, feel free to push directly to this branch to make any changes. Otherwise, I can follow up with a PR, though I will be unable to test that PR and would need to trust you to review it. What works best?

@dratwas
Copy link
Contributor

dratwas commented Dec 14, 2020

Let me change the style in the file block to the grid variable and test it. I will approve this PR if everything works for me and will ask you for a merge :)

Thanks

Copy link
Contributor

@dratwas dratwas left a comment

Choose a reason for hiding this comment

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

Tested it on the mobile side and didn't notice any visual differences or issues.

Thank you @jasmussen for this!

@jasmussen
Copy link
Contributor Author

Excellent 👌

I'll merge when the checks pass. Thanks for testing!

@jasmussen
Copy link
Contributor Author

There's this instance of the variable also:

— do we keep that there for now?

@dratwas
Copy link
Contributor

dratwas commented Dec 14, 2020

Yes, as I mentioned For the button, I would go with the local variable since it is specific to that block. :)

@jasmussen
Copy link
Contributor Author

Cool, I'll land this!

@jasmussen jasmussen merged commit b8d9adc into master Dec 14, 2020
@jasmussen jasmussen deleted the try/variable-audit branch December 14, 2020 12:37
@github-actions github-actions bot added this to the Gutenberg 9.6 milestone Dec 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Type] Code Quality Issues or PRs that relate to code quality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants