Changeset 54358

Timestamp:

09/29/2022 06:53:57 PM (2 years ago)

Author:

davidbaumwald

Message:

Editor: Reintroduce styles that were removed for classic themes.

After block CSS was merged with theme.json styles in ​Gutenberg PR #34180, this removed some existing, default styling for some elements, including buttons. This change re-adds the removed styles by enqueueing classic.css for classic themes.

Merges ​Gutenberg PR #44334 into trunk.

Follow-up to [54257].

Props scruffian, oandregal, ramonopoly, aristath, andrewserong, get_dave, bernhard-reiter.
See #56467.

Location:

trunk/src/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/src/wp-includes/default-filters.php

@@ -558 +558 @@
 add_action( 'wp_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
 add_action( 'wp_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
+add_action( 'wp_enqueue_scripts', 'wp_enqueue_classic_theme_styles' );
 add_action( 'admin_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
 add_action( 'admin_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
+add_action( 'admin_enqueue_scripts', 'wp_enqueue_classic_theme_styles' );
 add_action( 'enqueue_block_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
 add_action( 'enqueue_block_assets', 'enqueue_block_styles_assets', 30 );

trunk/src/wp-includes/script-loader.php

@@ -3641 +3641 @@
     add_action( 'admin_init', $fn_generate_and_enqueue_editor_styles );
 }
+
+/**
+ * Loads classic theme styles on classic themes.
+ *
+ * This is needed for backwards compatibility for button blocks specifically.
+ */
+function wp_enqueue_classic_theme_styles() {
+    if ( ! wp_is_block_theme() ) {
+        $suffix = wp_scripts_get_suffix();
+        wp_register_style( 'classic-theme-styles', "/wp-includes/css/dist/block-library/classic$suffix.css", array(), true );
+        wp_enqueue_style( 'classic-theme-styles' );
+    }
+}