From 3ececbf3e49ebb25b37294c4147c6119c1869e12 Mon Sep 17 00:00:00 2001 From: Daniel Richards Date: Thu, 25 Jul 2024 10:24:37 +0800 Subject: [PATCH 1/3] Fix block library and global styles stylesheet ordering when a block style variation is active --- lib/block-supports/block-style-variations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/block-supports/block-style-variations.php b/lib/block-supports/block-style-variations.php index d1a63915f12882..73e4f9fce25843 100644 --- a/lib/block-supports/block-style-variations.php +++ b/lib/block-supports/block-style-variations.php @@ -191,7 +191,7 @@ function gutenberg_render_block_style_variation_support_styles( $parsed_block ) return $parsed_block; } - wp_register_style( 'block-style-variation-styles', false, array( 'global-styles', 'wp-block-library' ) ); + wp_register_style( 'block-style-variation-styles', false, array( 'wp-block-library', 'global-styles' ) ); wp_add_inline_style( 'block-style-variation-styles', $variation_styles ); /* From 7664441267dbd526f3be3c4a0bf4b0a62c5dc3cd Mon Sep 17 00:00:00 2001 From: Daniel Richards Date: Thu, 25 Jul 2024 10:56:46 +0800 Subject: [PATCH 2/3] Add backport changeglog --- backport-changelog/6.6/7087.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 backport-changelog/6.6/7087.md diff --git a/backport-changelog/6.6/7087.md b/backport-changelog/6.6/7087.md new file mode 100644 index 00000000000000..0640482a5aa0a8 --- /dev/null +++ b/backport-changelog/6.6/7087.md @@ -0,0 +1,4 @@ +https://github.com/WordPress/wordpress-develop/pull/7087 + +* https://github.com/WordPress/gutenberg/pull/63918 + From 085b5abb64d9c034232fef294cf2337fbf1350c6 Mon Sep 17 00:00:00 2001 From: Daniel Richards Date: Thu, 25 Jul 2024 11:38:40 +0800 Subject: [PATCH 3/3] Update core backport --- backport-changelog/6.6/7087.md | 4 ---- backport-changelog/6.6/7088.md | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 backport-changelog/6.6/7087.md create mode 100644 backport-changelog/6.6/7088.md diff --git a/backport-changelog/6.6/7087.md b/backport-changelog/6.6/7087.md deleted file mode 100644 index 0640482a5aa0a8..00000000000000 --- a/backport-changelog/6.6/7087.md +++ /dev/null @@ -1,4 +0,0 @@ -https://github.com/WordPress/wordpress-develop/pull/7087 - -* https://github.com/WordPress/gutenberg/pull/63918 - diff --git a/backport-changelog/6.6/7088.md b/backport-changelog/6.6/7088.md new file mode 100644 index 00000000000000..46bd1147464846 --- /dev/null +++ b/backport-changelog/6.6/7088.md @@ -0,0 +1,4 @@ +https://github.com/WordPress/wordpress-develop/pull/7088 + +* https://github.com/WordPress/gutenberg/pull/63918 +