Skip to content

Backport spacing presets - #3255

Closed
glendaviesnz wants to merge 18 commits into
WordPress:trunkfrom
glendaviesnz:backport/spacing-presets
Closed

Backport spacing presets #3255
glendaviesnz wants to merge 18 commits into
WordPress:trunkfrom
glendaviesnz:backport/spacing-presets

Conversation

@glendaviesnz

@glendaviesnzglendaviesnz commented Sep 15, 2022•
edited by ockham
Loading

Copy link
Copy Markdown

❗ BLOCKED by #3204Edit: #3204 has been merged.

Trac ticket: https://core.trac.wordpress.org/ticket/56467

@glendaviesnz
glendaviesnz marked this pull request as ready for review September 15, 2022 02:26
andrewserong
andrewserong reviewed Sep 15, 2022
View reviewed changes
Comment threadtests/phpunit/tests/theme/wpThemeJson.php
@andrewserongandrewserong mentioned this pull request Sep 15, 2022
Closed
37 tasks
costdev
costdev requested changes Sep 15, 2022
View reviewed changes

@costdevcostdev left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for handling this PR @glendaviesnz! I've left some thoughts below.

Comment threadsrc/wp-includes/class-wp-theme-json.php Outdated
Comment threadsrc/wp-includes/class-wp-theme-json.php Outdated
Comment threadsrc/wp-includes/class-wp-theme-json.php Outdated
Comment threadsrc/wp-includes/class-wp-theme-json.php Outdated
Comment threadsrc/wp-includes/class-wp-theme-json.php Outdated
Comment threadtests/phpunit/tests/theme/wpThemeJson.php Outdated
Comment threadtests/phpunit/tests/theme/wpThemeJson.php Outdated
Comment threadtests/phpunit/tests/theme/wpThemeJson.php Outdated
Comment threadtests/phpunit/tests/theme/wpThemeJson.php Outdated
Comment threadtests/phpunit/tests/theme/wpThemeJson.php Outdated
@costdevcostdev mentioned this pull request Sep 15, 2022
Closed
2 tasks
costdev
costdev reviewed Sep 16, 2022
View reviewed changes
Comment threadsrc/wp-includes/class-wp-theme-json.php
Comment threadtests/phpunit/tests/theme/wpThemeJson.php Outdated
Comment threadtests/phpunit/tests/theme/wpThemeJson.php Outdated
Comment threadtests/phpunit/tests/theme/wpThemeJson.php Outdated
costdev
costdev requested changes Sep 16, 2022
View reviewed changes

@costdevcostdev left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the updates @glendaviesnz! A few more thoughts and a comment on the spacingScale discussion from my last review.

@glendaviesnz

glendaviesnz commented Sep 19, 2022•
edited
Loading

Copy link
Copy Markdown
Author

@costdev fyi there is now some discussion going about whether the t-shirt size style labels will be dropped for 6.1, so need to wait for a decision on that and will then update this PR accordingly.

@costdev

costdev commented Sep 19, 2022

Copy link
Copy Markdown
Contributor

Thanks for the update @glendaviesnz!

@glendaviesnz

glendaviesnz commented Sep 19, 2022

Copy link
Copy Markdown
Author

spacingScale in this context is the name of the test method's argument rather than the method being tested, which should match $spacing_scale in the test method's signature.

🤦 so it is, doh! fixed.

costdev
costdev reviewed Sep 20, 2022
View reviewed changes
Comment threadsrc/wp-includes/class-wp-theme-json.php Outdated
@glendaviesnzglendaviesnz mentioned this pull request Sep 20, 2022
Merged
@glendaviesnz

glendaviesnz commented Sep 20, 2022

Copy link
Copy Markdown
Author

I think this should be good to merge, pending @costdev double checking the switch to (string) casting

costdev
costdev approved these changes Sep 20, 2022
View reviewed changes

@costdevcostdev left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM 👍 Thanks @glendaviesnz

mukeshpanchal27
mukeshpanchal27 reviewed Sep 21, 2022
View reviewed changes

@mukeshpanchal27mukeshpanchal27 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. left minor document change.

Comment threadsrc/wp-includes/class-wp-theme-json.php Outdated
@audrasjb@mukeshpanchal27
small return mention improvement
b0b1d6d
Co-authored-by: Mukesh Panchal <mukeshpanchal27@users.noreply.github.com>
@audrasjbaudrasjb self-assigned this Sep 21, 2022
@audrasjb

audrasjb commented Sep 21, 2022

Copy link
Copy Markdown
Contributor

Committed in https://core.trac.wordpress.org/changeset/54272

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

Reviewers

@andrewserongandrewserongandrewserong left review comments
@costdevcostdevcostdev approved these changes
+1 more reviewer
@mukeshpanchal27mukeshpanchal27mukeshpanchal27 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@audrasjbaudrasjb

Labels

None yet

Projects

No open projects
WordPress 6.1 Editor Tasks
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@glendaviesnz@costdev@audrasjb@mukeshpanchal27@andrewserong