From 83e4dea52cdd62faff476cd019dd3daa3c7fae1e Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Fri, 1 Jun 2012 15:03:50 +0000
Subject: [PATCH] Fix collapse button and return link markup for theme install
 preview. Props koopersmith. fixes #20800

git-svn-id: https://develop.svn.wordpress.org/trunk@20968 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/wp-admin-rtl.dev.css                |  6 ------
 wp-admin/css/wp-admin.dev.css                    | 11 ++---------
 .../class-wp-theme-install-list-table.php        | 16 +++++++++-------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/wp-admin/css/wp-admin-rtl.dev.css b/wp-admin/css/wp-admin-rtl.dev.css
index 53b51ee91e..2a116715ad 100644
--- a/wp-admin/css/wp-admin-rtl.dev.css
+++ b/wp-admin/css/wp-admin-rtl.dev.css
@@ -1590,12 +1590,6 @@ table .column-rating {
 	right: 0;
 }
 
-/* Return and close buttons. */
-.wp-full-overlay .close-full-overlay {
-	left: auto;
-	right: 20px;
-}
-
 /* Collapse Button */
 .wp-full-overlay .collapse-sidebar {
 	left: auto;
diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index ed5c13484a..68c53348fe 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -5331,19 +5331,11 @@ body.full-overlay-active {
 	overflow: auto;
 }
 
-/* Return and close buttons. */
-.wp-full-overlay .collapse-sidebar,
+/* Close Link */
 .wp-full-overlay .close-full-overlay {
-	z-index: 50;
-	position: absolute;
 	text-decoration: none;
 }
 
-.wp-full-overlay .close-full-overlay {
-	top: 15px;
-	left: 20px;
-}
-
 /* Collapse Button */
 .wp-full-overlay .collapse-sidebar {
 	position: absolute;
@@ -5355,6 +5347,7 @@ body.full-overlay-active {
 	height: 19px;
 	padding: 0;
 	border-radius: 50%;
+	text-decoration: none;
 }
 
 .wp-full-overlay.collapsed .collapse-sidebar {
diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php
index ff98192192..c9c8055eb0 100644
--- a/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -251,17 +251,19 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	function theme_installer() {
 		?>
 		<div id="theme-installer" class="wp-full-overlay">
-			<a href="#" class="close-full-overlay"><?php printf( __( '&larr; Return to %s' ), get_admin_page_title() ); ?></a>
-			<a href="#" class="collapse-sidebar button-secondary" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
-				<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
-				<span class="collapse-sidebar-arrow"></span>
-			</a>
 			<div class="wp-full-overlay-sidebar">
-				<div class="wp-full-overlay-header"></div>
+				<div class="wp-full-overlay-header">
+					<a href="#" class="close-full-overlay"><?php _e( '&larr; Close' ); ?></a>
+				</div>
 				<div class="wp-full-overlay-sidebar-content">
 					<div class="install-theme-info"></div>
 				</div>
-				<div class="wp-full-overlay-footer"></div>
+				<div class="wp-full-overlay-footer">
+					<a href="#" class="collapse-sidebar button-secondary" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
+						<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
+						<span class="collapse-sidebar-arrow"></span>
+					</a>
+				</div>
 			</div>
 			<div class="wp-full-overlay-main"></div>
 		</div>