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

WordPress 5.4.1 Backports #21800

Merged
merged 7 commits into from
Apr 23, 2020
Merged

WordPress 5.4.1 Backports #21800

merged 7 commits into from
Apr 23, 2020

Conversation

whyisjake
Copy link
Member

@whyisjake whyisjake commented Apr 22, 2020

Description

Bringing in the following changes:

These tickets are form this label: Backport to WP Core

Including all of the vars, while we really only need one.
@whyisjake
Copy link
Member Author

@jorgefilipecosta this is ready to go. I had to add the grid system in that last commit.

@mcsf
Copy link
Contributor

mcsf commented Apr 23, 2020

@whyisjake, is there context behind adding commit a0d2c64?

@whyisjake
Copy link
Member Author

@mcsf the dependency was added with this commit: 0fa11e0

Part of #21376

@mcsf
Copy link
Contributor

mcsf commented Apr 23, 2020

Thanks, that makes sense. Edit: I've updated the PR description to reflect the role of a0d2c64

@mcsf
Copy link
Contributor

mcsf commented Apr 23, 2020

Looks good overall, but @youknowriad could you confirm for Fix keyboard block duplication (#21317)? I'm not sure about the testing instructions (cmd+shift+enter to duplicate?).

@youknowriad
Copy link
Contributor

I confirm duplication using the keyboard shortcut works in this PR, it was broken before (JS error)

@@ -1,7 +1,14 @@
.wp-block-buttons .wp-block-button {
display: inline-block;
margin: $grid-size-small;
margin-right: $grid-unit-10;
Copy link
Member

Choose a reason for hiding this comment

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

During previous cherry-picks (e.g: during 5.4 RC) we opted for not include the new grid system and just change the variable to their equivalents e.g: $grid-unit-10 would be $grid-size in the "old system". But in retrospective probably including the grid system from the start would have been a safer and easier choice, so I don't have anything against including the new grid variables (I regret not having done it sooner). cc: @youknowriad in case you think including the grid system may have an undesirable side effect in future cherry-picks.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's fine to include it, it's harmless

Copy link
Member

@jorgefilipecosta jorgefilipecosta left a comment

Choose a reason for hiding this comment

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

The changes look good in my tests 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants