Merge branch 'trunk' into skip-page-builder-dip

Author: adamsilverstein

package.json

@@ -7,7 +7,7 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"ref": "022d8dd3d461f91b15c1f0410649d3ebb027207f"
+		"ref": "7b7fa2bc97a8029a302bd6511cf0d206b5953172"
 	},
 	"engines": {
 		"node": ">=20.10.0",
@@ -145,4 +145,4 @@
 		"sync-gutenberg-packages": "grunt sync-gutenberg-packages",
 		"postsync-gutenberg-packages": "grunt wp-packages:sync-stable-blocks && grunt build --dev && grunt build"
 	}
-}
+}

src/wp-admin/comment.php

@@ -48,7 +48,8 @@
 		);
 	}
 } else {
-	$comment = null;
+	$comment_id = 0;
+	$comment    = null;
 }
 
 switch ( $action ) {

src/wp-admin/css/common.css

@@ -1086,7 +1086,7 @@ th.action-links {
 
 .filter-links .current {
 	box-shadow: none;
-	border-bottom: 4px solid #646970;
+	border-bottom: 4px solid var(--wp-admin-theme-color);
 	color: #1d2327;
 }
 
@@ -1183,7 +1183,7 @@ th.action-links {
 }
 
 .wp-filter .button.drawer-toggle:focus {
-	border-color: #4f94d4;
+	border-color: var(--wp-admin-theme-color);
 }
 
 .wp-filter .button.drawer-toggle:active {

src/wp-admin/css/customize-controls.css

@@ -83,10 +83,6 @@ body:not(.ready) #customize-save-button-wrapper .save {
 	margin-top: 0;
 }
 
-#customize-save-button-wrapper .save:focus, #publish-settings:focus {
-	box-shadow: 0 1px 0 #2271b1, 0 0 2px 1px #72aee6; /* This is default box shadow for focus */
-}
-
 #customize-save-button-wrapper .save.has-next-sibling {
 	border-radius: 3px 0 0 3px;
 }
@@ -499,12 +495,6 @@ body.trashing #publish-settings {
 	left: 6px;
 }
 
-#customize-controls .customize-info.open .customize-help-toggle,
-#customize-controls .customize-info .customize-help-toggle:focus,
-#customize-controls .customize-info .customize-help-toggle:hover {
-	color: #2271b1;
-}
-
 #customize-controls .customize-info .customize-panel-description,
 #customize-controls .customize-info .customize-section-description,
 #customize-outer-theme-controls .customize-info .customize-section-description,
@@ -609,15 +599,6 @@ body.trashing #publish-settings {
 	background: transparent;
 }
 
-#customize-controls .control-section:hover > .accordion-section-title,
-#customize-controls .control-section .accordion-section-title button:hover,
-#customize-controls .control-section.open .accordion-section-title,
-#customize-controls .control-section .accordion-section-title button:focus {
-	color: var(--wp-admin-theme-color, #3858e9);
-	background: #f6f7f7;
-	border-left-color: var(--wp-admin-theme-color, #3858e9);
-}
-
 #accordion-section-themes + .control-section {
 	border-top: 1px solid #dcdcde;
 }
@@ -629,17 +610,6 @@ body.trashing #publish-settings {
 	background: #f6f7f7;
 }
 
-#customize-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-theme-controls .control-section.open .accordion-section-title:after,
-#customize-theme-controls .control-section .accordion-section-title:focus:after,
-#customize-outer-theme-controls .control-section:hover > .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:hover:after,
-#customize-outer-theme-controls .control-section.open .accordion-section-title:after,
-#customize-outer-theme-controls .control-section .accordion-section-title:focus:after {
-	color: #2271b1;
-}
-
 #customize-theme-controls .control-section.open {
 	border-bottom: 1px solid #f0f0f1;
 }
