From 428548f388ffbafd3ac9ff8546bbdf2126a70e19 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <afercia@git.wordpress.org>
Date: Tue, 6 Dec 2016 23:11:08 +0000
Subject: [PATCH] Accessibility: Remove inappropriate content from the Themes
 screen heading.

Props joedolson.

See #26601.


git-svn-id: https://develop.svn.wordpress.org/trunk@39528 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/themes.css | 3 +--
 src/wp-admin/js/theme.js    | 6 +-----
 src/wp-admin/themes.php     | 9 +++++++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index db01ce10e1..a18a89a740 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -949,9 +949,8 @@ body.folded .theme-browser ~ .theme-overlay .theme-wrap {
 		float: none;
 		clear: both;
 		left: 0;
-		top: 0;
 		right: 0;
-		margin: 10px 0;
+		margin: -5px 0 20px 0;
 		width: 100%;
 		max-width: 280px;
 	}
diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js
index 924f299716..aa72821e85 100644
--- a/src/wp-admin/js/theme.js
+++ b/src/wp-admin/js/theme.js
@@ -83,7 +83,7 @@ themes.view.Appearance = wp.Backbone.View.extend({
 	},
 
 	// Defines search element container
-	searchContainer: $( '#wpbody h1:first' ),
+	searchContainer: $( '.search-form' ),
 
 	// Search input and view
 	// for current theme collection
@@ -1773,10 +1773,6 @@ themes.view.Installer = themes.view.Appearance.extend({
 
 	activeClass: 'current',
 
-	// Overwrite search container class to append search
-	// in new location
-	searchContainer: $( '.wp-filter .search-form' ),
-
 	/*
 	 * When users press the "Upload Theme" button, show the upload form in place.
 	 */
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index 6aa129d765..c02c17a38a 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -152,12 +152,17 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-	<h1><?php esc_html_e( 'Themes' ); ?>
+	<h1 class="wp-heading-inline"><?php esc_html_e( 'Themes' ); ?>
 		<span class="title-count theme-count"><?php echo count( $themes ); ?></span>
+	</h1>
+
 	<?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
 		<a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a>
 	<?php endif; ?>
-	</h1>
+
+	<span class="search-form"></span>
+
+	<hr class="wp-header-end">
 <?php
 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?>
 <div id="message1" class="updated notice is-dismissible"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>