From d4005958ec163bd934fa0ff12991993efc343044 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 1 Mar 2012 23:55:09 +0000
Subject: [PATCH] Line up elements on themes.php. Line up 'Available Themes'
 header and search/feature form. Switch to padding instead of margin for
 #current-theme to prevent margin-uncollapse jitters when animating the
 feature filter. Move 'Current Theme' inside #current-theme so it is hidden by
 the feature filter. see #20147.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/css/wp-admin.dev.css | 13 ++++++-------
 wp-admin/themes.php           |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index 3b9dca7e3..682467bec 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -4475,6 +4475,11 @@ span.imgedit-scale-warn {
 	height:auto;
 }
 
+h3.available-themes {
+	margin: 0 0 1em;
+	float: left;
+}
+
 .available-theme {
 	display: inline-block;
 	margin-bottom: 10px;
@@ -4504,19 +4509,13 @@ span.imgedit-scale-warn {
 }
 
 #current-theme {
-	margin: 1em 0 1.5em;
+	padding: 0 0 .5em;
 }
 
 #current-theme a {
 	border-bottom: none;
 }
 
-#current-theme h3 {
-	font-size: 17px;
-	font-weight: normal;
-	margin: 0;
-}
-
 #current-theme .theme-description {
 	margin-top: 5px;
 }
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 42967667c..6af9454ca 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -97,8 +97,8 @@ if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
 <?php endif; ?>
 </h2>
 <?php $ct = wp_get_theme(); ?>
-<h3><?php _e( 'Current Theme' ); ?></h3>
 <div id="current-theme">
+<h3><?php _e( 'Current Theme' ); ?></h3>
 <?php if ( $screenshot = $ct->get_screenshot() ) : ?>
 <img src="<?php echo esc_url( $screenshot ); ?>" alt="<?php esc_attr_e( 'Current theme preview'); ?>" />
 <?php endif; ?>
@@ -154,7 +154,7 @@ if ( ! current_user_can( 'switch_themes' ) ) {
 }
 ?>
 
-<h3><?php _e('Available Themes'); ?></h3>
+<h3 class="available-themes"><?php _e('Available Themes'); ?></h3>
 
 <?php if ( !empty( $_REQUEST['s'] ) || !empty( $_REQUEST['filter'] ) || $wp_list_table->has_items() ) : ?>