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

Navigation Link: Don't remove 'block_core_navigation_link_build_css_colors' #49064

Merged
merged 1 commit into from
Mar 14, 2023
Merged

Navigation Link: Don't remove 'block_core_navigation_link_build_css_colors' #49064

merged 1 commit into from
Mar 14, 2023

Conversation

Mamaduka
Copy link
Member

@Mamaduka Mamaduka commented Mar 14, 2023 •
edited
Loading

What?

This a follow-up to #48927

PR reverts the removal of block_core_navigation_link_build_css_colors and only applies $style_attribute fix from #48927.

The block_core_navigation_link_build_css_colors needs to be deprecated in the next major version.

Why?

See #48927 (comment).

Testing Instructions

  1. Add a navigation block with several links inside it
  2. Add some submenus too
  3. Customize the colors of the block and the submenu
  4. Check that the block colors are applied to the top level items and the submenu colors are applied to items in the submenu,

@Mamaduka Mamaduka self-assigned this Mar 14, 2023
@Mamaduka Mamaduka added Backport to WP 6.7 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta [Block] Navigation Link Affects the Navigation Link Block labels Mar 14, 2023
@Mamaduka Mamaduka mentioned this pull request Mar 14, 2023
Merged
Mamaduka
Mamaduka commented Mar 14, 2023
View reviewed changes
packages/block-library/src/navigation-link/index.php
@@ -107,7 +177,7 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {
$classes = array_merge(
$font_sizes['css_classes']
);
$style_attribute = ( $font_sizes['inline_styles'] );
$style_attribute = $font_sizes['inline_styles'];
Copy link
Member Author

@Mamaduka Mamaduka Mar 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This is the actual fix from the previous PR; I also remove unnecessary parentheses.

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree the parentheses are not needed. Removing them has no effort on how the code processes, meaning the results are the same https://3v4l.org/aRQl4.

hellofromtonya
hellofromtonya approved these changes Mar 14, 2023
View reviewed changes
Copy link
Contributor

@hellofromtonya hellofromtonya left a comment

Choose a reason for hiding this comment

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

LGTM 👍 Thank you @Mamaduka!

@Mamaduka Mamaduka merged commit 979afc8 into trunk Mar 14, 2023
@Mamaduka Mamaduka deleted the fix/navigation-link-keep-colors-function branch March 14, 2023 14:22
@github-actions github-actions bot added this to the Gutenberg 15.4 milestone Mar 14, 2023
Mamaduka added a commit that referenced this pull request Mar 14, 2023
@Mamaduka
Navigation Link: Don't remove 'block_core_navigation_link_build_css_c…
9d3071a 
…olors' (#49064)
@Mamaduka Mamaduka mentioned this pull request Mar 14, 2023
Closed
markjaquith pushed a commit to markjaquith/WordPress that referenced this pull request Mar 14, 2023
@hellofromtonya
Editor: Update @WordPress packages for 6.2 RC2.
48deabc 
Updates the `@wordpress` packages to include the following changes:

- [Regression] Don't offer Classic block as a recovery action when not registered [WordPress/gutenberg#49051 Gutenberg PR 49051] ✅ 
- [i18n Change] Fix typo in the media-categories component [WordPress/gutenberg#49047 Gutenberg PR 49047] ✅
- Hide navigation screen in site editor [WordPress/gutenberg#49043 Gutenberg PR 49043] ✅ 
 [https://make.wordpress.org/core/2023/03/14/fyi-navigation-section-of-new-site-editor-experienced-removed-for-6-2-rc-2/ Feature is not ready for 6.2]
- [i18n Change] Site editor: Fix non-us spelling in sidebar [WordPress/gutenberg#48976 Gutenberg PR 48976] ✅ See Trac #57895.
- [Regression] Site Editor: Fix lingering insertion point within template parts [WordPress/gutenberg#48913 Gutenberg PR 48913] ✅ > Regression introduced in 6.2 cycle.
- Navigation Link: Remove color generation code [WordPress/gutenberg#48927 Gutenberg PR 48927] and [WordPress/gutenberg#49064 Gutenberg PR 49064] ✅
- Fix settings tab active state border in block inspector [WordPress/gutenberg#48945 Gutenberg PR 48945] ✅
- Fix text alignment in the Site Editor sidebar  [WordPress/gutenberg#48959 Gutenberg PR 48959] ✅ Making template descriptions more prominent is part of 6.2.

References:
* [WordPress/gutenberg@f22a3cb Packages x.3.9 publish commit]
* [WordPress/gutenberg@356298f Packages x.3.10 publish commit]

Follow-up to [55496].

Props mamaduka, tobifjellner, davidbaumwald, costdev, audrasjb, hellofromTonya.
See #57471.
Fixes #57895.
Built from https://develop.svn.wordpress.org/trunk@55542


git-svn-id: http://core.svn.wordpress.org/trunk@55054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
github-actions bot pushed a commit to platformsh/wordpress-performance that referenced this pull request Mar 14, 2023
@hellofromtonya
Editor: Update @WordPress packages for 6.2 RC2.
f71da79 
Updates the `@wordpress` packages to include the following changes:

- [Regression] Don't offer Classic block as a recovery action when not registered [WordPress/gutenberg#49051 Gutenberg PR 49051] ✅ 
- [i18n Change] Fix typo in the media-categories component [WordPress/gutenberg#49047 Gutenberg PR 49047] ✅
- Hide navigation screen in site editor [WordPress/gutenberg#49043 Gutenberg PR 49043] ✅ 
 [https://make.wordpress.org/core/2023/03/14/fyi-navigation-section-of-new-site-editor-experienced-removed-for-6-2-rc-2/ Feature is not ready for 6.2]
- [i18n Change] Site editor: Fix non-us spelling in sidebar [WordPress/gutenberg#48976 Gutenberg PR 48976] ✅ See Trac #57895.
- [Regression] Site Editor: Fix lingering insertion point within template parts [WordPress/gutenberg#48913 Gutenberg PR 48913] ✅ > Regression introduced in 6.2 cycle.
- Navigation Link: Remove color generation code [WordPress/gutenberg#48927 Gutenberg PR 48927] and [WordPress/gutenberg#49064 Gutenberg PR 49064] ✅
- Fix settings tab active state border in block inspector [WordPress/gutenberg#48945 Gutenberg PR 48945] ✅
- Fix text alignment in the Site Editor sidebar  [WordPress/gutenberg#48959 Gutenberg PR 48959] ✅ Making template descriptions more prominent is part of 6.2.

References:
* [WordPress/gutenberg@f22a3cb Packages x.3.9 publish commit]
* [WordPress/gutenberg@356298f Packages x.3.10 publish commit]

Follow-up to [55496].

Props mamaduka, tobifjellner, davidbaumwald, costdev, audrasjb, hellofromTonya.
See #57471.
Fixes #57895.
Built from https://develop.svn.wordpress.org/trunk@55542


git-svn-id: https://core.svn.wordpress.org/trunk@55054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
pento pushed a commit to WordPress/wordpress-develop that referenced this pull request Mar 14, 2023
@hellofromtonya
Editor: Update @WordPress packages for 6.2 RC2.
a71a9bc 
Updates the `@wordpress` packages to include the following changes:

- [Regression] Don't offer Classic block as a recovery action when not registered [WordPress/gutenberg#49051 Gutenberg PR 49051] ✅ 
- [i18n Change] Fix typo in the media-categories component [WordPress/gutenberg#49047 Gutenberg PR 49047] ✅
- Hide navigation screen in site editor [WordPress/gutenberg#49043 Gutenberg PR 49043] ✅ 
 [https://make.wordpress.org/core/2023/03/14/fyi-navigation-section-of-new-site-editor-experienced-removed-for-6-2-rc-2/ Feature is not ready for 6.2]
- [i18n Change] Site editor: Fix non-us spelling in sidebar [WordPress/gutenberg#48976 Gutenberg PR 48976] ✅ See Trac #57895.
- [Regression] Site Editor: Fix lingering insertion point within template parts [WordPress/gutenberg#48913 Gutenberg PR 48913] ✅ > Regression introduced in 6.2 cycle.
- Navigation Link: Remove color generation code [WordPress/gutenberg#48927 Gutenberg PR 48927] and [WordPress/gutenberg#49064 Gutenberg PR 49064] ✅
- Fix settings tab active state border in block inspector [WordPress/gutenberg#48945 Gutenberg PR 48945] ✅
- Fix text alignment in the Site Editor sidebar  [WordPress/gutenberg#48959 Gutenberg PR 48959] ✅ Making template descriptions more prominent is part of 6.2.

References:
* [WordPress/gutenberg@f22a3cb Packages x.3.9 publish commit]
* [WordPress/gutenberg@356298f Packages x.3.10 publish commit]

Follow-up to [55496].

Props mamaduka, tobifjellner, davidbaumwald, costdev, audrasjb, hellofromTonya.
Reviewed by SergeyBiryukov.
Merges [55542] to the 6.2 branch.
See #57471.
Fixes #57895.

git-svn-id: https://develop.svn.wordpress.org/branches/6.2@55548 602fd350-edb4-49c9-b593-d223f7449a82
markjaquith pushed a commit to markjaquith/WordPress that referenced this pull request Mar 14, 2023
@hellofromtonya
Editor: Update @WordPress packages for 6.2 RC2.
7592613 
Updates the `@wordpress` packages to include the following changes:

- [Regression] Don't offer Classic block as a recovery action when not registered [WordPress/gutenberg#49051 Gutenberg PR 49051] ✅ 
- [i18n Change] Fix typo in the media-categories component [WordPress/gutenberg#49047 Gutenberg PR 49047] ✅
- Hide navigation screen in site editor [WordPress/gutenberg#49043 Gutenberg PR 49043] ✅ 
 [https://make.wordpress.org/core/2023/03/14/fyi-navigation-section-of-new-site-editor-experienced-removed-for-6-2-rc-2/ Feature is not ready for 6.2]
- [i18n Change] Site editor: Fix non-us spelling in sidebar [WordPress/gutenberg#48976 Gutenberg PR 48976] ✅ See Trac #57895.
- [Regression] Site Editor: Fix lingering insertion point within template parts [WordPress/gutenberg#48913 Gutenberg PR 48913] ✅ > Regression introduced in 6.2 cycle.
- Navigation Link: Remove color generation code [WordPress/gutenberg#48927 Gutenberg PR 48927] and [WordPress/gutenberg#49064 Gutenberg PR 49064] ✅
- Fix settings tab active state border in block inspector [WordPress/gutenberg#48945 Gutenberg PR 48945] ✅
- Fix text alignment in the Site Editor sidebar  [WordPress/gutenberg#48959 Gutenberg PR 48959] ✅ Making template descriptions more prominent is part of 6.2.

References:
* [WordPress/gutenberg@f22a3cb Packages x.3.9 publish commit]
* [WordPress/gutenberg@356298f Packages x.3.10 publish commit]

Follow-up to [55496].

Props mamaduka, tobifjellner, davidbaumwald, costdev, audrasjb, hellofromTonya.
Reviewed by SergeyBiryukov.
Merges [55542] to the 6.2 branch.
See #57471.
Fixes #57895.
Built from https://develop.svn.wordpress.org/branches/6.2@55548


git-svn-id: http://core.svn.wordpress.org/branches/6.2@55060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
@Mamaduka Mamaduka removed the Backport to WP 6.7 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta label Mar 16, 2023
@manooweb manooweb mentioned this pull request Jul 3, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hellofromtonya hellofromtonya hellofromtonya approved these changes

@tellthemachines tellthemachines Awaiting requested review from tellthemachines

@MaggieCabrera MaggieCabrera Awaiting requested review from MaggieCabrera

@scruffian scruffian Awaiting requested review from scruffian

Assignees

@Mamaduka Mamaduka

Labels
[Block] Navigation Link Affects the Navigation Link Block
Projects
None yet
Milestone
Gutenberg 15.4
Development

Successfully merging this pull request may close these issues.
2 participants
@Mamaduka @hellofromtonya