Changeset 56784

Timestamp:

10/04/2023 10:14:18 PM (14 months ago)

Author:

audrasjb

Message:

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.
Merges [56783] to the 6.3 branch.
Fixes #59086.

Location:

branches/6.3

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentytwenty/functions.php (modified) (2 diffs)
• src/wp-content/themes/twentytwenty/inc/custom-css.php (modified) (1 diff)

branches/6.3/src/wp-content/themes/twentytwenty/functions.php

@@ -412 +412 @@
  *
  * @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() {
@@ -430 +431 @@
         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' ), 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 );
+}
 
 /**

branches/6.3/src/wp-content/themes/twentytwenty/inc/custom-css.php

@@ -146 +146 @@
             // 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 );
             }