<!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>[22920] trunk/wp-includes: Icons for select, deselect, and window close in the media modal.</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, #logmsg > ol { margin-left: 0; 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/22920">22920</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-11-29 14:36:12 +0000 (Thu, 29 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Icons for select, deselect, and window close in the media modal.
Props JerrySarcastic, helenyhou, ocean90, lessbloat
fixes <a href="http://core.trac.wordpress.org/ticket/22610">#22610</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescssmediaviewsrtlcss">trunk/wp-includes/css/media-views-rtl.css</a></li>
<li><a href="#trunkwpincludescssmediaviewscss">trunk/wp-includes/css/media-views.css</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescssmediaviewsrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views-rtl.css (22919 => 22920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views-rtl.css 2012-11-29 13:33:57 UTC (rev 22919)
+++ trunk/wp-includes/css/media-views-rtl.css 2012-11-29 14:36:12 UTC (rev 22920)
</span><span class="lines">@@ -4,13 +4,11 @@
</span><span class="cx"> .media-modal-title {
</span><span class="cx"> left: auto;
</span><span class="cx"> right: 0;
</span><del>- float: right;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-modal-close {
</span><span class="cx"> right: auto;
</span><span class="cx"> left: 0;
</span><del>- float: left;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (22919 => 22920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-11-29 13:33:57 UTC (rev 22919)
+++ trunk/wp-includes/css/media-views.css 2012-11-29 14:36:12 UTC (rev 22920)
</span><span class="lines">@@ -106,40 +106,29 @@
</span><span class="cx"> .media-modal-title,
</span><span class="cx"> .media-modal-close {
</span><span class="cx"> position: absolute;
</span><del>- top: -40px;
</del><span class="cx"> height: 40px;
</span><del>-
- line-height: 40px;
- color: #fff;
- font-weight: 200;
- text-shadow: 0 0 16px rgba( 0, 0, 0, 0.6 );
</del><span class="cx"> }
</span><span class="cx">
</span><del>-a.media-modal-close {
- color: #fff;
-}
-
</del><span class="cx"> .media-modal-title {
</span><ins>+ top: -40px;
</ins><span class="cx"> left: 0;
</span><del>- float: left;
</del><span class="cx"> padding: 0;
</span><span class="cx"> margin: 0;
</span><ins>+
+ line-height: 40px;
+ color: #fff;
</ins><span class="cx"> font-size: 16px;
</span><ins>+ font-weight: 200;
+ text-shadow: 0 0 16px rgba( 0, 0, 0, 0.6 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-modal-close {
</span><ins>+ top: -27px;
</ins><span class="cx"> right: 0;
</span><del>- float: right;
- text-decoration: none;
- font-size: 1.8em;
</del><ins>+ width: 15px;
+ background-position: -80px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.media-modal-close:hover,
-.media-modal-close:focus {
- color: #fff;
- text-shadow: 0 0 16px rgba( 255, 255, 255, 0.8 );
-}
-
</del><span class="cx"> .media-modal-close:active {
</span><span class="cx"> outline: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -154,6 +143,11 @@
</span><span class="cx"> background: #fff;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.media-modal-icon {
+ background-image: url(../images/uploader-icons.png);
+ background-repeat: no-repeat;
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * Toolbar
</span><span class="cx"> */
</span><span class="lines">@@ -607,6 +601,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .attachment .close {
</span><ins>+ display: none;
</ins><span class="cx"> position: absolute;
</span><span class="cx"> top: 5px;
</span><span class="cx"> right: 5px;
</span><span class="lines">@@ -618,19 +613,17 @@
</span><span class="cx"> text-align: center;
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> color: #464646;
</span><del>- background: #fff;
</del><ins>+ background-color: #fff;
+ background-position: -96px 4px;
</ins><span class="cx"> border-width: 0;
</span><ins>+ border-radius: 3px;
</ins><span class="cx"> box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.3 );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment .button:hover {
</del><ins>+.attachment .close:hover {
</ins><span class="cx"> box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.6 );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment .close {
- display: none;
-}
-
</del><span class="cx"> .attachment:hover .close {
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="lines">@@ -642,16 +635,10 @@
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: -7px;
</span><span class="cx"> right: -7px;
</span><del>- line-height: 24px;
- font-size: 16px;
- text-align: center;
- text-decoration: none;
</del><span class="cx"> outline: none;
</span><span class="cx">
</span><del>- color: #333;
</del><span class="cx"> border: 1px solid #fff;
</span><span class="cx"> border-radius: 3px;
</span><del>- text-shadow: 0 1px 0 #fff;
</del><span class="cx"> box-shadow: 0 0 0 1px rgba( 0, 0, 0, 0.4 );
</span><span class="cx">
</span><span class="cx"> background: #f1f1f1;
</span><span class="lines">@@ -662,25 +649,22 @@
</span><span class="cx"> background-image: linear-gradient(to bottom, #f1f1f1, #e1e1e1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment .check .dash {
- font-weight: bold;
- font-size: 18px;
- line-height: 22px;
</del><ins>+.attachment .check div {
+ background-position: -1px 0;
+ height: 15px;
+ width: 15px;
+ margin: 5px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment .check .dash,
-.attachment .check:hover span {
- display: none;
</del><ins>+.attachment .check:hover div {
+ background-position: -40px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.attachment.selected .check,
-.attachment .check:hover .dash {
</del><ins>+.attachment.selected .check {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .attachment.details .check {
</span><del>- color: #fff;
- text-shadow: 0 1px 0 rgba( 0, 0, 0, 0.5 );
</del><span class="cx"> box-shadow: 0 0 0 1px #1e8cbe;
</span><span class="cx">
</span><span class="cx"> background: #1e8cbe;
</span><span class="lines">@@ -691,6 +675,14 @@
</span><span class="cx"> background-image: linear-gradient(to bottom, #1e8cbe, #0074a2);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.attachment.details .check div {
+ background-position: -21px 0;
+}
+
+.attachment.details .check:hover div {
+ background-position: -60px 0;
+}
+
</ins><span class="cx"> .media-frame .describe {
</span><span class="cx"> position: relative;
</span><span class="cx"> display: block;
</span><span class="lines">@@ -703,6 +695,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * HiDPI Displays
+ */
+@media print,
+ (-o-min-device-pixel-ratio: 5/4),
+ (-webkit-min-device-pixel-ratio: 1.25),
+ (min-resolution: 120dpi) {
+ .media-modal-icon {
+ background-image: url(../images/uploader-icons-2x.png);
+ background-size: 134px 15px;
+ }
+}
+
+/**
</ins><span class="cx"> * Attachments Browser
</span><span class="cx"> */
</span><span class="cx"> .media-frame .attachments-browser {
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22919 => 22920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-11-29 13:33:57 UTC (rev 22919)
+++ trunk/wp-includes/media.php 2012-11-29 14:36:12 UTC (rev 22920)
</span><span class="lines">@@ -1507,7 +1507,7 @@
</span><span class="cx"> <script type="text/html" id="tmpl-media-modal">
</span><span class="cx"> <div class="media-modal">
</span><span class="cx"> <h3 class="media-modal-title">{{ data.title }}</h3>
</span><del>- <a class="media-modal-close" href="" title="<?php esc_attr_e('Close'); ?>">&times;</a>
</del><ins>+ <a class="media-modal-close media-modal-icon" href="#" title="<?php esc_attr_e('Close'); ?>"></a>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="media-modal-backdrop">
</span><span class="cx"> <div></div>
</span><span class="lines">@@ -1620,11 +1620,11 @@
</span><span class="cx"> <# } #>
</span><span class="cx">
</span><span class="cx"> <# if ( data.buttons.close ) { #>
</span><del>- <a class="close button" href="#">&times;</a>
</del><ins>+ <a class="close media-modal-icon" href="#" title="<?php _e('Remove'); ?>"></a>
</ins><span class="cx"> <# } #>
</span><span class="cx">
</span><span class="cx"> <# if ( data.buttons.check ) { #>
</span><del>- <a class="check" href="#"><span>&#10003;</span><span class="dash">&ndash;</span></a>
</del><ins>+ <a class="check" href="#" title="<?php _e('Deselect'); ?>"><div class="media-modal-icon"></div></a>
</ins><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span><span class="cx"> <# if ( data.describe ) { #>
</span></span></pre>
</div>
</div>
</body>
</html>