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

Jump to bottom

Allow reusable block top and bottom paddings to collapse. #21472

Merged
merged 1 commit into from Apr 10, 2020
Merged

Allow reusable block top and bottom paddings to collapse. #21472

merged 1 commit into from Apr 10, 2020

Conversation

jasmussen
Copy link
Contributor

@jasmussen jasmussen commented Apr 8, 2020

This is a followup and addition to #21312. It's separate because it's not a regression.

The code here (props @MichaelArestad ) allows the margins of the first and last blocks inside a reusable block container to collapse. The end is that reusable blocks do not suddenly get double top and bottom margins, which they do currently. Before:

Screenshot 2020-04-08 at 08 47 07

After:

Screenshot 2020-04-08 at 08 45 14

Note that this PR is an enhancement and not a regression fix. It also needs slightly more testing to verify the display property doesn't break an aspect of reusable blocks.

The horizontal padding you see in the above screenshots is fixed in #21312, which is a regression.

@jasmussen jasmussen self-assigned this Apr 8, 2020
@jasmussen jasmussen mentioned this pull request Apr 8, 2020
Merged
@github-actions
Copy link

@github-actions github-actions bot commented Apr 8, 2020 •
edited

Size Change: +6 B (0%)

Total Size: 903 kB

Filename Size Change
build/block-library/editor-rtl.css 7.22 kB +3 B (0%)
build/block-library/editor.css 7.22 kB +3 B (0%)
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.02 kB 0 B
build/annotations/index.js 3.62 kB 0 B
build/api-fetch/index.js 4.01 kB 0 B
build/autop/index.js 2.82 kB 0 B
build/blob/index.js 620 B 0 B
build/block-directory/index.js 6.24 kB 0 B
build/block-directory/style-rtl.css 760 B 0 B
build/block-directory/style.css 760 B 0 B
build/block-editor/index.js 104 kB 0 B
build/block-editor/style-rtl.css 10.2 kB 0 B
build/block-editor/style.css 10.2 kB 0 B
build/block-library/index.js 112 kB 0 B
build/block-library/style-rtl.css 7.15 kB 0 B
build/block-library/style.css 7.16 kB 0 B
build/block-library/theme-rtl.css 683 B 0 B
build/block-library/theme.css 685 B 0 B
build/block-serialization-default-parser/index.js 1.88 kB 0 B
build/block-serialization-spec-parser/index.js 3.1 kB 0 B
build/blocks/index.js 57.7 kB 0 B
build/components/index.js 198 kB 0 B
build/components/style-rtl.css 16.6 kB 0 B
build/components/style.css 16.5 kB 0 B
build/compose/index.js 6.66 kB 0 B
build/core-data/index.js 11.1 kB 0 B
build/data-controls/index.js 1.25 kB 0 B
build/data/index.js 8.43 kB 0 B
build/date/index.js 5.47 kB 0 B
build/deprecated/index.js 772 B 0 B
build/dom-ready/index.js 569 B 0 B
build/dom/index.js 3.1 kB 0 B
build/edit-navigation/index.js 3.1 kB 0 B
build/edit-navigation/style-rtl.css 279 B 0 B
build/edit-navigation/style.css 280 B 0 B
build/edit-post/index.js 93.5 kB 0 B
build/edit-post/style-rtl.css 12.3 kB 0 B
build/edit-post/style.css 12.3 kB 0 B
build/edit-site/index.js 10.4 kB 0 B
build/edit-site/style-rtl.css 5.02 kB 0 B
build/edit-site/style.css 5.02 kB 0 B
build/edit-widgets/index.js 7.53 kB 0 B
build/edit-widgets/style-rtl.css 3.74 kB 0 B
build/edit-widgets/style.css 3.73 kB 0 B
build/editor/editor-styles-rtl.css 428 B 0 B
build/editor/editor-styles.css 431 B 0 B
build/editor/index.js 43.6 kB 0 B
build/editor/style-rtl.css 3.49 kB 0 B
build/editor/style.css 3.49 kB 0 B
build/element/index.js 4.64 kB 0 B
build/escape-html/index.js 733 B 0 B
build/format-library/index.js 7.29 kB 0 B
build/format-library/style-rtl.css 502 B 0 B
build/format-library/style.css 502 B 0 B
build/hooks/index.js 2.13 kB 0 B
build/html-entities/index.js 622 B 0 B
build/i18n/index.js 3.56 kB 0 B
build/is-shallow-equal/index.js 711 B 0 B
build/keyboard-shortcuts/index.js 2.51 kB 0 B
build/keycodes/index.js 1.91 kB 0 B
build/list-reusable-blocks/index.js 3.12 kB 0 B
build/list-reusable-blocks/style-rtl.css 226 B 0 B
build/list-reusable-blocks/style.css 226 B 0 B
build/media-utils/index.js 5.28 kB 0 B
build/notices/index.js 1.79 kB 0 B
build/nux/index.js 3.4 kB 0 B
build/nux/style-rtl.css 616 B 0 B
build/nux/style.css 613 B 0 B
build/plugins/index.js 2.67 kB 0 B
build/primitives/index.js 1.5 kB 0 B
build/priority-queue/index.js 789 B 0 B
build/redux-routine/index.js 2.84 kB 0 B
build/rich-text/index.js 14.8 kB 0 B
build/server-side-render/index.js 2.67 kB 0 B
build/shortcode/index.js 1.7 kB 0 B
build/token-list/index.js 1.28 kB 0 B
build/url/index.js 4.01 kB 0 B
build/viewport/index.js 1.84 kB 0 B
build/warning/index.js 1.14 kB 0 B
build/wordcount/index.js 1.17 kB 0 B

compressed-size-action

@MichaelArestad MichaelArestad self-requested a review Apr 9, 2020
MichaelArestad
MichaelArestad approved these changes Apr 9, 2020
View changes
Copy link
Contributor

@MichaelArestad MichaelArestad left a comment

Works for me. Tested with several of the core blocks and some complicated stuff like nested columns.

@jasmussen
Copy link
Contributor Author

@jasmussen jasmussen commented Apr 9, 2020

Thanks. I'll rebase and merge when I have a chance, it's little code and easy to revert.

@jasmussen
Allow reusable block top and bottom paddings to collapse.
5b92d6a 
This is a followup and addition to #21312. It's separate because it's not a regression.
@jasmussen jasmussen force-pushed the try/reusable-block-vertical-padding branch from cdebbd8 to 5b92d6a Compare Apr 10, 2020
@jasmussen jasmussen merged commit e15c312 into master Apr 10, 2020
3 checks passed
@jasmussen jasmussen deleted the try/reusable-block-vertical-padding branch Apr 10, 2020
@github-actions github-actions bot added this to the Gutenberg 7.9 milestone Apr 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichaelArestad MichaelArestad

@ajitbohra ajitbohra

@jorgefilipecosta jorgefilipecosta

@Soean Soean

@talldan talldan

Assignees

@jasmussen jasmussen

Labels
[Type] Enhancement
Projects
None yet
Milestone
Gutenberg 7.9
Linked issues

Successfully merging this pull request may close these issues.

None yet
2 participants
@jasmussen @MichaelArestad