Skip to content

Commit 2dd7d20

Browse files
westonruterwestonruter
committed
Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into replace-esprima-with-espree
2 parents fbf63ef + 163bc04 commit 2dd7d20

36 files changed

+607
-176
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://develop.svn.wordpress.org/trunk"
88
},
99
"gutenberg": {
10-
"ref": "7bf80ea84eb8b62eceb1bb3fe82e42163673ca79"
10+
"ref": "59a08c5496008ca88f4b6b86f38838c3612d88c8"
1111
},
1212
"engines": {
1313
"node": ">=20.10.0",

‎src/wp-admin/includes/class-wp-debug-data.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,8 @@ private static function get_wp_server(): array {
373373
);
374374
$fields['httpd_software'] = array(
375375
'label' => __( 'Web server' ),
376-
'value' => $_SERVER['SERVER_SOFTWARE'] ?? __( 'Unable to determine what web server software is used' ),
377-
'debug' => $_SERVER['SERVER_SOFTWARE'] ?? 'unknown',
376+
'value' => ! empty( $_SERVER['SERVER_SOFTWARE'] ) ? wp_unslash( $_SERVER['SERVER_SOFTWARE'] ) : __( 'Unable to determine what web server software is used' ),
377+
'debug' => ! empty( $_SERVER['SERVER_SOFTWARE'] ) ? wp_unslash( $_SERVER['SERVER_SOFTWARE'] ) : 'unknown',
378378
);
379379
$fields['php_version'] = array(
380380
'label' => __( 'PHP version' ),
@@ -545,7 +545,7 @@ private static function get_wp_server(): array {
545545
);
546546
$fields['server-time'] = array(
547547
'label' => __( 'Current Server time' ),
548-
'value' => wp_date( 'c', $_SERVER['REQUEST_TIME'] ),
548+
'value' => isset( $_SERVER['REQUEST_TIME'] ) ? wp_date( 'c', (int) $_SERVER['REQUEST_TIME'] ) : __( 'Unable to determine server time' ),
549549
);
550550

551551
return array(

‎src/wp-admin/includes/update-core.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -840,10 +840,6 @@
840840
'wp-includes/js/dist/fields.min.js',
841841
'wp-includes/js/dist/fields.js',
842842
// 6.9
843-
'wp-includes/blocks/post-author/editor.css',
844-
'wp-includes/blocks/post-author/editor.min.css',
845-
'wp-includes/blocks/post-author/editor-rtl.css',
846-
'wp-includes/blocks/post-author/editor-rtl.min.css',
847843
'wp-includes/SimplePie/src/Decode',
848844
'wp-includes/SimplePie/src/Core.php',
849845
);

‎src/wp-content/themes/twentytwentyone/inc/block-patterns.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ function twenty_twenty_one_register_block_pattern_category() {
2727
add_action( 'init', 'twenty_twenty_one_register_block_pattern_category' );
2828
}
2929

30-
/**
31-
* Register Block Patterns.
32-
*/
3330
if ( function_exists( 'register_block_pattern' ) ) {
3431
/**
35-
* Registers Block Pattern.
32+
* Registers Block Patterns.
3633
*
3734
* @since Twenty Twenty-One 1.0
3835
*

‎src/wp-includes/block-patterns.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ function _register_core_block_patterns_and_categories() {
7979
'query-grid-posts',
8080
'query-large-title-posts',
8181
'query-offset-posts',
82+
'navigation-overlay',
83+
'navigation-overlay-black-bg',
84+
'navigation-overlay-accent-bg',
85+
'navigation-overlay-centered',
86+
'navigation-overlay-centered-with-extras',
8287
);
8388

8489
foreach ( $core_block_patterns as $core_block_pattern ) {
@@ -228,6 +233,13 @@ function _register_core_block_patterns_and_categories() {
228233
'description' => __( 'A variety of header designs displaying your site title and navigation.' ),
229234
)
230235
);
236+
register_block_pattern_category(
237+
'navigation',
238+
array(
239+
'label' => _x( 'Navigation', 'Block pattern category' ),
240+
'description' => __( 'A variety of designs displaying site navigation.' ),
241+
)
242+
);
231243
}
232244

233245
/**

‎src/wp-includes/block-patterns/navigation-overlay-accent-bg.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?php
2+
/**
3+
* Navigation: Overlay with orange background.
4+
*
5+
* @package WordPress
6+
*/
7+
8+
return array(
9+
'title' => _x( 'Overlay with orange background', 'Block pattern title' ),
10+
'blockTypes' => array( 'core/template-part/navigation-overlay' ),
11+
'categories' => array( 'navigation' ),
12+
'content' => '<!-- wp:group {"metadata":{"name":"' . esc_attr( __( 'Navigation Overlay' ) ) . '"},"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50","top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}},"color":{"background":"#f57600"},"dimensions":{"minHeight":"100vh"},"elements":{"link":{"color":{"text":"var:preset|color|black"}}}},"textColor":"black","layout":{"type":"grid","columnCount":2,"minimumColumnWidth":"600px","rowCount":2,"isManualPlacement":true}} -->
13+
<div class="wp-block-group has-black-color has-text-color has-background has-link-color" style="background-color:#f57600;min-height:100vh;padding-top:var(--wp--preset--spacing--50);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:group {"style":{"layout":{"columnStart":1,"rowStart":1}},"layout":{"type":"default"}} -->
14+
<div class="wp-block-group"><!-- wp:navigation-overlay-close {"style":{"layout":{"columnStart":1,"rowStart":1}}} /--></div>
15+
<!-- /wp:group -->
16+
17+
<!-- wp:group {"style":{"typography":{"lineHeight":"0.8"},"layout":{"columnStart":1,"rowStart":2}},"layout":{"type":"flex","orientation":"vertical","verticalAlignment":"bottom"}} -->
18+
<div class="wp-block-group" style="line-height:0.8"><!-- wp:site-title {"fontSize":"large"} /-->
19+
20+
<!-- wp:site-tagline {"style":{"typography":{"lineHeight":"1.2"},"elements":{"link":{"color":{"text":"#000000a6"}}},"color":{"text":"#000000a6"}},"fontSize":"large"} /--></div>
21+
<!-- /wp:group -->
22+
23+
<!-- wp:spacer {"height":"10rem","style":{"layout":{"columnStart":2,"rowStart":2}}} -->
24+
<div style="height:10rem" aria-hidden="true" class="wp-block-spacer"></div>
25+
<!-- /wp:spacer -->
26+
27+
<!-- wp:navigation {"overlayMenu":"never","style":{"typography":{"lineHeight":"1"},"layout":{"columnStart":2,"rowStart":1}},"fontSize":"large","layout":{"type":"flex","orientation":"vertical"}} /--></div>
28+
<!-- /wp:group -->',
29+
);

‎src/wp-includes/block-patterns/navigation-overlay-black-bg.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
/**
3+
* Navigation: Overlay with black background.
4+
*
5+
* @package WordPress
6+
*/
7+
8+
return array(
9+
'title' => _x( 'Overlay with black background', 'Block pattern title' ),
10+
'blockTypes' => array( 'core/template-part/navigation-overlay' ),
11+
'categories' => array( 'navigation' ),
12+
'content' => '<!-- wp:group {"metadata":{"name":"' . esc_attr( __( 'Navigation Overlay' ) ) . '"},"style":{"spacing":{"padding":{"right":"var:preset|spacing|40","left":"var:preset|spacing|40","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}},"dimensions":{"minHeight":"100vh"},"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"color":{"background":"#000000"}},"textColor":"white","layout":{"type":"default"}} -->
13+
<div class="wp-block-group has-white-color has-text-color has-background has-link-color" style="background-color:#000000;min-height:100vh;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30","left":"var:preset|spacing|30","right":"var:preset|spacing|30"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
14+
<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--30)"><!-- wp:navigation {"style":{"typography":{"lineHeight":"1"}},"fontSize":"xx-large","layout":{"type":"flex","orientation":"vertical"}} /-->
15+
16+
<!-- wp:navigation-overlay-close {"displayMode":"text","style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"textColor":"white"} /--></div>
17+
<!-- /wp:group --></div>
18+
<!-- /wp:group -->',
19+
);

‎src/wp-includes/block-patterns/navigation-overlay-centered-with-extras.php‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php
2+
/**
3+
* Navigation: Overlay with site info and CTA.
4+
*
5+
* @package WordPress
6+
*/
7+
8+
return array(
9+
'title' => _x( 'Overlay with site info and CTA', 'Block pattern title' ),
10+
'blockTypes' => array( 'core/template-part/navigation-overlay' ),
11+
'categories' => array( 'navigation' ),
12+
'content' => '<!-- wp:group {"metadata":{"name":"' . esc_attr( __( 'Navigation Overlay' ) ) . '"},"style":{"spacing":{"padding":{"right":"var:preset|spacing|40","left":"var:preset|spacing|40","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}},"dimensions":{"minHeight":"100vh"},"elements":{"link":{"color":{"text":"var:preset|color|black"}}},"backgroundColor":"white","textColor":"black","layout":{"type":"default"}} -->
13+
<div class="wp-block-group has-black-color has-white-background-color has-text-color has-background has-link-color" style="min-height:100vh;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)"><!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"right"}} -->
14+
<div class="wp-block-group alignwide"><!-- wp:navigation-overlay-close /--></div>
15+
<!-- /wp:group -->
16+
17+
<!-- wp:group {"align":"wide","layout":{"type":"constrained"}} -->
18+
<div class="wp-block-group alignwide"><!-- wp:site-logo {"width":80,"isLink":false,"align":"center","className":"is-style-rounded"} /-->
19+
20+
<!-- wp:site-title {"textAlign":"center","fontSize":"large"} /-->
21+
22+
<!-- wp:site-tagline {"textAlign":"center","fontSize":"medium"} /-->
23+
24+
<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
25+
<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)"><!-- wp:navigation {"overlayMenu":"never","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"x-large","layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} /--></div>
26+
<!-- /wp:group -->
27+
28+
<!-- wp:group {"align":"full","style":{"border":{"top":{"color":"#eeeeee","width":"1px"}},"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
29+
<div class="wp-block-group alignfull" style="border-top-color:#eeeeee;border-top-width:1px;padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)"><!-- wp:paragraph {"style":{"typography":{"textAlign":"center"}}} -->
30+
<p class="has-text-align-center">' . esc_html( __( 'Find out how we can help your business.' ) ) . ' <a href="#">' . esc_html( __( 'Learn more' ) ) . '</a></p>
31+
<!-- /wp:paragraph -->
32+
33+
<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center"}} -->
34+
<div class="wp-block-buttons"><!-- wp:button {"style":{"typography":{"textTransform":"uppercase"}}} -->
35+
<div class="wp-block-button"><a class="wp-block-button__link wp-element-button" style="text-transform:uppercase">' . esc_html( __( 'Get started today!' ) ) . '</a></div>
36+
<!-- /wp:button -->
37+
38+
<!-- wp:button -->
39+
<div class="wp-block-button"><a class="wp-block-button__link wp-element-button"></a></div>
40+
<!-- /wp:button --></div>
41+
<!-- /wp:buttons --></div>
42+
<!-- /wp:group --></div>
43+
<!-- /wp:group --></div>
44+
<!-- /wp:group -->',
45+
);

‎src/wp-includes/block-patterns/navigation-overlay-centered.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
/**
3+
* Navigation: Overlay with centered navigation.
4+
*
5+
* @package WordPress
6+
*/
7+
8+
return array(
9+
'title' => _x( 'Overlay with centered navigation', 'Block pattern title' ),
10+
'blockTypes' => array( 'core/template-part/navigation-overlay' ),
11+
'categories' => array( 'navigation' ),
12+
'content' => '<!-- wp:group {"metadata":{"name":"' . esc_attr( __( 'Navigation Overlay' ) ) . '"},"style":{"spacing":{"padding":{"right":"var:preset|spacing|40","left":"var:preset|spacing|40","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}},"dimensions":{"minHeight":"100vh"},"elements":{"link":{"color":{"text":"var:preset|color|black"}}},"color":{"background":"#eeeeee"}},"textColor":"black","layout":{"type":"default"}} -->
13+
<div class="wp-block-group has-black-color has-text-color has-background has-link-color" style="background-color:#eeeeee;min-height:100vh;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)"><!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"right"}} -->
14+
<div class="wp-block-group alignwide"><!-- wp:navigation-overlay-close /--></div>
15+
<!-- /wp:group -->
16+
17+
<!-- wp:group {"align":"wide","style":{"dimensions":{"minHeight":"90vh"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
18+
<div class="wp-block-group alignwide" style="min-height:90vh"><!-- wp:navigation {"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} /--></div>
19+
<!-- /wp:group --></div>
20+
<!-- /wp:group -->',
21+
);

‎src/wp-includes/block-patterns/navigation-overlay.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
/**
3+
* Navigation: Overlay.
4+
*
5+
* @package WordPress
6+
*/
7+
8+
return array(
9+
'title' => _x( 'Navigation Overlay', 'Block pattern title' ),
10+
'blockTypes' => array( 'core/template-part/navigation-overlay' ),
11+
'categories' => array( 'navigation' ),
12+
'content' => '<!-- wp:group {"metadata":{"name":"' . esc_attr( __( 'Navigation Overlay' ) ) . '"},"style":{"spacing":{"padding":{"right":"var:preset|spacing|40","left":"var:preset|spacing|40","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"}},"dimensions":{"minHeight":"100vh"}},"backgroundColor":"white","layout":{"type":"default"}} -->
13+
<div class="wp-block-group has-white-background-color has-background" style="min-height:100vh;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)"><!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"right"}} -->
14+
<div class="wp-block-group alignwide"><!-- wp:navigation-overlay-close /--></div>
15+
<!-- /wp:group -->
16+
17+
<!-- wp:navigation {"layout":{"type":"flex","orientation":"vertical"},"showSubmenuIcon":false,"submenuVisibility":"always"} /--></div>
18+
<!-- /wp:group -->',
19+
);

0 commit comments

Comments
 (0)