<!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>[29542] trunk/src: Align and unify (most) modal and customizer icons.</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/29542">29542</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-08-19 20:37:46 +0000 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Align and unify (most) modal and customizer icons. fixes <a href="http://core.trac.wordpress.org/ticket/29147">#29147</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="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincssthemescss">trunk/src/wp-admin/css/themes.css</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 (29541 => 29542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/colors/_admin.scss 2014-08-19 19:13:08 UTC (rev 29541)
+++ trunk/src/wp-admin/css/colors/_admin.scss 2014-08-19 20:37:46 UTC (rev 29542)
</span><span class="lines">@@ -400,8 +400,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-/* Media Uploader */
</del><ins>+/* Media */
</ins><span class="cx">
</span><ins>+.media-modal-close:hover .media-modal-icon:before,
+.edit-attachment-frame .edit-media-header .right:hover,
+.edit-attachment-frame .edit-media-header .left:hover {
+ color: $link-focus;
+}
+
</ins><span class="cx"> .media-item .bar,
</span><span class="cx"> .media-progress-bar div {
</span><span class="cx"> background-color: $highlight-color;
</span><span class="lines">@@ -431,7 +437,7 @@
</span><span class="cx"> .theme-overlay .theme-header .close:hover,
</span><span class="cx"> .theme-overlay .theme-header .right:hover,
</span><span class="cx"> .theme-overlay .theme-header .left:hover {
</span><del>- background: $highlight-color;
</del><ins>+ color: $link-focus;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .theme-section.current,
</span><span class="lines">@@ -465,8 +471,7 @@
</span><span class="cx"> .theme-install-overlay .previous-theme:focus,
</span><span class="cx"> .theme-install-overlay .next-theme:hover,
</span><span class="cx"> .theme-install-overlay .next-theme:focus {
</span><del>- background-color: $menu-highlight-background;
- color: $menu-highlight-text;
</del><ins>+ color: $link-focus;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Widgets */
</span><span class="lines">@@ -492,8 +497,7 @@
</span><span class="cx"> .customize-controls-close:hover,
</span><span class="cx"> .control-panel-back:focus,
</span><span class="cx"> .control-panel-back:hover {
</span><del>- background-color: $menu-highlight-background;
- color: $menu-highlight-text;
</del><ins>+ color: $link-focus;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* jQuery UI Slider */
</span></span></pre></div>
<a id="trunksrcwpadmincsscustomizecontrolscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/customize-controls.css (29541 => 29542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/customize-controls.css 2014-08-19 19:13:08 UTC (rev 29541)
+++ trunk/src/wp-admin/css/customize-controls.css 2014-08-19 20:37:46 UTC (rev 29542)
</span><span class="lines">@@ -232,27 +232,26 @@
</span><span class="cx"> .customize-controls-close:hover,
</span><span class="cx"> .control-panel-back:focus,
</span><span class="cx"> .control-panel-back:hover {
</span><del>- background-color: #0074a2;
- color: #fff;
</del><ins>+ color: #2ea2cc;
</ins><span class="cx"> outline: none;
</span><span class="cx"> -webkit-box-shadow: none;
</span><span class="cx"> box-shadow: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .customize-controls-close:before {
</span><del>- font: normal 32px/1 dashicons;
</del><ins>+ font: normal 22px/1 dashicons;
</ins><span class="cx"> content: "\f335";
</span><span class="cx"> position: relative;
</span><del>- top: 8px;
- left: 8px;
</del><ins>+ top: 7px;
+ left: 12px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .control-panel-back:before {
</span><del>- font: normal 29px/1 dashicons;
- content: "\f340";
</del><ins>+ font: normal 20px/1 dashicons;
+ content: "\f341";
</ins><span class="cx"> position: relative;
</span><del>- top: 9px;
- left: 9px;
</del><ins>+ top: 13px;
+ left: 13px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .rtl .control-panel-back:before {
</span></span></pre></div>
<a id="trunksrcwpadmincssthemescss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/themes.css (29541 => 29542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/themes.css 2014-08-19 19:13:08 UTC (rev 29541)
+++ trunk/src/wp-admin/css/themes.css 2014-08-19 20:37:46 UTC (rev 29542)
</span><span class="lines">@@ -431,13 +431,8 @@
</span><span class="cx"> transition: color .1s ease-in-out, background .1s ease-in-out;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.theme-overlay .theme-header .close:hover:before,
-.theme-overlay .theme-header .close:focus:before {
- color: #fff;
-}
-
</del><span class="cx"> .theme-overlay .theme-header .close:before {
</span><del>- font: normal 30px/50px 'dashicons' !important;
</del><ins>+ font: normal 22px/50px 'dashicons' !important;
</ins><span class="cx"> color: #777;
</span><span class="cx"> display: inline-block;
</span><span class="cx"> content: '\f335';
</span><span class="lines">@@ -461,16 +456,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .theme-overlay .theme-header .close:hover,
</span><ins>+.theme-overlay .theme-header .close:hover:before,
+.theme-overlay .theme-header .close:focus:before,
</ins><span class="cx"> .theme-overlay .theme-header .right:hover,
</span><del>-.theme-overlay .theme-header .left:hover,
</del><ins>+.theme-overlay .theme-header .left:hover {
+ color: #2ea2cc;
+}
+
</ins><span class="cx"> .theme-overlay .theme-header .close:focus,
</span><span class="cx"> .theme-overlay .theme-header .right:focus,
</span><span class="cx"> .theme-overlay .theme-header .left:focus {
</span><del>- background: #0074a2;
- color: #fff;
- outline: none;
- -webkit-box-shadow: none;
- box-shadow: none;
</del><ins>+ color: #2ea2cc;
+ -webkit-box-shadow:
+ 0 0 0 1px #5b9dd9,
+ 0 0 2px 1px rgba(30, 140, 190, .8);
+ box-shadow:
+ 0 0 0 1px #5b9dd9,
+ 0 0 2px 1px rgba(30, 140, 190, .8);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .theme-overlay .theme-header .left.disabled,
</span><span class="lines">@@ -489,22 +491,18 @@
</span><span class="cx"> font-weight: 300;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.theme-overlay .theme-header .left:before {
- content: '\f340';
</del><ins>+.theme-overlay .theme-header .left:before,
+.rtl .theme-overlay .theme-header .right:before {
+ content: '\f341';
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.theme-overlay .theme-header .right:before {
- content: '\f344';
-}
-
</del><ins>+.theme-overlay .theme-header .right:before,
</ins><span class="cx"> .rtl .theme-overlay .theme-header .left:before {
</span><span class="cx"> content: '\f345';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.rtl .theme-overlay .theme-header .right:before {
- content: '\f341';
-}
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> .theme-overlay .theme-wrap {
</span><span class="cx"> clear: both;
</span><span class="cx"> position: fixed;
</span><span class="lines">@@ -1400,24 +1398,23 @@
</span><span class="cx"> .theme-install-overlay .previous-theme:focus,
</span><span class="cx"> .theme-install-overlay .next-theme:hover,
</span><span class="cx"> .theme-install-overlay .next-theme:focus {
</span><del>- background-color: #0074a2;
- color: #fff;
</del><ins>+ color: #2ea2cc;
</ins><span class="cx"> outline: none;
</span><span class="cx"> -webkit-box-shadow: none;
</span><span class="cx"> box-shadow: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .theme-install-overlay .close-full-overlay:before {
</span><del>- font: normal 30px/1 dashicons;
</del><ins>+ font: normal 22px/1 dashicons;
</ins><span class="cx"> content: "\f335";
</span><span class="cx"> position: relative;
</span><del>- top: 9px;
- left: 9px;
</del><ins>+ top: 7px;
+ left: 12px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .theme-install-overlay .previous-theme:before {
</span><span class="cx"> font: normal 20px/1 dashicons;
</span><del>- content: "\f340";
</del><ins>+ content: "\f341";
</ins><span class="cx"> position: relative;
</span><span class="cx"> top: 6px;
</span><span class="cx"> left: 14px;
</span><span class="lines">@@ -1425,7 +1422,7 @@
</span><span class="cx">
</span><span class="cx"> .theme-install-overlay .next-theme:before {
</span><span class="cx"> font: normal 20px/1 dashicons;
</span><del>- content: "\f344";
</del><ins>+ content: "\f345";
</ins><span class="cx"> position: relative;
</span><span class="cx"> top: 6px;
</span><span class="cx"> left: 13px;
</span><span class="lines">@@ -1443,11 +1440,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .rtl .theme-install-overlay .previous-theme:before {
</span><del>- content: "\f344";
</del><ins>+ content: "\f345";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .rtl .theme-install-overlay .next-theme:before {
</span><del>- content: "\f340";
</del><ins>+ content: "\f341";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Collapse Button */
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29541 => 29542)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-08-19 19:13:08 UTC (rev 29541)
+++ trunk/src/wp-includes/css/media-views.css 2014-08-19 20:37:46 UTC (rev 29542)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> .media-modal-close {
</span><span class="cx"> position: absolute;
</span><span class="cx"> text-decoration: none;
</span><del>- top: 5px;
</del><ins>+ top: 10px;
</ins><span class="cx"> right: 10px;
</span><span class="cx"> width: 30px;
</span><span class="cx"> height: 30px;
</span><span class="lines">@@ -149,12 +149,17 @@
</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>+.media-modal-close:active {
+ box-shadow: none;
+}
+
</ins><span class="cx"> .media-modal-close span.media-modal-icon {
</span><span class="cx"> display: block;
</span><del>- margin: 8px auto 0;
- width: 15px;
</del><ins>+ margin-top: 5px;
+ width: 30px;
</ins><span class="cx"> height: 15px;
</span><span class="cx"> background-image: none;
</span><ins>+ text-align: center;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-modal-close .media-modal-icon:before {
</span><span class="lines">@@ -494,7 +499,7 @@
</span><span class="cx"> right: 0;
</span><span class="cx"> bottom: 0;
</span><span class="cx"> margin: 0;
</span><del>- padding: 16px 0;
</del><ins>+ padding: 10px 0;
</ins><span class="cx"> background: #f3f3f3;
</span><span class="cx"> border-right-width: 1px;
</span><span class="cx"> border-right-style: solid;
</span><span class="lines">@@ -619,13 +624,13 @@
</span><span class="cx"> top: 0;
</span><span class="cx"> left: 200px;
</span><span class="cx"> right: 0;
</span><del>- height: 56px;
</del><ins>+ height: 50px;
</ins><span class="cx"> z-index: 200;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-frame-router {
</span><span class="cx"> position: absolute;
</span><del>- top: 56px;
</del><ins>+ top: 50px;
</ins><span class="cx"> left: 200px;
</span><span class="cx"> right: 0;
</span><span class="cx"> height: 36px;
</span><span class="lines">@@ -634,7 +639,7 @@
</span><span class="cx">
</span><span class="cx"> .media-frame-content {
</span><span class="cx"> position: absolute;
</span><del>- top: 90px;
</del><ins>+ top: 84px;
</ins><span class="cx"> left: 200px;
</span><span class="cx"> right: 0;
</span><span class="cx"> bottom: 61px;
</span><span class="lines">@@ -676,7 +681,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-frame.hide-router .media-frame-content {
</span><del>- top: 56px;
</del><ins>+ top: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-frame.hide-router .media-frame-router {
</span><span class="lines">@@ -696,7 +701,7 @@
</span><span class="cx"> .media-frame-title h1 {
</span><span class="cx"> padding: 0 16px;
</span><span class="cx"> font-size: 22px;
</span><del>- line-height: 60px;
</del><ins>+ line-height: 50px;
</ins><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2287,7 +2292,7 @@
</span><span class="cx">
</span><span class="cx"> .media-frame .media-frame-title .dashicons {
</span><span class="cx"> display: inline-block;
</span><del>- line-height: 56px;
</del><ins>+ line-height: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-frame .media-frame-title h1 {
</span><span class="lines">@@ -2717,18 +2722,12 @@
</span><span class="cx">
</span><span class="cx"> .upload-php .media-modal-close .media-modal-icon:before {
</span><span class="cx"> content: '\f335';
</span><del>- font-size: 30px;
</del><ins>+ font-size: 22px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.upload-php .media-modal-close:hover .media-modal-icon:before,
-.upload-php .media-modal-close:focus .media-modal-icon:before {
- color: #fff;
-}
-
</del><span class="cx"> .upload-php .media-modal-close .media-modal-icon {
</span><del>- margin-top: 13px;
- width: 30px;
- height: 30px;
</del><ins>+ margin: 14px;
+ width: 22px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .upload-php .media-modal-close,
</span><span class="lines">@@ -2737,8 +2736,8 @@
</span><span class="cx"> cursor: pointer;
</span><span class="cx"> color: #777;
</span><span class="cx"> background-color: transparent;
</span><del>- height: 56px;
- width: 56px;
</del><ins>+ height: 50px;
+ width: 50px;
</ins><span class="cx"> padding: 0;
</span><span class="cx"> position: absolute;
</span><span class="cx"> text-align: center;
</span><span class="lines">@@ -2754,16 +2753,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .edit-attachment-frame .edit-media-header .left {
</span><del>- right: 112px;
</del><ins>+ right: 102px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .edit-attachment-frame .edit-media-header .right {
</span><del>- right: 56px;
</del><ins>+ right: 51px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .edit-attachment-frame .media-frame-title {
</span><span class="cx"> left: 0;
</span><del>- right: 170px; /* leave space for prev/next/close */
</del><ins>+ right: 150px; /* leave space for prev/next/close */
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .edit-attachment-frame .edit-media-header .right:before,
</span><span class="lines">@@ -2773,14 +2772,19 @@
</span><span class="cx"> font-weight: 300;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.edit-attachment-frame .edit-media-header .right:hover,
+.edit-attachment-frame .edit-media-header .left:hover {
+ color: #2ea2cc;
+}
+
</ins><span class="cx"> .edit-attachment-frame .edit-media-header .left:before,
</span><span class="cx"> .rtl .edit-attachment-frame .edit-media-header .right:before {
</span><del>- content: '\f340';
</del><ins>+ content: '\f341';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .edit-attachment-frame .edit-media-header .right:before,
</span><span class="cx"> .rtl .edit-attachment-frame .edit-media-header .left:before {
</span><del>- content: '\f344';
</del><ins>+ content: '\f345';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .edit-attachment-frame .edit-media-header .left.disabled,
</span><span class="lines">@@ -2789,22 +2793,9 @@
</span><span class="cx"> .edit-attachment-frame .edit-media-header .right.disabled:hover {
</span><span class="cx"> color: #ccc;
</span><span class="cx"> background: inherit;
</span><del>- cursor: inherit;
</del><ins>+ cursor: default;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.upload-php .media-modal-close:hover,
-.edit-attachment-frame .edit-media-header .right:hover,
-.edit-attachment-frame .edit-media-header .left:hover,
-.upload-php .media-modal-close:focus,
-.edit-attachment-frame .edit-media-header .right:focus,
-.edit-attachment-frame .edit-media-header .left:focus {
- background: #0074a2;
- color: #fff;
- outline: none;
- -webkit-box-shadow: none;
- box-shadow: none;
-}
-
</del><span class="cx"> .edit-attachment-frame .media-frame-content,
</span><span class="cx"> .edit-attachment-frame .media-frame-router {
</span><span class="cx"> left: 0;
</span><span class="lines">@@ -2813,7 +2804,7 @@
</span><span class="cx"> .edit-attachment-frame .media-frame-content {
</span><span class="cx"> border-bottom: none;
</span><span class="cx"> bottom: 0;
</span><del>- top: 56px;
</del><ins>+ top: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .edit-attachment-frame .attachment-details {
</span></span></pre>
</div>
</div>
</body>
</html>