Merge branch 'trunk' into ticket/#58763

WordPress · Dec 23, 2024 · 817691c · 817691c
2 parents f2afc2a + 07be244
commit 817691c
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/src/js/_enqueues/wp/customize/controls.js b/src/js/_enqueues/wp/customize/controls.js
@@ -1530,7 +1530,7 @@
 			}
 
 			// Expand/Collapse accordion sections on click.
-			section.container.find( '.accordion-section-title button, .customize-section-back' ).on( 'click keydown', function( event ) {
+			section.container.find( '.accordion-section-title button, .customize-section-back, .accordion-section-title[tabindex]' ).on( 'click keydown', function( event ) {
 				if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
 					return;
 				}
@@ -1605,7 +1605,7 @@
 				content = section.contentContainer,
 				overlay = section.headContainer.closest( '.wp-full-overlay' ),
 				backBtn = content.find( '.customize-section-back' ),
-				sectionTitle = section.headContainer.find( '.accordion-section-title button' ).first(),
+				sectionTitle = section.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ).first(),
 				expand, panel;
 
 			if ( expanded && ! content.hasClass( 'open' ) ) {
@@ -2694,7 +2694,7 @@
 				container = section.headContainer.closest( '.wp-full-overlay-sidebar-content' ),
 				content = section.contentContainer,
 				backBtn = content.find( '.customize-section-back' ),
-				sectionTitle = section.headContainer.find( '.accordion-section-title button' ).first(),
+				sectionTitle = section.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ).first(),
 				body = $( document.body ),
 				expand, panel;
 
@@ -2833,7 +2833,7 @@
 			var meta, panel = this;
 
 			// Expand/Collapse accordion sections on click.
-			panel.headContainer.find( '.accordion-section-title button' ).on( 'click keydown', function( event ) {
+			panel.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ).on( 'click keydown', function( event ) {
 				if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
 					return;
 				}
@@ -2937,7 +2937,7 @@
 				accordionSection = panel.contentContainer,
 				overlay = accordionSection.closest( '.wp-full-overlay' ),
 				container = accordionSection.closest( '.wp-full-overlay-sidebar-content' ),
-				topPanel = panel.headContainer.find( '.accordion-section-title button' ),
+				topPanel = panel.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ),
 				backBtn = accordionSection.find( '.customize-panel-back' ),
 				childSections = panel.sections(),
 				skipTransition;

diff --git a/src/wp-admin/credits.php b/src/wp-admin/credits.php
@@ -133,9 +133,9 @@
 __( 'Release Lead' );
 __( 'Release Design Lead' );
 __( 'Release Deputy' );
-__( 'Core Developer' );
-__( 'External Libraries' );
 __( 'Release Coordination' );
+__( 'Minor Release Lead' );
+__( 'Core Developer' );
 __( 'Core Tech Lead' );
 __( 'Core Triage Lead' );
 __( 'Editor Tech Lead' );
@@ -148,4 +148,4 @@
 __( 'Default Theme Development Lead' );
 __( 'Tech Lead' );
 __( 'Triage Lead' );
-__( 'Minor Release Lead' );
+__( 'External Libraries' );
diff --git a/src/wp-admin/css/login.css b/src/wp-admin/css/login.css
@@ -139,8 +139,7 @@ p {
 }
 
 .login form {
-	margin-top: 20px;
-	margin-left: 0;
+	margin: 24px 0;
 	padding: 26px 24px;
 	font-weight: 400;
 	overflow: hidden;
@@ -284,7 +283,7 @@ p {
 	font-size: 20px;
 	font-weight: 400;
 	line-height: 1.3;
-	margin: 0 auto 25px;
+	margin: 0 auto 24px;
 	padding: 0;
 	text-decoration: none;
 	width: 84px;

diff --git a/src/wp-admin/css/media.css b/src/wp-admin/css/media.css
@@ -174,7 +174,7 @@
 
 .media-item .pinkynail {
 	float: left;
-	margin: 0 10px 0 0;
+	margin: 14px;
 	max-height: 70px;
 	max-width: 70px;
 }

diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
@@ -935,6 +935,7 @@ body.folded .theme-browser ~ .theme-overlay .theme-wrap {
 	.theme-overlay .theme-screenshots {
 		width: 100%;
 		float: none;
+		margin: 0;
 	}
 
 	.theme-overlay .theme-info {

diff --git a/src/wp-admin/includes/class-custom-background.php b/src/wp-admin/includes/class-custom-background.php
@@ -354,7 +354,7 @@ public function admin_page() {
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
 			<?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
-			<?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
+			<?php submit_button( _x( 'Upload', 'verb' ), '', 'submit', false ); ?>
 	</p>
 	<p>
 		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />

diff --git a/src/wp-admin/includes/class-custom-image-header.php b/src/wp-admin/includes/class-custom-image-header.php
@@ -664,7 +664,7 @@ public function step_1() {
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
 			<?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
-			<?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
+			<?php submit_button( _x( 'Upload', 'verb' ), '', 'submit', false ); ?>
 	</p>
 			<?php
 			$modal_update_href = add_query_arg(

diff --git a/src/wp-admin/includes/class-wp-theme-install-list-table.php b/src/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -60,7 +60,7 @@ public function prepare_items() {
 		if ( 'search' === $tab ) {
 			$tabs['search'] = __( 'Search Results' );
 		}
-		$tabs['upload']   = __( 'Upload' );
+		$tabs['upload']   = _x( 'Upload', 'noun' );
 		$tabs['featured'] = _x( 'Featured', 'themes' );
 		//$tabs['popular']  = _x( 'Popular', 'themes' );
 		$tabs['new']     = _x( 'Latest', 'themes' );

diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
@@ -2277,11 +2277,11 @@ function media_upload_form( $errors = null ) {
 		<label class="screen-reader-text" for="async-upload">
 			<?php
 			/* translators: Hidden accessibility text. */
-			_e( 'Upload' );
+			_ex( 'Upload', 'verb' );
 			?>
 		</label>
 		<input type="file" name="async-upload" id="async-upload" />
-		<?php submit_button( __( 'Upload' ), 'primary', 'html-upload', false ); ?>
+		<?php submit_button( _x( 'Upload', 'verb' ), 'primary', 'html-upload', false ); ?>
 		<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e( 'Cancel' ); ?></a>
 	</p>
 	<div class="clear"></div>

diff --git a/src/wp-includes/block-supports/block-style-variations.php b/src/wp-includes/block-supports/block-style-variations.php
@@ -62,7 +62,7 @@ function wp_resolve_block_style_variation_ref_values( &$variation_data, $theme_j
 	}
 }
 /**
- * Render the block style variation's styles.
+ * Renders the block style variation's styles.
  *
  * In the case of nested blocks with variations applied, we want the parent
  * variation's styles to be rendered before their descendants. This solves the
@@ -194,15 +194,15 @@ function wp_render_block_style_variation_support_styles( $parsed_block ) {
 }
 
 /**
- * Ensure the variation block support class name generated and added to
+ * Ensures the variation block support class name generated and added to
  * block attributes in the `render_block_data` filter gets applied to the
  * block's markup.
  *
- * @see wp_render_block_style_variation_support_styles
- *
  * @since 6.6.0
  * @access private
  *
+ * @see wp_render_block_style_variation_support_styles
+ *
  * @param  string $block_content Rendered block content.
  * @param  array  $block         Block object.
  *

diff --git a/src/wp-includes/comment.php b/src/wp-includes/comment.php
@@ -3658,7 +3658,7 @@ function wp_handle_comment_submission( $comment_data ) {
 	$comment_type = 'comment';
 
 	if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
-		if ( '' == $comment_author_email || '' == $comment_author ) {
+		if ( '' === $comment_author_email || '' === $comment_author ) {
 			return new WP_Error( 'require_name_email', __( '<strong>Error:</strong> Please fill the required fields.' ), 200 );
 		} elseif ( ! is_email( $comment_author_email ) ) {
 			return new WP_Error( 'require_valid_email', __( '<strong>Error:</strong> Please enter a valid email address.' ), 200 );