<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[54688] branches/6.1/src: Editor: Correctly apply Button block styles for classic themes</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54688">54688</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54688","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>Bernhard Reiter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-25 13:43:49 +0000 (Tue, 25 Oct 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: Correctly apply Button block styles for classic themes
In <a href="https://core.trac.wordpress.org/changeset/54358">[54358]</a>, styling for Button blocks that had been removed from classic themes was reintroduced. However, it was added with a global scope, whereas editor styles are usually added with a `.editor-styles-wrapper` selector, which makes them more specific.
This change modifies the way that classic theme styles are added so that they also get wrapped in an `.editor-styles-wrapper` selector to match specificity.
Furthermore, adjust specificity for some Button block related styling in the editor for the Twenty Twelve and Twenty Twenty themes.
Merges [https://github.com/WordPress/gutenberg/pull/44731 Gutenberg PR 44731] into trunk.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/54358">[54358]</a>.
Props scruffian, cbravobernal, sabernhardt, audrasjb.
Merges <a href="https://core.trac.wordpress.org/changeset/54687">[54687]</a> to the 6.1 branch.
See <a href="https://core.trac.wordpress.org/ticket/56467">#56467</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches61srcwpcontentthemestwentytwelvecsseditorblockscss">branches/6.1/src/wp-content/themes/twentytwelve/css/editor-blocks.css</a></li>
<li><a href="#branches61srcwpcontentthemestwentytwentyassetscsseditorstyleblockrtlcss">branches/6.1/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css</a></li>
<li><a href="#branches61srcwpcontentthemestwentytwentyassetscsseditorstyleblockcss">branches/6.1/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css</a></li>
<li><a href="#branches61srcwpincludesdefaultfiltersphp">branches/6.1/src/wp-includes/default-filters.php</a></li>
<li><a href="#branches61srcwpincludesscriptloaderphp">branches/6.1/src/wp-includes/script-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches61srcwpincludescssclassicthemescss">branches/6.1/src/wp-includes/css/classic-themes.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches61srcwpcontentthemestwentytwelvecsseditorblockscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-content/themes/twentytwelve/css/editor-blocks.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-content/themes/twentytwelve/css/editor-blocks.css 2022-10-25 12:17:55 UTC (rev 54687)
+++ branches/6.1/src/wp-content/themes/twentytwelve/css/editor-blocks.css 2022-10-25 13:43:49 UTC (rev 54688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,6 +369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: -o-linear-gradient(top, #f4f4f4, #e6e6e6);
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: linear-gradient(to bottom, #f4f4f4, #e6e6e6);
</span><span class="cx" style="display: block; padding: 0 10px"> background-repeat: repeat-x;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ color: #7c7c7c;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Separator */
</span></span></pre></div>
<a id="branches61srcwpcontentthemestwentytwentyassetscsseditorstyleblockrtlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css 2022-10-25 12:17:55 UTC (rev 54687)
+++ branches/6.1/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css 2022-10-25 13:43:49 UTC (rev 54688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -920,8 +920,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Block: Button ----------------------------- */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.editor-styles-wrapper .wp-block-button__link,
-.editor-styles-wrapper .wp-block-file__button {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+:root .editor-styles-wrapper .wp-block-button__link,
+:root .editor-styles-wrapper .wp-block-file__button {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #cd2653;
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #fff;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,6 +937,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.editor-styles-wrapper .wp-block-button__link:hover,
+.editor-styles-wrapper .wp-block-file__button:hover {
+ text-decoration: underline;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* BUTTON STYLE: OUTLINE */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .editor-styles-wrapper .is-style-outline .wp-block-button__link,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1301,8 +1306,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* BLOCK: BUTTON */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .editor-styles-wrapper .wp-block-button__link,
- .editor-styles-wrapper .wp-block-file__button {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ :root .editor-styles-wrapper .wp-block-button__link,
+ :root .editor-styles-wrapper .wp-block-file__button {
</ins><span class="cx" style="display: block; padding: 0 10px"> font-size: 17px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches61srcwpcontentthemestwentytwentyassetscsseditorstyleblockcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css 2022-10-25 12:17:55 UTC (rev 54687)
+++ branches/6.1/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css 2022-10-25 13:43:49 UTC (rev 54688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -924,8 +924,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Block: Button ----------------------------- */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.editor-styles-wrapper .wp-block-button__link,
-.editor-styles-wrapper .wp-block-file__button {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+:root .editor-styles-wrapper .wp-block-button__link,
+:root .editor-styles-wrapper .wp-block-file__button {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #cd2653;
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #fff;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -941,6 +941,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.editor-styles-wrapper .wp-block-button__link:hover,
+.editor-styles-wrapper .wp-block-file__button:hover {
+ text-decoration: underline;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* BUTTON STYLE: OUTLINE */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .editor-styles-wrapper .is-style-outline .wp-block-button__link,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1305,8 +1310,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* BLOCK: BUTTON */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .editor-styles-wrapper .wp-block-button__link,
- .editor-styles-wrapper .wp-block-file__button {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ :root .editor-styles-wrapper .wp-block-button__link,
+ :root .editor-styles-wrapper .wp-block-file__button {
</ins><span class="cx" style="display: block; padding: 0 10px"> font-size: 17px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches61srcwpincludescssclassicthemescss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/6.1/src/wp-includes/css/classic-themes.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/css/classic-themes.css (rev 0)
+++ branches/6.1/src/wp-includes/css/classic-themes.css 2022-10-25 13:43:49 UTC (rev 54688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,18 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * These rules are needed for backwards compatibility.
+ * They should match the button element rules in the base theme.json file.
+ */
+.wp-block-button__link {
+ color: #ffffff;
+ background-color: #32373c;
+ border-radius: 9999px; /* 100% causes an oval, but any explicit but really high value retains the pill shape. */
+
+ /* This needs a low specificity so it won't override the rules from the button element if defined in theme.json. */
+ box-shadow: none;
+ text-decoration: none;
+
+ /* The extra 2px are added to size solids the same as the outline versions.*/
+ padding: calc(0.667em + 2px) calc(1.333em + 2px);
+
+ font-size: 1.125em;
+}
</ins></span></pre></div>
<a id="branches61srcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/default-filters.php 2022-10-25 12:17:55 UTC (rev 54687)
+++ branches/6.1/src/wp-includes/default-filters.php 2022-10-25 13:43:49 UTC (rev 54688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,7 +560,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', 'wp_enqueue_classic_theme_styles' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'admin_enqueue_scripts', 'wp_enqueue_classic_theme_styles' );
</del><span class="cx" style="display: block; padding: 0 10px"> add_action( 'enqueue_block_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'enqueue_block_assets', 'enqueue_block_styles_assets', 30 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'enqueue_block_editor_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,6 +571,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'customize_controls_print_styles', 'wp_resource_hints', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_head', 'wp_check_widget_editor_deps' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'block_editor_settings_all', 'wp_add_editor_classic_theme_styles' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Global styles can be enqueued in both the header and the footer. See https://core.trac.wordpress.org/ticket/53494.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles' );
</span></span></pre></div>
<a id="branches61srcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/script-loader.php 2022-10-25 12:17:55 UTC (rev 54687)
+++ branches/6.1/src/wp-includes/script-loader.php 2022-10-25 13:43:49 UTC (rev 54688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3658,7 +3658,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Loads classic theme styles on classic themes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Loads classic theme styles on classic themes in the frontend.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This is needed for backwards compatibility for button blocks specifically.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3665,9 +3665,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_enqueue_classic_theme_styles() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_is_block_theme() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $suffix = wp_scripts_get_suffix();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_register_style( 'classic-theme-styles', "/wp-includes/css/dist/block-library/classic$suffix.css", array(), true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_register_style( 'classic-theme-styles', '/' . WPINC . "/css/classic-themes$suffix.css", array(), true );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'classic-theme-styles' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Loads classic theme styles on classic themes in the editor.
+ *
+ * This is needed for backwards compatibility for button blocks specifically.
+ *
+ * @since 6.1.0
+ *
+ * @param array $editor_settings The array of editor settings.
+ * @return array A filtered array of editor settings.
+ */
+function wp_add_editor_classic_theme_styles( $editor_settings ) {
+ if ( WP_Theme_JSON_Resolver::theme_has_support() ) {
+ return $editor_settings;
+ }
+ $suffix = wp_scripts_get_suffix();
+ $classic_theme_styles = ABSPATH . WPINC . "/css/classic-themes$suffix.css";
+
+ // This follows the pattern of get_block_editor_theme_styles,
+ // but we can't use get_block_editor_theme_styles directly as it
+ // only handles external files or theme files.
+ $classic_theme_styles_settings = array(
+ 'css' => file_get_contents( $classic_theme_styles ),
+ '__unstableType' => 'core',
+ 'isGlobalStyles' => false,
+ );
+
+ // Add these settings to the start of the array so that themes can override them.
+ array_unshift( $editor_settings['styles'], $classic_theme_styles_settings );
+
+ return $editor_settings;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>