Skip to content

Commit 81d5f40

Browse files
committed
Editor: Reintroduce styles that were removed for classic themes.
After block CSS was merged with `theme.json` styles in [WordPress/gutenberg#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 [WordPress/gutenberg#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
1 parent c861d58 commit 81d5f40

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

src/wp-includes/default-filters.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,10 @@
557557

558558
add_action( 'wp_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
559559
add_action( 'wp_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
560+
add_action( 'wp_enqueue_scripts', 'wp_enqueue_classic_theme_styles' );
560561
add_action( 'admin_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
561562
add_action( 'admin_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
563+
add_action( 'admin_enqueue_scripts', 'wp_enqueue_classic_theme_styles' );
562564
add_action( 'enqueue_block_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
563565
add_action( 'enqueue_block_assets', 'enqueue_block_styles_assets', 30 );
564566
add_action( 'enqueue_block_editor_assets', 'wp_enqueue_registered_block_scripts_and_styles' );

src/wp-includes/script-loader.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3640,3 +3640,16 @@ function _wp_theme_json_webfonts_handler() {
36403640
add_action( 'wp_enqueue_scripts', $fn_generate_and_enqueue_styles );
36413641
add_action( 'admin_init', $fn_generate_and_enqueue_editor_styles );
36423642
}
3643+
3644+
/**
3645+
* Loads classic theme styles on classic themes.
3646+
*
3647+
* This is needed for backwards compatibility for button blocks specifically.
3648+
*/
3649+
function wp_enqueue_classic_theme_styles() {
3650+
if ( ! wp_is_block_theme() ) {
3651+
$suffix = wp_scripts_get_suffix();
3652+
wp_register_style( 'classic-theme-styles', "/wp-includes/css/dist/block-library/classic$suffix.css", array(), true );
3653+
wp_enqueue_style( 'classic-theme-styles' );
3654+
}
3655+
}

0 commit comments

Comments
 (0)