Merge remote-tracking branch 'upstream/trunk' into trunk

Author: desrosj

composer.json

@@ -19,7 +19,7 @@
 		"ext-dom": "*"
 	},
 	"require-dev": {
-		"composer/ca-bundle": "1.5.9",
+		"composer/ca-bundle": "1.5.10",
 		"squizlabs/php_codesniffer": "3.13.5",
 		"wp-coding-standards/wpcs": "~3.3.0",
 		"phpcompatibility/phpcompatibility-wp": "~2.1.3",

package-lock.json

@@ -7,7 +7,7 @@
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"ref": "59a08c5496008ca88f4b6b86f38838c3612d88c8"
+		"ref": "7a11a53377a95cba4d3786d71cadd4c2f0c5ac52"
 	},
 	"engines": {
 		"node": ">=20.10.0",
@@ -74,7 +74,7 @@
 		"webpack": "5.98.0"
 	},
 	"dependencies": {
-		"backbone": "1.6.0",
+		"backbone": "1.6.1",
 		"clipboard": "2.0.11",
 		"codemirror": "5.65.20",
 		"core-js-url-browser": "3.6.4",
@@ -92,7 +92,7 @@
 		"jquery-hoverintent": "1.10.2",
 		"json2php": "0.0.12",
 		"jsonlint": "1.6.3",
-		"lodash": "4.17.21",
+		"lodash": "4.17.23",
 		"masonry-layout": "4.2.2",
 		"moment": "2.30.1",
 		"objectFitPolyfill": "2.3.5",
@@ -138,4 +138,4 @@
 		"sync-gutenberg-packages": "grunt sync-gutenberg-packages",
 		"postsync-gutenberg-packages": "grunt wp-packages:sync-stable-blocks && grunt build --dev && grunt build"
 	}
-}
+}

package.json

@@ -155,17 +155,17 @@
 	font-weight: 600;
 	padding: 15px 23px 14px;
 	/* Background and color set to prevent false positives in automated accessibility tests. */
-	background: #f0f0f1;
-	color: #2271b1;
+	background: #ffffff;
+	color: var(--wp-admin-theme-color, #3858e9);
 	z-index: 100000;
 	line-height: normal;
 }
 
 .screen-reader-shortcut:focus {
 	top: -25px;
 	/* Overrides a:focus in the admin. See ticket #56789. */
-	color: #2271b1;
-	box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6);
+	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);
 	text-decoration: none;
 	/* Only visible in Windows High Contrast mode */
 	outline: 2px solid transparent;
@@ -1894,8 +1894,8 @@ p.auto-update-status {
 }
 
 #screen-meta-links .show-settings: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;
 }
