From d837ad9fa3fe51087fe14b9fb0f951f306f4def9 Mon Sep 17 00:00:00 2001
From: Helen Hou-Sandi <helen@git.wordpress.org>
Date: Fri, 8 Aug 2014 19:00:28 +0000
Subject: [PATCH] Revert [29287] based on design and core team feedback. see
 #29012.

git-svn-id: https://develop.svn.wordpress.org/trunk@29447 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/colors/_admin.scss |  9 -----
 src/wp-includes/css/media-views.css | 55 ++++++++++++++++-------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss
index 9c560ce7e2..a08296f847 100644
--- a/src/wp-admin/css/colors/_admin.scss
+++ b/src/wp-admin/css/colors/_admin.scss
@@ -416,15 +416,6 @@ ul#adminmenu > li.current > a.current:after {
 	box-shadow: 0 0 0 1px #fff, 0 0 0 2px $highlight-color;
 }
 
-.media-modal-close:hover,
-.edit-attachment-frame .edit-media-header .right:hover,
-.edit-attachment-frame .edit-media-header .left:hover,
-.media-modal-close:focus,
-.edit-attachment-frame .edit-media-header .right:focus,
-.edit-attachment-frame .edit-media-header .left:focus {
-	background: $menu-highlight-background;
-	color: $menu-highlight-text;
-}
 
 /* Themes */
 
diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index 09e7ecf2e8..d24c035563 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -140,42 +140,35 @@
 .media-modal-close {
 	position: absolute;
 	text-decoration: none;
-	top: 0;
-	right: 0;
-	width: 50px;
-	height: 50px;
+	top: 5px;
+	right: 10px;
+	width: 30px;
+	height: 30px;
 	z-index: 1000;
-	color: #777;
 	-webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
 	transition: color .1s ease-in-out, background .1s ease-in-out;
 }
 
 .media-modal-close span.media-modal-icon {
-	display: none;
+	display: block;
 	margin: 8px auto 0;
 	width: 15px;
 	height: 15px;
 	background-image: none;
 }
 
-.media-modal-close:before {
-	position: absolute;
-	top: 1px;
-	left: 11px;
-	font: normal 30px/50px 'dashicons' !important;
-	content: '\f335';
-	font-weight: 300;
+.media-modal-close .media-modal-icon:before {
+	content: '\f158';
+	font: normal 20px/1 'dashicons';
 	speak: none;
+	vertical-align: middle;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
+	color: #666;
 }
 
-.media-modal-close:focus,
-.media-modal-close:hover {
-	background: #0074a2;
-	color: #fff;
-	-webkit-box-shadow: none;
-	box-shadow: none;
+.media-modal-close:hover .media-modal-icon:before {
+	color: #2ea2cc;
 }
 
 .media-modal-close:active {
@@ -2554,9 +2547,20 @@
 	overflow: hidden;
 }
 
-.upload-php .media-modal-close:before {
-	top: 4px;
-	left: 14px;
+.upload-php .media-modal-close .media-modal-icon:before {
+	content: '\f335';
+	font-size: 30px;
+}
+
+.upload-php .media-modal-close:hover .media-modal-icon:before,
+.upload-php .media-modal-close:focus .media-modal-icon:before {
+	color: #fff;
+}
+
+.upload-php .media-modal-close .media-modal-icon {
+	margin-top: 13px;
+	width: 30px;
+	height: 30px;
 }
 
 .upload-php .media-modal-close,
@@ -2576,6 +2580,11 @@
     transition: color .1s ease-in-out, background .1s ease-in-out;
 }
 
+.upload-php .media-modal-close {
+	top: 0;
+	right: 0;
+}
+
 .edit-attachment-frame .edit-media-header .left {
 	right: 112px;
 }
@@ -2608,8 +2617,6 @@
 
 .edit-attachment-frame .edit-media-header .left.disabled,
 .edit-attachment-frame .edit-media-header .right.disabled,
-.edit-attachment-frame .edit-media-header .left.disabled:focus,
-.edit-attachment-frame .edit-media-header .right.disabled:focus,
 .edit-attachment-frame .edit-media-header .left.disabled:hover,
 .edit-attachment-frame .edit-media-header .right.disabled:hover {
 	color: #ccc;