@@ -907,8 +877,6 @@ h3.customize-section-title {
 .customize-controls-preview-toggle:focus,
 .customize-controls-preview-toggle:hover {
 	background: #fff;
-	color: #2271b1;
-	border-top-color: #2271b1;
 	box-shadow: none;
 	/* Only visible in Windows High Contrast mode */
 	outline: 1px solid transparent;
@@ -924,9 +892,7 @@ h3.customize-section-title {
 .customize-panel-back:focus,
 .customize-section-back:hover,
 .customize-section-back:focus {
-	color: #2271b1;
 	background: #f6f7f7;
-	border-left-color: #2271b1;
 	box-shadow: none;
 	/* Only visible in Windows High Contrast mode */
 	outline: 2px solid transparent;
@@ -2033,8 +1999,6 @@ p.customize-section-description {
 
 .control-panel-themes .customize-themes-section-title:focus,
 .control-panel-themes .customize-themes-section-title:hover {
-	border-left-color: #2271b1;
-	color: #2271b1;
 	background: #f6f7f7;
 }
 
@@ -2063,14 +2027,9 @@ p.customize-section-description {
 	position: absolute;
 	top: 9px;
 	right: 15px;
-	background: #2271b1;
 	color: #fff;
 }
 
-.control-panel-themes .customize-themes-section-title.selected {
-	color: #2271b1;
-}
-
 #customize-theme-controls .themes.accordion-section-content {
 	position: relative;
 	left: 0;
@@ -2373,9 +2332,7 @@ p.customize-section-description {
 
 	.wp-customizer .showing-themes .control-panel-themes .customize-themes-mobile-back:hover,
 	.wp-customizer .showing-themes .control-panel-themes .customize-themes-mobile-back:focus {
-		color: #2271b1;
 		background: #f6f7f7;
-		border-left-color: #2271b1;
 		box-shadow: none;
 		/* Only visible in Windows High Contrast mode */
 		outline: 2px solid transparent;
@@ -2471,13 +2428,11 @@ p.customize-section-description {
 .wp-customizer .theme-overlay .theme-header .left:focus,
 .wp-customizer .theme-overlay .theme-header .left:hover {
 	background: #fff;
-	border-bottom: 4px solid #2271b1;
-	color: #2271b1;
 }
 
 .wp-customizer .theme-overlay .theme-header .close:focus:before,
 .wp-customizer .theme-overlay .theme-header .close:hover:before {
-	color: #2271b1;
+	color: var(--wp-admin-theme-color);
 }
 
 .wp-customizer .theme-overlay .theme-header button.disabled,

src/wp-admin/css/customize-nav-menus.css

@@ -268,7 +268,7 @@
 #customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:hover,
 #customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:active,
 #customize-controls .customize-info.open.active-menu-screen-options .customize-help-toggle:focus {
-	color: #2271b1;
+	color: var(--wp-admin-theme-color);
 }
 
 .customize-screen-options-toggle:focus,
@@ -836,13 +836,13 @@ li.assigned-to-menu-location .add-new-menu-item {
 .menu-item-handle:hover {
 	position: relative;
 	z-index: 10;
-	color: #2271b1;
+	color: var(--wp-admin-theme-color);
 }
 
 .menu-item-handle:hover .item-type,
 .menu-item-handle:hover .item-edit,
 #available-menu-items .menu-item-handle:hover .item-add {
-	color: #2271b1;
+	color: var(--wp-admin-theme-color);
 }
 
 .menu-item-edit-active .menu-item-handle {

src/wp-admin/css/customize-widgets.css

@@ -187,7 +187,7 @@
 
 #customize-theme-controls .widget-area-select .selected {
 	color: #fff;
-	background: #2271b1;
+	background: var(--wp-admin-theme-color);
 }
 
 #customize-theme-controls .widget-area-select .selected:before {
@@ -245,8 +245,8 @@
 #available-widgets .widget-tpl.selected {
 	background: #f6f7f7;
 	border-bottom-color: #c3c4c7;
-	color: #2271b1;
-	border-left: 4px solid #2271b1;
+	color: var(--wp-admin-theme-color);;
+	border-left: 4px solid var(--wp-admin-theme-color);
 }
 
 #customize-controls .widget-title h3 {

src/wp-admin/css/dashboard.css

@@ -533,6 +533,15 @@
 .community-events-form .regular-text {
 	width: 40%;
 	margin: 0;
+	min-height: 32px;
+	line-height: 2.14285714;
+	padding: 0 8px;
+}
+
+#dashboard-widgets .community-events-form .button {
+	min-height: 32px;
+	line-height: 2.30769231;
+	padding: 0 12px;
 }
 
 .community-events li.event-none {
@@ -544,7 +553,7 @@
 }
 
 .community-events-form label {
-	line-height: 2.15384615;
+	line-height: 2.14285714;
 }
 
 .community-events .activity-block > p {

src/wp-admin/css/list-tables.css

@@ -922,8 +922,8 @@ tr.inline-edit-row td {
 }
 
 .inline-edit-wrapper:focus {
-	border-color: #2271b1;
-	box-shadow: 0 0 0 1px #2271b1;
+	border-color: var(--wp-admin-theme-color, #3858e9);
+	box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color, #3858e9);
 	/* Only visible in Windows High Contrast mode */
 	outline: 2px solid transparent;
 }

src/wp-admin/includes/admin-filters.php

@@ -53,7 +53,7 @@
 
 // Prerendering.
 if ( ! is_customize_preview() ) {
-	add_filter( 'admin_print_styles', 'wp_resource_hints', 1 );
+	add_action( 'admin_print_styles', 'wp_resource_hints', 1 );
 }
 
 add_action( 'admin_print_scripts', 'print_emoji_detection_script' );
@@ -85,7 +85,7 @@
 
 add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
 
-add_action( 'use_block_editor_for_post_type', '_disable_block_editor_for_navigation_post_type', 10, 2 );
+add_filter( 'use_block_editor_for_post_type', '_disable_block_editor_for_navigation_post_type', 10, 2 );
 add_action( 'edit_form_after_title', '_disable_content_editor_for_navigation_post_type' );
 add_action( 'edit_form_after_editor', '_enable_content_editor_for_navigation_post_type' );
 

src/wp-admin/includes/menu.php

@@ -41,6 +41,13 @@
 	do_action( '_admin_menu' );
 }
 
+/**
+ * @global array $menu
+ * @global array $submenu
+ * @global array $compat
+ */
+global $menu, $submenu, $compat;
+
 // Create list of page plugin hook names.
 foreach ( $menu as $menu_page ) {
 	$pos = strpos( $menu_page[2], '?' );