<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29447] trunk/src: Revert [29287] based on design and core team feedback.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29447">29447</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-08-08 19:00:28 +0000 (Fri, 08 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://core.trac.wordpress.org/changeset/29287">[29287]</a> based on design and core team feedback. see <a href="http://core.trac.wordpress.org/ticket/29012">#29012</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscolors_adminscss">trunk/src/wp-admin/css/colors/_admin.scss</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscolors_adminscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/colors/_admin.scss (29446 => 29447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/colors/_admin.scss 2014-08-08 03:45:55 UTC (rev 29446)
+++ trunk/src/wp-admin/css/colors/_admin.scss 2014-08-08 19:00:28 UTC (rev 29447)
</span><span class="lines">@@ -416,15 +416,6 @@
</span><span class="cx"> box-shadow: 0 0 0 1px #fff, 0 0 0 2px $highlight-color;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.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;
-}
</del><span class="cx">
</span><span class="cx"> /* Themes */
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29446 => 29447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-08-08 03:45:55 UTC (rev 29446)
+++ trunk/src/wp-includes/css/media-views.css 2014-08-08 19:00:28 UTC (rev 29447)
</span><span class="lines">@@ -140,42 +140,35 @@
</span><span class="cx"> .media-modal-close {
</span><span class="cx"> position: absolute;
</span><span class="cx"> text-decoration: none;
</span><del>- top: 0;
- right: 0;
- width: 50px;
- height: 50px;
</del><ins>+ top: 5px;
+ right: 10px;
+ width: 30px;
+ height: 30px;
</ins><span class="cx"> z-index: 1000;
</span><del>- color: #777;
</del><span class="cx"> -webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
</span><span class="cx"> transition: color .1s ease-in-out, background .1s ease-in-out;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-modal-close span.media-modal-icon {
</span><del>- display: none;
</del><ins>+ display: block;
</ins><span class="cx"> margin: 8px auto 0;
</span><span class="cx"> width: 15px;
</span><span class="cx"> height: 15px;
</span><span class="cx"> background-image: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.media-modal-close:before {
- position: absolute;
- top: 1px;
- left: 11px;
- font: normal 30px/50px 'dashicons' !important;
- content: '\f335';
- font-weight: 300;
</del><ins>+.media-modal-close .media-modal-icon:before {
+ content: '\f158';
+ font: normal 20px/1 'dashicons';
</ins><span class="cx"> speak: none;
</span><ins>+ vertical-align: middle;
</ins><span class="cx"> -webkit-font-smoothing: antialiased;
</span><span class="cx"> -moz-osx-font-smoothing: grayscale;
</span><ins>+ color: #666;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.media-modal-close:focus,
-.media-modal-close:hover {
- background: #0074a2;
- color: #fff;
- -webkit-box-shadow: none;
- box-shadow: none;
</del><ins>+.media-modal-close:hover .media-modal-icon:before {
+ color: #2ea2cc;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-modal-close:active {
</span><span class="lines">@@ -2554,11 +2547,22 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.upload-php .media-modal-close:before {
- top: 4px;
- left: 14px;
</del><ins>+.upload-php .media-modal-close .media-modal-icon:before {
+ content: '\f335';
+ font-size: 30px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.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;
+}
+
</ins><span class="cx"> .upload-php .media-modal-close,
</span><span class="cx"> .edit-attachment-frame .edit-media-header .left,
</span><span class="cx"> .edit-attachment-frame .edit-media-header .right {
</span><span class="lines">@@ -2576,6 +2580,11 @@
</span><span class="cx"> transition: color .1s ease-in-out, background .1s ease-in-out;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.upload-php .media-modal-close {
+ top: 0;
+ right: 0;
+}
+
</ins><span class="cx"> .edit-attachment-frame .edit-media-header .left {
</span><span class="cx"> right: 112px;
</span><span class="cx"> }
</span><span class="lines">@@ -2608,8 +2617,6 @@
</span><span class="cx">
</span><span class="cx"> .edit-attachment-frame .edit-media-header .left.disabled,
</span><span class="cx"> .edit-attachment-frame .edit-media-header .right.disabled,
</span><del>-.edit-attachment-frame .edit-media-header .left.disabled:focus,
-.edit-attachment-frame .edit-media-header .right.disabled:focus,
</del><span class="cx"> .edit-attachment-frame .edit-media-header .left.disabled:hover,
</span><span class="cx"> .edit-attachment-frame .edit-media-header .right.disabled:hover {
</span><span class="cx"> color: #ccc;
</span></span></pre>
</div>
</div>
</body>
</html>