Message info
 
To:wp-svn@lists.automattic.com From:m@wordpress.org Subject:[wp-svn] [20968] trunk/wp-admin: Fix collapse button and return link markup for theme install preview. Date:Fri, 1 Jun 2012 15:03:50 +0000 (UTC)
 

Revision
20968
Author
ryan
Date
2012-06-01 15:03:50 +0000 (Fri, 01 Jun 2012)

Log Message

Fix collapse button and return link markup for theme install preview. Props koopersmith. fixes #20800

Modified Paths

Diff

Modified: trunk/wp-admin/css/wp-admin-rtl.dev.css (20967 => 20968)


--- trunk/wp-admin/css/wp-admin-rtl.dev.css	2012-06-01 13:13:32 UTC (rev 20967)
+++ trunk/wp-admin/css/wp-admin-rtl.dev.css	2012-06-01 15:03:50 UTC (rev 20968)
@@ -1590,12 +1590,6 @@
 	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;

Modified: trunk/wp-admin/css/wp-admin.dev.css (20967 => 20968)


--- trunk/wp-admin/css/wp-admin.dev.css	2012-06-01 13:13:32 UTC (rev 20967)
+++ trunk/wp-admin/css/wp-admin.dev.css	2012-06-01 15:03:50 UTC (rev 20968)
@@ -5331,19 +5331,11 @@
 	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 @@
 	height: 19px;
 	padding: 0;
 	border-radius: 50%;
+	text-decoration: none;
 }
 
 .wp-full-overlay.collapsed .collapse-sidebar {

Modified: trunk/wp-admin/includes/class-wp-theme-install-list-table.php (20967 => 20968)


--- trunk/wp-admin/includes/class-wp-theme-install-list-table.php	2012-06-01 13:13:32 UTC (rev 20967)
+++ trunk/wp-admin/includes/class-wp-theme-install-list-table.php	2012-06-01 15:03:50 UTC (rev 20968)
@@ -251,17 +251,19 @@
 	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>