From 89da2ff3a918ac6f4759d5efa139bf78c6b73ff4 Mon Sep 17 00:00:00 2001 From: Jb Audras Date: Wed, 4 Oct 2023 20:54:34 +0000 Subject: [PATCH] Twenty Twenty: Fix style issues within iframed editor. This changeset: - Replaces `body` with `html` for the first CSS selector that makes text white against a dark background - Moves `twentytwenty_block_editor_styles()` from the `enqueue_block_editor_assets` action to `enqueue_block_assets` for WordPress 6.3 and later - Removes the obsolete `twentytwenty-block-editor-script` from the styles function to avoid an error in the iframe Props floydwilde, poena, huzaifaalmesbah, greenshady, sabernhardt, audrasjb, pooja1210, shailu25, joemcgill. Fixes #59086. git-svn-id: https://develop.svn.wordpress.org/trunk@56783 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-content/themes/twentytwenty/functions.php | 10 ++++++---- src/wp-content/themes/twentytwenty/inc/custom-css.php | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/wp-content/themes/twentytwenty/functions.php b/src/wp-content/themes/twentytwenty/functions.php index d05df26a2b..55cb7988c1 100644 --- a/src/wp-content/themes/twentytwenty/functions.php +++ b/src/wp-content/themes/twentytwenty/functions.php @@ -416,6 +416,7 @@ add_action( 'widgets_init', 'twentytwenty_sidebar_registration' ); * Enqueue supplemental block editor styles. * * @since Twenty Twenty 1.0 + * @since Twenty Twenty 2.4 Removed a script related to the obsolete Squared style of Button blocks. */ function twentytwenty_block_editor_styles() { @@ -434,12 +435,13 @@ function twentytwenty_block_editor_styles() { if ( $custom_css ) { wp_add_inline_style( 'twentytwenty-block-editor-styles', $custom_css ); } - - // Enqueue the editor script. - wp_enqueue_script( 'twentytwenty-block-editor-script', get_theme_file_uri( '/assets/js/editor-script-block.js' ), array( 'wp-blocks', 'wp-dom' ), wp_get_theme()->get( 'Version' ), array( 'in_footer' => true ) ); } -add_action( 'enqueue_block_editor_assets', 'twentytwenty_block_editor_styles', 1, 1 ); +if ( is_admin() && version_compare( $GLOBALS['wp_version'], '6.3', '>=' ) ) { + add_action( 'enqueue_block_assets', 'twentytwenty_block_editor_styles', 1, 1 ); +} else { + add_action( 'enqueue_block_editor_assets', 'twentytwenty_block_editor_styles', 1, 1 ); +} /** * Enqueue classic editor styles. diff --git a/src/wp-content/themes/twentytwenty/inc/custom-css.php b/src/wp-content/themes/twentytwenty/inc/custom-css.php index e551eb6abc..afc1449b60 100644 --- a/src/wp-content/themes/twentytwenty/inc/custom-css.php +++ b/src/wp-content/themes/twentytwenty/inc/custom-css.php @@ -144,7 +144,7 @@ if ( ! function_exists( 'twentytwenty_get_customizer_css' ) ) { // Text color. if ( $body && $body !== $body_default ) { - twentytwenty_generate_css( 'body .editor-styles-wrapper, .editor-post-title__block .editor-post-title__input, .editor-post-title__block .editor-post-title__input:focus', 'color', $body ); + twentytwenty_generate_css( 'html .editor-styles-wrapper, .editor-post-title__block .editor-post-title__input, .editor-post-title__block .editor-post-title__input:focus', 'color', $body ); } // Secondary color.