%2$s
@@ -545,7 +555,8 @@ function render_block_core_navigation( $attributes, $content, $block ) {
__( 'Close menu' ), // Close button label.
implode( ' ', $responsive_container_classes ),
implode( ' ', $open_button_classes ),
- $colors['overlay_inline_styles']
+ $colors['overlay_inline_styles'],
+ __( 'Menu' )
);
return sprintf(
diff --git a/src/wp-includes/blocks/navigation/block.json b/src/wp-includes/blocks/navigation/block.json
index 6b7dd32a05..880b592019 100644
--- a/src/wp-includes/blocks/navigation/block.json
+++ b/src/wp-includes/blocks/navigation/block.json
@@ -114,8 +114,7 @@
"allowSwitching": false,
"allowInheriting": false,
"default": {
- "type": "flex",
- "setCascadingProperties": true
+ "type": "flex"
}
}
},
diff --git a/src/wp-includes/blocks/navigation/view.asset.php b/src/wp-includes/blocks/navigation/view.asset.php
index 1b31b2df38..d8cd244005 100644
--- a/src/wp-includes/blocks/navigation/view.asset.php
+++ b/src/wp-includes/blocks/navigation/view.asset.php
@@ -1 +1 @@
- array(), 'version' => '34d9f07c7910e83c264c6c4406619c5e');
\ No newline at end of file
+ array(), 'version' => 'aab949d40a5a929e8c972550b42730a8');
\ No newline at end of file
diff --git a/src/wp-includes/blocks/navigation/view.min.asset.php b/src/wp-includes/blocks/navigation/view.min.asset.php
index 1e502a5b77..d69fd5b72f 100644
--- a/src/wp-includes/blocks/navigation/view.min.asset.php
+++ b/src/wp-includes/blocks/navigation/view.min.asset.php
@@ -1 +1 @@
- array(), 'version' => 'd5ab04a497b4f1465f1f0060b6b71ae3');
\ No newline at end of file
+ array(), 'version' => 'fb15026c86328593809ad0e2e073f64f');
\ No newline at end of file
diff --git a/src/wp-includes/blocks/page-list.php b/src/wp-includes/blocks/page-list.php
index 0d5728c994..9593174d9b 100644
--- a/src/wp-includes/blocks/page-list.php
+++ b/src/wp-includes/blocks/page-list.php
@@ -119,7 +119,7 @@ function block_core_page_list_build_css_font_sizes( $context ) {
$font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $context['fontSize'] );
} elseif ( $has_custom_font_size ) {
// Add the custom font size inline style.
- $font_sizes['inline_styles'] = sprintf( 'font-size: %spx;', $context['style']['typography']['fontSize'] );
+ $font_sizes['inline_styles'] = sprintf( 'font-size: %s;', $context['style']['typography']['fontSize'] );
}
return $font_sizes;
diff --git a/src/wp-includes/blocks/site-logo.php b/src/wp-includes/blocks/site-logo.php
index c227781eec..52cfbe161b 100644
--- a/src/wp-includes/blocks/site-logo.php
+++ b/src/wp-includes/blocks/site-logo.php
@@ -48,10 +48,6 @@ function render_block_core_site_logo( $attributes ) {
$classnames[] = $attributes['className'];
}
- if ( ! empty( $attributes['align'] ) && in_array( $attributes['align'], array( 'center', 'left', 'right' ), true ) ) {
- $classnames[] = "align{$attributes['align']}";
- }
-
if ( empty( $attributes['width'] ) ) {
$classnames[] = 'is-default-size';
}
diff --git a/src/wp-includes/blocks/site-logo/block.json b/src/wp-includes/blocks/site-logo/block.json
index e603c6149a..dfa66bddcd 100644
--- a/src/wp-includes/blocks/site-logo/block.json
+++ b/src/wp-includes/blocks/site-logo/block.json
@@ -6,9 +6,6 @@
"description": "Display a graphic to represent this site. Update the block, and the changes apply everywhere it’s used. This is different than the site icon, which is the smaller image visible in your dashboard, browser tabs, etc used to help others recognize this site.",
"textdomain": "default",
"attributes": {
- "align": {
- "type": "string"
- },
"width": {
"type": "number"
},
diff --git a/src/wp-includes/blocks/site-logo/editor-rtl.css b/src/wp-includes/blocks/site-logo/editor-rtl.css
index 28c93091ba..5046b5ca0f 100644
--- a/src/wp-includes/blocks/site-logo/editor-rtl.css
+++ b/src/wp-includes/blocks/site-logo/editor-rtl.css
@@ -75,24 +75,14 @@
* Reset the WP Admin page styles for Gutenberg-like pages.
*/
.wp-block[data-align=center] > .wp-block-site-logo {
+ display: table;
margin-right: auto;
margin-left: auto;
- text-align: center;
}
.wp-block-site-logo a {
pointer-events: none;
}
-.wp-block-site-logo:not(.is-default-size) {
- display: table;
-}
-.wp-block-site-logo.is-default-size {
- width: 120px;
-}
-.wp-block-site-logo.is-default-size img {
- height: auto;
- width: 100%;
-}
.wp-block-site-logo .custom-logo-link {
cursor: inherit;
}
diff --git a/src/wp-includes/blocks/site-logo/editor-rtl.min.css b/src/wp-includes/blocks/site-logo/editor-rtl.min.css
index 533e9320cc..6911b907ac 100644
--- a/src/wp-includes/blocks/site-logo/editor-rtl.min.css
+++ b/src/wp-includes/blocks/site-logo/editor-rtl.min.css
@@ -1 +1 @@
-.wp-block[data-align=center]>.wp-block-site-logo{margin-right:auto;margin-left:auto;text-align:center}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo:not(.is-default-size){display:table}.wp-block-site-logo.is-default-size{width:120px}.wp-block-site-logo.is-default-size img{height:auto;width:100%}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;height:auto;max-width:100%}.wp-block-site-logo.wp-block-site-logo .components-placeholder,.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container{border-radius:inherit}.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder{height:120px;width:120px}.wp-block-site-logo.wp-block-site-logo .components-placeholder{justify-content:center;align-items:center;box-shadow:none;padding:0;min-height:48px;min-width:48px;height:100%;width:100%;color:currentColor;background:transparent}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;left:4px;bottom:4px;right:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder:before{content:"";display:block;position:absolute;top:0;left:0;bottom:0;right:0;border:1px dashed;opacity:.4;pointer-events:none;border-radius:inherit}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset{width:auto}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{color:inherit;padding:0;display:flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:50%;position:relative;visibility:hidden;background:transparent;transition:all .1s linear}@media (prefers-reduced-motion:reduce){.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{transition-duration:0s;transition-delay:0s}}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button>svg{color:#fff}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration{position:absolute;top:0;left:0;bottom:0;right:0;width:100%;height:100%;stroke:currentColor;stroke-dasharray:3;opacity:.4}.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button{background:var(--wp-admin-theme-color);border-color:var(--wp-admin-theme-color);border-style:solid;color:#fff;opacity:1;visibility:visible}
\ No newline at end of file
+.wp-block[data-align=center]>.wp-block-site-logo{display:table;margin-right:auto;margin-left:auto}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;height:auto;max-width:100%}.wp-block-site-logo.wp-block-site-logo .components-placeholder,.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container{border-radius:inherit}.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder{height:120px;width:120px}.wp-block-site-logo.wp-block-site-logo .components-placeholder{justify-content:center;align-items:center;box-shadow:none;padding:0;min-height:48px;min-width:48px;height:100%;width:100%;color:currentColor;background:transparent}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;left:4px;bottom:4px;right:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder:before{content:"";display:block;position:absolute;top:0;left:0;bottom:0;right:0;border:1px dashed;opacity:.4;pointer-events:none;border-radius:inherit}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset{width:auto}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{color:inherit;padding:0;display:flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:50%;position:relative;visibility:hidden;background:transparent;transition:all .1s linear}@media (prefers-reduced-motion:reduce){.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{transition-duration:0s;transition-delay:0s}}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button>svg{color:#fff}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration{position:absolute;top:0;left:0;bottom:0;right:0;width:100%;height:100%;stroke:currentColor;stroke-dasharray:3;opacity:.4}.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button{background:var(--wp-admin-theme-color);border-color:var(--wp-admin-theme-color);border-style:solid;color:#fff;opacity:1;visibility:visible}
\ No newline at end of file
diff --git a/src/wp-includes/blocks/site-logo/editor.css b/src/wp-includes/blocks/site-logo/editor.css
index 95aae48ae3..395e7e09dc 100644
--- a/src/wp-includes/blocks/site-logo/editor.css
+++ b/src/wp-includes/blocks/site-logo/editor.css
@@ -75,24 +75,14 @@
* Reset the WP Admin page styles for Gutenberg-like pages.
*/
.wp-block[data-align=center] > .wp-block-site-logo {
+ display: table;
margin-left: auto;
margin-right: auto;
- text-align: center;
}
.wp-block-site-logo a {
pointer-events: none;
}
-.wp-block-site-logo:not(.is-default-size) {
- display: table;
-}
-.wp-block-site-logo.is-default-size {
- width: 120px;
-}
-.wp-block-site-logo.is-default-size img {
- height: auto;
- width: 100%;
-}
.wp-block-site-logo .custom-logo-link {
cursor: inherit;
}
diff --git a/src/wp-includes/blocks/site-logo/editor.min.css b/src/wp-includes/blocks/site-logo/editor.min.css
index faf1d1f84f..e99bcc60e1 100644
--- a/src/wp-includes/blocks/site-logo/editor.min.css
+++ b/src/wp-includes/blocks/site-logo/editor.min.css
@@ -1 +1 @@
-.wp-block[data-align=center]>.wp-block-site-logo{margin-left:auto;margin-right:auto;text-align:center}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo:not(.is-default-size){display:table}.wp-block-site-logo.is-default-size{width:120px}.wp-block-site-logo.is-default-size img{height:auto;width:100%}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;height:auto;max-width:100%}.wp-block-site-logo.wp-block-site-logo .components-placeholder,.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container{border-radius:inherit}.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder{height:120px;width:120px}.wp-block-site-logo.wp-block-site-logo .components-placeholder{justify-content:center;align-items:center;box-shadow:none;padding:0;min-height:48px;min-width:48px;height:100%;width:100%;color:currentColor;background:transparent}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;right:4px;bottom:4px;left:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder:before{content:"";display:block;position:absolute;top:0;right:0;bottom:0;left:0;border:1px dashed;opacity:.4;pointer-events:none;border-radius:inherit}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset{width:auto}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{color:inherit;padding:0;display:flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:50%;position:relative;visibility:hidden;background:transparent;transition:all .1s linear}@media (prefers-reduced-motion:reduce){.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{transition-duration:0s;transition-delay:0s}}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button>svg{color:#fff}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration{position:absolute;top:0;right:0;bottom:0;left:0;width:100%;height:100%;stroke:currentColor;stroke-dasharray:3;opacity:.4}.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button{background:var(--wp-admin-theme-color);border-color:var(--wp-admin-theme-color);border-style:solid;color:#fff;opacity:1;visibility:visible}
\ No newline at end of file
+.wp-block[data-align=center]>.wp-block-site-logo{display:table;margin-left:auto;margin-right:auto}.wp-block-site-logo a{pointer-events:none}.wp-block-site-logo .custom-logo-link{cursor:inherit}.wp-block-site-logo .custom-logo-link:focus{box-shadow:none}.wp-block-site-logo .custom-logo-link.is-transient img{opacity:.3}.wp-block-site-logo img{display:block;height:auto;max-width:100%}.wp-block-site-logo.wp-block-site-logo .components-placeholder,.wp-block-site-logo.wp-block-site-logo .components-resizable-box__container{border-radius:inherit}.wp-block-site-logo.wp-block-site-logo.is-default-size .components-placeholder{height:120px;width:120px}.wp-block-site-logo.wp-block-site-logo .components-placeholder{justify-content:center;align-items:center;box-shadow:none;padding:0;min-height:48px;min-width:48px;height:100%;width:100%;color:currentColor;background:transparent}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-form-file-upload{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__preview{position:absolute;top:4px;right:4px;bottom:4px;left:4px;background:hsla(0,0%,100%,.8);display:flex;align-items:center;justify-content:center}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-drop-zone__content-text{display:none}.wp-block-site-logo.wp-block-site-logo .components-placeholder:before{content:"";display:block;position:absolute;top:0;right:0;bottom:0;left:0;border:1px dashed;opacity:.4;pointer-events:none;border-radius:inherit}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__fieldset{width:auto}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{color:inherit;padding:0;display:flex;justify-content:center;align-items:center;width:48px;height:48px;border-radius:50%;position:relative;visibility:hidden;background:transparent;transition:all .1s linear}@media (prefers-reduced-motion:reduce){.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button{transition-duration:0s;transition-delay:0s}}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-button.components-button>svg{color:#fff}.wp-block-site-logo.wp-block-site-logo .components-placeholder .components-placeholder__illustration{position:absolute;top:0;right:0;bottom:0;left:0;width:100%;height:100%;stroke:currentColor;stroke-dasharray:3;opacity:.4}.wp-block-site-logo.wp-block-site-logo.is-selected .components-button.components-button{background:var(--wp-admin-theme-color);border-color:var(--wp-admin-theme-color);border-style:solid;color:#fff;opacity:1;visibility:visible}
\ No newline at end of file
diff --git a/src/wp-includes/blocks/site-logo/style-rtl.css b/src/wp-includes/blocks/site-logo/style-rtl.css
index 8fc6d932e3..9062fc1144 100644
--- a/src/wp-includes/blocks/site-logo/style-rtl.css
+++ b/src/wp-includes/blocks/site-logo/style-rtl.css
@@ -89,7 +89,9 @@
border-radius: inherit;
}
.wp-block-site-logo.aligncenter {
- display: table;
+ margin-right: auto;
+ margin-left: auto;
+ text-align: center;
}
.wp-block-site-logo.is-style-rounded {
border-radius: 9999px;
diff --git a/src/wp-includes/blocks/site-logo/style-rtl.min.css b/src/wp-includes/blocks/site-logo/style-rtl.min.css
index 34a040a764..b77c9a0046 100644
--- a/src/wp-includes/blocks/site-logo/style-rtl.min.css
+++ b/src/wp-includes/blocks/site-logo/style-rtl.min.css
@@ -1 +1 @@
-.wp-block-site-logo{line-height:0}.wp-block-site-logo a{display:inline-block}.wp-block-site-logo.is-default-size img{width:120px;height:auto}.wp-block-site-logo a,.wp-block-site-logo img{border-radius:inherit}.wp-block-site-logo.aligncenter{display:table}.wp-block-site-logo.is-style-rounded{border-radius:9999px}
\ No newline at end of file
+.wp-block-site-logo{line-height:0}.wp-block-site-logo a{display:inline-block}.wp-block-site-logo.is-default-size img{width:120px;height:auto}.wp-block-site-logo a,.wp-block-site-logo img{border-radius:inherit}.wp-block-site-logo.aligncenter{margin-right:auto;margin-left:auto;text-align:center}.wp-block-site-logo.is-style-rounded{border-radius:9999px}
\ No newline at end of file
diff --git a/src/wp-includes/blocks/site-logo/style.css b/src/wp-includes/blocks/site-logo/style.css
index 8fc6d932e3..27ca9707b5 100644
--- a/src/wp-includes/blocks/site-logo/style.css
+++ b/src/wp-includes/blocks/site-logo/style.css
@@ -89,7 +89,9 @@
border-radius: inherit;
}
.wp-block-site-logo.aligncenter {
- display: table;
+ margin-left: auto;
+ margin-right: auto;
+ text-align: center;
}
.wp-block-site-logo.is-style-rounded {
border-radius: 9999px;
diff --git a/src/wp-includes/blocks/site-logo/style.min.css b/src/wp-includes/blocks/site-logo/style.min.css
index 34a040a764..2f58ac8399 100644
--- a/src/wp-includes/blocks/site-logo/style.min.css
+++ b/src/wp-includes/blocks/site-logo/style.min.css
@@ -1 +1 @@
-.wp-block-site-logo{line-height:0}.wp-block-site-logo a{display:inline-block}.wp-block-site-logo.is-default-size img{width:120px;height:auto}.wp-block-site-logo a,.wp-block-site-logo img{border-radius:inherit}.wp-block-site-logo.aligncenter{display:table}.wp-block-site-logo.is-style-rounded{border-radius:9999px}
\ No newline at end of file
+.wp-block-site-logo{line-height:0}.wp-block-site-logo a{display:inline-block}.wp-block-site-logo.is-default-size img{width:120px;height:auto}.wp-block-site-logo a,.wp-block-site-logo img{border-radius:inherit}.wp-block-site-logo.aligncenter{margin-left:auto;margin-right:auto;text-align:center}.wp-block-site-logo.is-style-rounded{border-radius:9999px}
\ No newline at end of file
diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php
index 69ef78ac3c..80726efc98 100644
--- a/src/wp-includes/class-wp-theme-json.php
+++ b/src/wp-includes/class-wp-theme-json.php
@@ -1242,7 +1242,7 @@ class WP_Theme_JSON {
$new_key = $prefix . str_replace(
'/',
'-',
- strtolower( preg_replace( '/(? WP_Theme_JSON::LATEST_SCHEMA,
'settings' => array(
- 'color' => array(
+ 'color' => array(
'palette' => array(
array(
'slug' => 'grey',
@@ -672,6 +672,9 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
),
),
),
+ 'custom' => array(
+ 'white2black' => 'value',
+ ),
),
)
);
@@ -681,7 +684,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
$theme_json->get_stylesheet( array( 'presets' ) )
);
$this->assertEquals(
- 'body{--wp--preset--color--grey: grey;--wp--preset--color--dark-grey: grey;--wp--preset--color--light-grey: grey;--wp--preset--color--white-2-black: grey;}',
+ 'body{--wp--preset--color--grey: grey;--wp--preset--color--dark-grey: grey;--wp--preset--color--light-grey: grey;--wp--preset--color--white-2-black: grey;--wp--custom--white-2-black: value;}',
$theme_json->get_stylesheet( array( 'variables' ) )
);