Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only load wp-editor-classic-layout-styles styles for themes without theme.json support #1290

Closed
wants to merge 5 commits into from
Closed

Only load wp-editor-classic-layout-styles styles for themes without theme.json support #1290

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69d7df3
Only load classic when theme has no theme.json
oandregal May 24, 2021
3bfbf43
Only load classic when theme has no theme.json (RTL)
oandregal May 24, 2021
d0444ba
Fix linting issues
oandregal May 24, 2021
2d448a0
Fix linting issues
oandregal May 24, 2021
590155b
Revert removal from rtl registration
oandregal May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/wp-includes/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down