From 1668b4ab1bd1ea662c275d8617d885df66a4f84e Mon Sep 17 00:00:00 2001
From: Matt Thomas <iammattthomas@git.wordpress.org>
Date: Tue, 26 Nov 2013 04:13:10 +0000
Subject: [PATCH] Remove button-secondary class from Collapse link in theme
 installer; unify Collapse button styles in theme installer and Customize
 screen; add a border around the Collapse icon so it remains visible on dark
 backgrounds; move the color styles to colors-fresh. Fixes #26230.

git-svn-id: https://develop.svn.wordpress.org/trunk@26389 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/colors-fresh.css                  | 14 ++++++++++++++
 src/wp-admin/css/customize-controls.css            | 12 ------------
 src/wp-admin/css/wp-admin.css                      |  1 +
 .../includes/class-wp-theme-install-list-table.php |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/wp-admin/css/colors-fresh.css b/src/wp-admin/css/colors-fresh.css
index 1bc205e4c1..197a3fbf7a 100644
--- a/src/wp-admin/css/colors-fresh.css
+++ b/src/wp-admin/css/colors-fresh.css
@@ -1312,6 +1312,20 @@ table.widefat .spam a:hover {
 	color: #fff;
 }
 
+/* Collapse button in theme preview */
+
+.wp-full-overlay a.collapse-sidebar {
+	color: #777;
+}
+
+.wp-full-overlay a.collapse-sidebar:hover {
+	color: #0074a2;
+}
+
+.wp-full-overlay .collapse-sidebar-arrow:before {
+	background: #eee;
+}
+
 /* Diff */
 
 table.diff .diff-deletedline del {
diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 601bc13f1d..3ebb07239a 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -222,18 +222,6 @@ body {
 	border-radius: 0 !important;
 }
 
-.collapse-sidebar .collapse-sidebar-label {
-	color: #ccc;
-}
-
-.collapse-sidebar .collapse-sidebar-arrow:before {
-	color: #aaa;
-}
-
-.collapse-sidebar:hover .collapse-sidebar-label,
-.collapse-sidebar:hover .collapse-sidebar-arrow:before {
-	color: #0074a2;
-}
 
 .collapse-sidebar:active,
 .collapse-sidebar:active .collapse-sidebar-label,
diff --git a/src/wp-admin/css/wp-admin.css b/src/wp-admin/css/wp-admin.css
index 15b1cf0965..e603fdbb98 100644
--- a/src/wp-admin/css/wp-admin.css
+++ b/src/wp-admin/css/wp-admin.css
@@ -7561,6 +7561,7 @@ body.full-overlay-active {
 }
 
 .wp-full-overlay .collapse-sidebar-arrow:before {
+	border-radius: 50%;
 	float: left;
 	content: "\f148";
 	font: normal 20px/1 'dashicons';
diff --git a/src/wp-admin/includes/class-wp-theme-install-list-table.php b/src/wp-admin/includes/class-wp-theme-install-list-table.php
index a4fc5ba83d..8934684c21 100644
--- a/src/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/src/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -262,7 +262,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 					<div class="install-theme-info"></div>
 				</div>
 				<div class="wp-full-overlay-footer">
-					<a href="#" class="collapse-sidebar button-secondary" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
+					<a href="#" class="collapse-sidebar" title="<?php esc_attr_e('Collapse Sidebar'); ?>">
 						<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
 						<span class="collapse-sidebar-arrow"></span>
 					</a>