From 81d5f405ffc28dc0b5c895d4df5145ac1458a2ff Mon Sep 17 00:00:00 2001 From: David Baumwald Date: Thu, 29 Sep 2022 18:53:57 +0000 Subject: [PATCH] Editor: Reintroduce styles that were removed for classic themes. After block CSS was merged with `theme.json` styles in [https://github.com/WordPress/gutenberg/pull/34180 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 [https://github.com/WordPress/gutenberg/pull/44334 Gutenberg PR #44334] into trunk. Follow-up to [54257]. Props scruffian, oandregal, ramonopoly, aristath, andrewserong, get_dave, bernhard-reiter. See #56467. git-svn-id: https://develop.svn.wordpress.org/trunk@54358 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/default-filters.php | 2 ++ src/wp-includes/script-loader.php | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php index 126d276417929..725f5ef3cbce5 100644 --- a/src/wp-includes/default-filters.php +++ b/src/wp-includes/default-filters.php @@ -557,8 +557,10 @@ 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 ); add_action( 'enqueue_block_editor_assets', 'wp_enqueue_registered_block_scripts_and_styles' ); diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 3bd0bbcaf2232..0c64281843888 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -3640,3 +3640,16 @@ function _wp_theme_json_webfonts_handler() { add_action( 'wp_enqueue_scripts', $fn_generate_and_enqueue_styles ); 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' ); + } +}