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

Cherry Pick PR's for WordPress 5.4 RC 2 #20743

Merged
merged 8 commits into from
Mar 10, 2020
Merged

Cherry Pick PR's for WordPress 5.4 RC 2 #20743

merged 8 commits into from
Mar 10, 2020

Conversation

jorgefilipecosta
Copy link
Member

@jorgefilipecosta jorgefilipecosta commented Mar 9, 2020 •
edited
Loading

Description

This PR cherry picks the following PR's into wp/trunk:

PR titleAuthor
Media & Text Block: Fix the "Crop image to fill entire column" option@WunderBart
Media & Text Block: Fix frontend styles when "Crop image to fill" is selected@jffng
Improve the Back to WP button in Fullscreen Mode@youknowriad
Try, fix inserter being hidden.@jasmussen
Block Editor: Use full labels for directional block movers@aduth
Fix: Custom color formatter may end up "bouncing"@jorgefilipecosta
[LatestPosts] Don't trim manual excerpts@draganescu
Update browserslist to fix out-of-date caniuse-lite messages@nerrad

The following PR's had conflicts:

These PR's will be part of WordPress 5.4 RC 2.

How has this been tested?

I did some smoke tests and verified the branch, in fact, contained the expected fixes.

WunderBart and others added 2 commits March 9, 2020 19:35
@WunderBart @jorgefilipecosta
Media & Text Block: Fix the "Crop image to fill entire column" option (…
876e32d 
…#20439)

* Use correct class name for media container element

* Rename media container class name for consistency
@jffng @jorgefilipecosta
Media & Text Block: Fix frontend styles when "Crop image to fill" is …
d8e0dd1 
…selected (#20539)

* Fix selectors for frontend styles of media text block w/ "Crop image to fill" option active

* Rename editor container class and remove redundant block styles
@aduth
Copy link
Member

aduth commented Mar 9, 2020

For the failing build, it might be necessary to cherry-pick this one as well: #20709

@jorgefilipecosta
Copy link
Member Author

Thank you @aduth, that PR was included.

@aduth
Copy link
Member

aduth commented Mar 9, 2020

I did a test run of cherry-picking 0e0e260 (#20664) onto wp/trunk to better understand what specific conflicts there are. After assessing those conflicts, I think the resolution proposed in this pull request is accurate 👍

@aduth
Copy link
Member

aduth commented Mar 9, 2020

Should the changes of fullscreen-mode-close/style.scss from here be expected to have been included?

https://github.com/WordPress/gutenberg/pull/20603/files#diff-dc73cdea1bb8cbe699286d82c89bf892

@jorgefilipecosta
Copy link
Member Author

Should the changes of fullscreen-mode-close/style.scss from here be expected to have been included?#20603 (files)

Hi @aduth, these changes applied a design to the button that looks good on g2 but not on trunk (as the button becomes different from all the other UI elements with a black background), so the changes on that file were not included.

aduth
aduth approved these changes Mar 9, 2020
View reviewed changes
Copy link
Member

@aduth aduth left a comment

Choose a reason for hiding this comment

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

As before, I'm most familiar with my own changes included here, but aside from the items I noted previously (which appear to be sorted), this looks in good shape 👍

mapk
mapk approved these changes Mar 9, 2020
View reviewed changes
Copy link
Contributor

@mapk mapk left a comment

Choose a reason for hiding this comment

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

I just tested the PR and it all worked as expected. 👍

I did discuss some UI changes for the "W" icon in the upper left corner. Those are being implemented by @jorgefilipecosta.

@jorgefilipecosta jorgefilipecosta force-pushed the wp/trunk-5-4-0-rc-2 branch 3 times, most recently from bfc33bb to cdd5733 Compare March 9, 2020 23:51
@jorgefilipecosta jorgefilipecosta merged commit 5609daa into wp/trunk Mar 10, 2020
@jorgefilipecosta jorgefilipecosta deleted the wp/trunk-5-4-0-rc-2 branch March 10, 2020 00:29
@jorgefilipecosta jorgefilipecosta mentioned this pull request Mar 10, 2020
Closed
@jasmussen
Copy link
Contributor

Thank you for this. I sense it was a tricky cherry-picking, so all the more thanks for taking care of it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aduth aduth aduth approved these changes

@mapk mapk mapk approved these changes

@ajitbohra ajitbohra Awaiting requested review from ajitbohra

@ellatrix ellatrix Awaiting requested review from ellatrix

@etoledom etoledom Awaiting requested review from etoledom

@nerrad nerrad Awaiting requested review from nerrad

@ntwb ntwb Awaiting requested review from ntwb

@SergioEstevao SergioEstevao Awaiting requested review from SergioEstevao

@Soean Soean Awaiting requested review from Soean

@talldan talldan Awaiting requested review from talldan

@youknowriad youknowriad Awaiting requested review from youknowriad

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@jorgefilipecosta @aduth @jasmussen @mapk @WunderBart @jffng @youknowriad @draganescu @nerrad