Merge branch 'trunk' into 64689-polish-customizer-button

Author: t-hamano

Gruntfile.js

@@ -1837,6 +1837,7 @@ module.exports = function(grunt) {
 		'clean:js',
 		'build:webpack',
 		'copy:js',
+		'copy-vendor-scripts',
 		'file_append',
 		'uglify:all',
 		'concat:tinymce',
@@ -2133,7 +2134,6 @@ module.exports = function(grunt) {
 				'build:css',
 				'build:codemirror',
 				'build:gutenberg',
-				'copy-vendor-scripts',
 				'build:certificates'
 			] );
 		} else {
@@ -2145,7 +2145,6 @@ module.exports = function(grunt) {
 				'build:css',
 				'build:codemirror',
 				'build:gutenberg',
-				'copy-vendor-scripts',
 				'replace:source-maps',
 				'verify:build'
 			] );

package.json

@@ -7,7 +7,7 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"sha": "0d133bf7e7437d65d68a06551f3d613a7d8e4361",
+		"sha": "e2970ba736edb99e08fb369d4fb0c378189468ee",
 		"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
 	},
 	"engines": {

src/wp-admin/css/color-picker.css

@@ -10,7 +10,7 @@
 
 /* Needs higher specificity to override `.wp-core-ui .button`. */
 .wp-picker-container .wp-color-result.button {
-	min-height: 30px;
+	min-height: 32px;
 	margin: 0 6px 6px 0;
 	padding: 0 0 0 30px;
 	font-size: 11px;
@@ -22,7 +22,7 @@
 	border-left: 1px solid #c3c4c7;
 	color: #50575e;
 	display: block;
-	line-height: 2.54545455; /* 28px */
+	line-height: 2.72727273; /* 30px */
 	padding: 0 6px;
 	text-align: center;
 }
@@ -76,8 +76,8 @@
 .wp-customizer .wp-picker-input-wrap .button.wp-picker-clear {
 	margin-left: 6px;
 	padding: 0 8px;
-	line-height: 2.54545455; /* 28px */
-	min-height: 30px;
+	line-height: 2.72727273; /* 30px */
+	min-height: 32px;
 }
 
 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -97,7 +97,7 @@
 	margin: 0;
 	padding: 0 5px;
 	vertical-align: top;
-	min-height: 30px;
+	min-height: 32px;
 }
 
 .wp-color-picker::-webkit-input-placeholder {

src/wp-admin/css/common.css

@@ -1473,22 +1473,22 @@ div.error p,
 	color: #1e1e1e;
 }
 
-.notice a,
-.error a,
-.updated a {
+div.notice a,
+div.error a,
+div.updated a {
 	color: var(--wp-admin-theme-color-darker-10);
 	text-decoration: underline;
 }
 
-.notice a:hover,
-.error a:hover,
-.updated a:hover {
+div.notice a:hover,
+div.error a:hover,
+div.updated a:hover {
 	color: var(--wp-admin-theme-color-darker-20);
 }
 
-.notice a:focus,
-.error a:focus,
-.updated a:focus {
+div.notice a:focus,
+div.error a:focus,
+div.updated a:focus {
 	box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 	outline: 2px solid transparent;
 	border-radius: 2px;
@@ -2077,17 +2077,6 @@ p.auto-update-status {
 	box-shadow: 0 2px 0 rgba(0, 0, 0, 0.02), 0 1px 0 rgba(0, 0, 0, 0.02);
 }
 
-.contextual-help-tabs .active::after {
-	content: "";
-	position: absolute;
-	top: 0;
-	right: -1px;
-	width: 2px;
-	height: 100%;
-	background: inherit;
-	z-index: 2;
-}
-
 .contextual-help-tabs .active a {
 	border-color: #c3c4c7;
 	color: #2c3338;
@@ -2292,7 +2281,7 @@ html.wp-toolbar {
 	line-height: 1;
 }
 
-.postbox.closed {
+.postbox.closed .postbox-header {
 	border-bottom: 0;
 }
 

src/wp-admin/css/edit.css

@@ -994,15 +994,16 @@ form#tags-filter {
 }
 
 .privacy-settings-accordion-actions {
-	text-align: right;
-	display: block;
+	justify-content: right;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	gap: 1em;
 }
 
 .privacy-settings-accordion-actions .success {
 	display: none;
 	color: #007017;
-	padding-right: 1em;
-	padding-top: 6px;
 }
 
 .privacy-settings-accordion-actions .success.visible {

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

@@ -682,6 +682,7 @@ th.sorted a span {
 }
 
 .tablenav-pages .current-page {
+	vertical-align: top;
 	margin: 0 2px 0 0;
 	font-size: 13px;
 	text-align: center;

src/wp-admin/includes/class-wp-importer.php

@@ -135,8 +135,14 @@ public function get_imported_comments( $blog_id ) {
 	}
 
 	/**
-	 * @param int $blog_id
-	 * @return int|void
+	 * Sets the blog to import to.
+	 *
+	 * Accepts a numeric blog ID or a URL string. When given a URL,
+	 * the blog is looked up by domain and path. On multisite, switches
+	 * to the resolved blog. Exits with an error if the blog cannot be found.
+	 *
+	 * @param int|string $blog_id Blog ID or URL.
+	 * @return int Blog ID on success. Exits on failure.
 	 */
 	public function set_blog( $blog_id ) {
 		if ( is_numeric( $blog_id ) ) {
@@ -177,7 +183,7 @@ public function set_blog( $blog_id ) {
 
 	/**
 	 * @param int $user_id
-	 * @return int|void
+	 * @return int
 	 */
 	public function set_user( $user_id ) {
 		if ( is_numeric( $user_id ) ) {

src/wp-admin/includes/class-wp-posts-list-table.php

@@ -437,7 +437,7 @@ protected function get_bulk_actions() {
 			if ( $this->is_trash ) {
 				$actions['untrash'] = __( 'Restore' );
 			} else {
-				$actions['edit'] = __( 'Bulk edit' );
+				$actions['edit'] = _x( 'Bulk edit', 'verb' );
 			}
 		}
 

src/wp-admin/includes/class-wp-privacy-requests-table.php

@@ -435,7 +435,7 @@ public function column_cb( $item ) {
 	 * @since 4.9.6
 	 *
 	 * @param WP_User_Request $item Item being shown.
-	 * @return string|void Status column markup. Returns a string if no status is found,
+	 * @return string|null Status column markup. Returns a string if no status is found,
 	 *                     otherwise it displays the markup.
 	 */
 	public function column_status( $item ) {
@@ -465,6 +465,7 @@ public function column_status( $item ) {
 		}
 
 		echo '</span>';
+		return null;
 	}
 
 	/**

src/wp-admin/includes/class-wp-site-health.php

@@ -167,7 +167,17 @@ public function enqueue_scripts() {
 	 * @since 5.4.0
 	 *
 	 * @param callable $callback
-	 * @return mixed|void
+	 * @return array{
+	 *     label: string,
+	 *     status: 'good'|'recommended'|'critical',
+	 *     badge: array{
+	 *         label: string,
+	 *         color: string,
+	 *     },
+	 *     description: string,
+	 *     actions: string,
+	 *     test: string,
+	 * }
 	 */
 	private function perform_test( $callback ) {
 		/**