Ticket #40331: 40331.5.diff

src/js/_enqueues/wp/theme.js

@@ -118 +118 @@
                 // Render and append after screen title.
                 view.render();
                 this.searchContainer
-                        .append( $.parseHTML( '<label class="screen-reader-text" for="wp-filter-search-input">' + l10n.search + '</label>' ) )
+                        .append( $.parseHTML( '<label for="wp-filter-search-input">' + l10n.search + '</label>' ) )
                         .append( view.el )
                         .on( 'submit', function( event ) {
                                 event.preventDefault();
@@ -1359 +1359 @@
         searching: false,
 
         attributes: {
-                placeholder: l10n.searchPlaceholder,
                 type: 'search',
                 'aria-describedby': 'live-search-desc'
         },

src/wp-admin/css/themes.css

@@ -27 +27 @@
         margin-left: 20px;
 }
 
+.themes-php .themes-search-tools {
+        display: inline-flex;
+        gap: .5rem;
+        align-items: center;
+        position: relative;
+        top: -3px;
+}
+
 /* Search form */
 .themes-php .search-form {
-        display: inline;
+        display: inline-flex;
+        align-items: center;
+        position: relative;
+        top: 0;
+        gap: .5rem;
 }
 
+.themes-php .page-title-action {
+        top: 0;
+        margin-left: 0;
+}
+
 .themes-php .wp-filter-search {
         position: relative;
-        top: -2px;
-        left: 20px;
         margin: 0;
         width: 280px;
 }
@@ -955 +970 @@
                 clear: both;
                 left: 0;
                 right: 0;
-                margin: -5px 0 20px;
                 width: 100%;
                 max-width: 280px;
         }
 
+        .themes-php .themes-search-tools {
+                align-items: flex-end;
+                flex-wrap: wrap;
+        }
+
+        .themes-php .themes-search-tools .page-title-action {
+                align-items: flex-end;
+                top: 0;
+        }
+
         .theme-browser .theme.add-new-theme span:after {
                 font: normal 60px/90px dashicons;
                 width: 80px;
@@ -1029 +1053 @@
         padding-left: 20px;
 }
 
+.theme-install-php .wp-filter .search-form {
+        margin: 10px 0;
+}
+
 .theme-install-php a.upload,
 .theme-install-php a.browse-themes {
         cursor: pointer;

src/wp-admin/network/site-themes.php

@@ -237 +237 @@
 <p><?php _e( 'Network enabled themes are not shown on this screen.' ); ?></p>
 
 <form method="get">
-<?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>
+<?php $wp_list_table->search_box( __( 'Search installed themes' ), 'theme' ); ?>
 <input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
 </form>
 

src/wp-admin/network/themes.php

@@ -460 +460 @@
 ?>
 
 <form method="get">
-<?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>
+<?php $wp_list_table->search_box( __( 'Search installed themes' ), 'theme' ); ?>
 </form>
 
 <?php

src/wp-admin/theme-install.php

@@ -56 +56 @@
                 'l10n'            => array(
                         'addNew'              => __( 'Add New Theme' ),
                         'search'              => __( 'Search Themes' ),
-                        'searchPlaceholder'   => __( 'Search themes...' ), // Placeholder (no ellipsis).
                         'upload'              => __( 'Upload Theme' ),
                         'back'                => __( 'Back' ),
                         'error'               => sprintf(

src/wp-admin/themes.php

@@ -232 +232 @@
                 ),
                 'l10n'     => array(
                         'addNew'            => __( 'Add New Theme' ),
-                        'search'            => __( 'Search Installed Themes' ),
-                        'searchPlaceholder' => __( 'Search installed themes...' ), // Placeholder (no ellipsis).
+                        'search'            => __( 'Search installed themes' ),
                         /* translators: %d: Number of themes. */
                         'themesFound'       => __( 'Number of Themes found: %d' ),
                         'noThemesFound'     => __( 'No themes found. Try a different search.' ),
@@ -252 +251 @@
         <h1 class="wp-heading-inline"><?php esc_html_e( 'Themes' ); ?>
                 <span class="title-count theme-count"><?php echo ! empty( $_GET['search'] ) ? __( '&hellip;' ) : count( $themes ); ?></span>
         </h1>
+        <div class="themes-search-tools">
+                <form class="search-form"></form>
 
-        <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
-                <a href="<?php echo esc_url( admin_url( 'theme-install.php' ) ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html__( 'Add New Theme' ); ?></a>
-        <?php endif; ?>
-
-        <form class="search-form"></form>
-
+                <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
+                        <a href="<?php echo esc_url( admin_url( 'theme-install.php' ) ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html__( 'Add New Theme' ); ?></a>
+                <?php endif; ?>
+        </div>
         <hr class="wp-header-end">
 <?php
 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) {