@@ -3445,7 +3445,7 @@ img {
 	/* Reset default focus style. */
 	box-shadow: none;
 	/* Use an inset outline instead, so it's visible also over the current file item. */
-	outline: 2px solid #2271b1;
+	outline: 2px solid var(--wp-admin-theme-color, #3858e9);
 	outline-offset: -2px;
 }
 

src/wp-admin/css/common.css

@@ -15,7 +15,7 @@ body {
 }
 
 a {
-	color: #2271b1;
+	color: var(--wp-admin-theme-color-darker-10);
 	transition-property: border, background, color;
 	transition-duration: .05s;
 	transition-timing-function: ease-in-out;
@@ -27,7 +27,7 @@ a {
 
 a:hover,
 a:active {
-	color: #135e96;
+	color: var(--wp-admin-theme-color-darker-20);
 }
 
 a:focus {
@@ -44,22 +44,32 @@ p {
 .login .message,
 .login .notice,
 .login .success {
-	border-left: 4px solid #72aee6;
-	padding: 12px;
+	border-left: 4px solid #3858e9;
+	padding: 8px 12px;
+	margin-top: 0;
 	margin-left: 0;
 	margin-bottom: 20px;
-	background-color: #fff;
-	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
+	background-color: transparent;
 	word-wrap: break-word;
 }
 
+.login .message p,
+.login .notice p,
+.login .success p {
+	font-size: 13px;
+	line-height: 1.54;
+	margin: 0.5em 0;
+}
+
 .login .success {
-	border-left-color: #00a32a;
+	border-left-color: #4ab866;
+	background-color: #eff9f1;
 }
 
 /* Match border color from common.css */
 .login .notice-error {
-	border-left-color: #d63638;
+	border-left-color: #cc1818;
+	background-color: #fcf0f0;
 }
 
 .login .login-error-list {
@@ -113,8 +123,8 @@ p {
 
 .login .button.wp-hide-pw:focus {
 	background: transparent;
-	border-color: #3582c4;
-	box-shadow: 0 0 0 1px #3582c4;
+	border-color: var(--wp-admin-theme-color);
+	box-shadow: 0 0 0 1px var(--wp-admin-theme-color);
 	/* Only visible in Windows High Contrast mode */
 	outline: 2px solid transparent;
 }
@@ -360,12 +370,6 @@ p {
 	padding-right: 2.5rem;
 }
 
-.login form .input,
-.login input[type="text"],
-.login form input[type="checkbox"] {
-	background: #fff;
-}
-
 .js.login-action-resetpass input[type="text"],
 .js.login-action-resetpass input[type="password"],
 .js.login-action-rp input[type="text"],

src/wp-admin/css/login.css

@@ -221,7 +221,6 @@ input.bulk-select-switcher:focus + .bulk-select-button-label {
 
 .menu-settings-group {
 	margin: 0 0 10px;
-	overflow: hidden;
 	padding-left: 20%;
 }
 

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

@@ -582,6 +582,12 @@ div#widgets-right .closed .widgets-sortables {
 	padding: 0 15px;
 }
 
+.widget-control-actions {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
 .editwidget .widget-control-actions {
 	margin-top: 20px;
 }
@@ -724,7 +730,7 @@ div#widgets-right .widget-top:hover,
 }
 
 .widgets-chooser .widgets-chooser-selected .widgets-chooser-button {
-	background: #2271b1;
+	background: var(--wp-admin-theme-color, #3858e9);
 	color: #fff;
 }
 

src/wp-admin/css/widgets.css

@@ -23,8 +23,20 @@ class WP_Media_List_Table extends WP_List_Table {
 	 */
 	protected $comment_pending_count = array();
 
+	/**
+	 * Whether the list table is for detached media.
+	 *
+	 * @since 3.1.0
+	 * @var bool
+	 */
 	private $detached;
 
+	/**
+	 * Whether the list table is for trash.
+	 *
+	 * @since 3.1.0
+	 * @var bool
+	 */
 	private $is_trash;
 
 	/**
@@ -53,17 +65,25 @@ public function __construct( $args = array() ) {
 	}
 
 	/**
+	 * Checks if the current user has permissions to upload files.
+	 *
+	 * @since 3.1.0
+	 *
 	 * @return bool Whether the user can upload files.
 	 */
 	public function ajax_user_can() {
 		return current_user_can( 'upload_files' );
 	}
 
 	/**
+	 * Prepares the list of items for displaying.
+	 *
+	 * @since 3.1.0
+	 *
 	 * @global string   $mode                  List table view mode.
 	 * @global WP_Query $wp_query              WordPress Query object.
-	 * @global array    $post_mime_types
-	 * @global array    $avail_post_mime_types
+	 * @global array    $post_mime_types       An array of post mime types.
+	 * @global array    $avail_post_mime_types An array of available post mime types.
 	 */
 	public function prepare_items() {
 		global $mode, $wp_query, $post_mime_types, $avail_post_mime_types;
@@ -117,8 +137,12 @@ public function prepare_items() {
 	}
 
 	/**
-	 * @global array $post_mime_types
-	 * @global array $avail_post_mime_types
+	 * Gets an array of links for the available views on this table.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @global array $post_mime_types       An array of post mime types.
+	 * @global array $avail_post_mime_types An array of available post mime types.
 	 * @return array<string, string> An array of links for the available views.
 	 */
 	protected function get_views() {
@@ -198,7 +222,11 @@ protected function get_bulk_actions() {
 	}
 
 	/**
-	 * @param string $which
+	 * Displays extra controls between bulk actions and pagination.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param string $which The location of the extra table nav: 'top' or 'bottom'.
 	 */
 	protected function extra_tablenav( $which ) {
 		if ( 'bar' !== $which ) {
@@ -253,6 +281,9 @@ public function has_items() {
 	}
 
 	/**
+	 * Displays a message when no media items are found.
+	 *
+	 * @since 3.1.0
 	 */
 	public function no_items() {
 		if ( $this->is_trash ) {
@@ -762,8 +793,12 @@ protected function get_default_primary_column_name() {
 	}
 
 	/**
-	 * @param WP_Post $post
-	 * @param string  $att_title
+	 * Gets the row actions for a media item.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param WP_Post $post      The current WP_Post object.
+	 * @param string  $att_title The attachment title.
 	 * @return array<string, string> An array of row actions.
 	 */
 	private function _get_row_actions( $post, $att_title ) {

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

@@ -611,7 +611,7 @@ function wp_iframe( $content_func, ...$args ) {
 
 	?>
 	</head>
-	<body<?php echo $body_id_attr; ?> class="wp-core-ui no-js">
+	<body<?php echo $body_id_attr; ?> class="wp-core-ui no-js <?php echo 'admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'modern' ); ?>">
 	<script>
 	document.body.className = document.body.className.replace('no-js', 'js');
 	</script>

src/wp-admin/includes/media.php

@@ -2172,6 +2172,7 @@ function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_r
 	do_action( 'admin_head' );
 
 	$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
+	$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'modern' );
 
 	if ( is_rtl() ) {
 		$admin_body_class .= ' rtl';