From 5f1cf9db57550dac8fd5a2789a578a1758124d7d Mon Sep 17 00:00:00 2001 From: Riad Benguella Date: Tue, 25 May 2021 07:39:30 +0000 Subject: [PATCH] Block Editor: Load the classic layout stylesheet conditionallty. Historically, the block editor has been opinionated about the size of the canvas and the alignments. Themes with theme.json will have to define a "layout" in their settings and the classic stylesheet won't be loaded anymore for this. Props nosolosw. See #53175. git-svn-id: https://develop.svn.wordpress.org/trunk@50992 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/script-loader.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 7630cf64e2..0f28ef4030 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -1510,12 +1510,13 @@ function wp_default_styles( $styles ) { 'wp-reset-editor-styles', 'wp-block-library', 'wp-reusable-blocks', - - // This dependency shouldn't be added for themes with theme.json support - // It's here for backward compatibility only. - // A check should be added here when theme.json is backported to Core. - 'wp-editor-classic-layout-styles', ); + + // Only load the default layout and margin styles for themes without theme.json file. + if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) { + $wp_edit_blocks_dependencies[] = 'wp-editor-classic-layout-styles'; + } + global $editor_styles; if ( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 ) { // Include opinionated block styles if no $editor_styles are declared, so the editor never appears broken.