<!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>[22077] trunk: Fix "add media" icon in DFW for IE < 9, restore media-button.png, add media-button-2x.png and make them background images, see #21019</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/22077">22077</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-09-28 00:33:40 +0000 (Fri, 28 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix "add media" icon in DFW for IE < 9, restore media-button.png, add media-button-2x.png and make them background images, see <a href="http://core.trac.wordpress.org/ticket/21019">#21019</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminimagesmediabuttonpng">trunk/wp-admin/images/media-button.png</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpincludescsseditorcss">trunk/wp-includes/css/editor.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminimagesmediabutton2xpng">trunk/wp-admin/images/media-button-2x.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminimagesmediabutton2xpng"></a>
<div class="binary"><h4>Added: trunk/wp-admin/images/media-button-2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/wp-admin/images/media-button-2x.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkwpadminimagesmediabuttonpng"></a>
<div class="binary"><h4>Modified: trunk/wp-admin/images/media-button.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (22076 => 22077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2012-09-27 23:38:47 UTC (rev 22076)
+++ trunk/wp-admin/includes/media.php 2012-09-28 00:33:40 UTC (rev 22077)
</span><span class="lines">@@ -384,9 +384,9 @@
</span><span class="cx">
</span><span class="cx"> $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
</span><span class="cx">
</span><del>- $img = '<img src="' . esc_url( admin_url( 'images/media-button.png?ver=20111005' ) ) . '" width="16" height="16" />';
</del><ins>+ $img = '<span class="wp-media-buttons-icon"></span>';
</ins><span class="cx">
</span><del>- echo '<a href="#" class="button insert-media" data-editor="' . esc_attr( $editor_id ) . '" title="' . esc_attr__( 'Add Media' ) . '">' . $img . ' Beta Media</a>';
</del><ins>+ echo '<a href="#" class="button insert-media add_media" data-editor="' . esc_attr( $editor_id ) . '" title="' . esc_attr__( 'Add Media' ) . '">' . $img . ' Beta Media</a>';
</ins><span class="cx">
</span><span class="cx"> echo '<a href="' . esc_url( get_upload_iframe_src() ) . '" class="thickbox add_media" id="' . esc_attr( $editor_id ) . '-add_media" title="' . esc_attr__( 'Add Media' ) . '" onclick="return false;">' . sprintf( $context, $img ) . '</a>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludescsseditorcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/editor.css (22076 => 22077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/editor.css 2012-09-27 23:38:47 UTC (rev 22076)
+++ trunk/wp-includes/css/editor.css 2012-09-28 00:33:40 UTC (rev 22077)
</span><span class="lines">@@ -392,47 +392,6 @@
</span><span class="cx"> background-image: url('../images/wpicons.png?ver=20120720');
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
- .wp_themeSkin span.mce_undo,
- .wp_themeSkin span.mce_redo,
- .wp_themeSkin span.mce_bullist,
- .wp_themeSkin span.mce_numlist,
- .wp_themeSkin span.mce_blockquote,
- .wp_themeSkin span.mce_charmap,
- .wp_themeSkin span.mce_bold,
- .wp_themeSkin span.mce_italic,
- .wp_themeSkin span.mce_underline,
- .wp_themeSkin span.mce_justifyleft,
- .wp_themeSkin span.mce_justifyright,
- .wp_themeSkin span.mce_justifycenter,
- .wp_themeSkin span.mce_justifyfull,
- .wp_themeSkin span.mce_indent,
- .wp_themeSkin span.mce_outdent,
- .wp_themeSkin span.mce_link,
- .wp_themeSkin span.mce_unlink,
- .wp_themeSkin span.mce_help,
- .wp_themeSkin span.mce_removeformat,
- .wp_themeSkin span.mce_fullscreen,
- .wp_themeSkin span.mce_wp_fullscreen,
- .wp_themeSkin span.mce_media,
- .wp_themeSkin span.mce_pastetext,
- .wp_themeSkin span.mce_pasteword,
- .wp_themeSkin span.mce_wp_help,
- .wp_themeSkin span.mce_wp_adv,
- .wp_themeSkin span.mce_wp_more,
- .wp_themeSkin span.mce_strikethrough,
- .wp_themeSkin span.mce_spellchecker,
- .wp_themeSkin span.mce_forecolor,
- .wp_themeSkin .mce_forecolorpicker,
- .wp_themeSkin .mceSplitButton .mce_spellchecker span.mce_spellchecker,
- .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor,
- .wp_themeSkin .mceSplitButton span.mce_numlist,
- .wp_themeSkin .mceSplitButton span.mce_bullist {
- background-image: url('../images/wpicons-2x.png?ver=20120720');
- background-size: 560px 40px;
- }
-}
-
</del><span class="cx"> /* ColorSplitButton */
</span><span class="cx"> .wp_themeSkin div.mceColorSplitMenu table {
</span><span class="cx"> background-color: #ebebeb;
</span><span class="lines">@@ -1098,6 +1057,18 @@
</span><span class="cx"> vertical-align: middle;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.wp-media-buttons span.wp-media-buttons-icon {
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ vertical-align: text-top;
+ margin: 0 2px;
+}
+
+.wp-media-buttons .add_media span.wp-media-buttons-icon {
+ background: url('../../wp-admin/images/media-button.png') no-repeat top left;
+}
+
</ins><span class="cx"> .quicktags-toolbar {
</span><span class="cx"> border-bottom-style: solid;
</span><span class="cx"> border-bottom-width: 1px;
</span><span class="lines">@@ -1868,10 +1839,9 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#wp-fullscreen-buttons .mce_image .mce_image {
- background-image: url('../../wp-admin/images/media-button.png?ver=20120201');
- background-position: top left;
- background-size: 100%;
</del><ins>+#wp-fullscreen-buttons #wp_fs_image span.mce_image {
+ background-image: url('../../wp-admin/images/media-button.png');
+ background-position: 2px 2px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* =Thickbox Adjustments
</span><span class="lines">@@ -2049,3 +2019,52 @@
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx"> /* No RTL for now, this space intentionally left blank */
</span><span class="cx">
</span><ins>+
+/* HiDPI */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+ .wp_themeSkin span.mce_undo,
+ .wp_themeSkin span.mce_redo,
+ .wp_themeSkin span.mce_bullist,
+ .wp_themeSkin span.mce_numlist,
+ .wp_themeSkin span.mce_blockquote,
+ .wp_themeSkin span.mce_charmap,
+ .wp_themeSkin span.mce_bold,
+ .wp_themeSkin span.mce_italic,
+ .wp_themeSkin span.mce_underline,
+ .wp_themeSkin span.mce_justifyleft,
+ .wp_themeSkin span.mce_justifyright,
+ .wp_themeSkin span.mce_justifycenter,
+ .wp_themeSkin span.mce_justifyfull,
+ .wp_themeSkin span.mce_indent,
+ .wp_themeSkin span.mce_outdent,
+ .wp_themeSkin span.mce_link,
+ .wp_themeSkin span.mce_unlink,
+ .wp_themeSkin span.mce_help,
+ .wp_themeSkin span.mce_removeformat,
+ .wp_themeSkin span.mce_fullscreen,
+ .wp_themeSkin span.mce_wp_fullscreen,
+ .wp_themeSkin span.mce_media,
+ .wp_themeSkin span.mce_pastetext,
+ .wp_themeSkin span.mce_pasteword,
+ .wp_themeSkin span.mce_wp_help,
+ .wp_themeSkin span.mce_wp_adv,
+ .wp_themeSkin span.mce_wp_more,
+ .wp_themeSkin span.mce_strikethrough,
+ .wp_themeSkin span.mce_spellchecker,
+ .wp_themeSkin span.mce_forecolor,
+ .wp_themeSkin .mce_forecolorpicker,
+ .wp_themeSkin .mceSplitButton .mce_spellchecker span.mce_spellchecker,
+ .wp_themeSkin .mceSplitButton .mce_forecolor span.mce_forecolor,
+ .wp_themeSkin .mceSplitButton span.mce_numlist,
+ .wp_themeSkin .mceSplitButton span.mce_bullist {
+ background-image: url('../images/wpicons-2x.png?ver=20120720');
+ background-size: 560px 40px;
+ }
+
+ .wp-media-buttons .add_media span.wp-media-buttons-icon,
+ #wp-fullscreen-buttons #wp_fs_image span.mce_image {
+ background-image: url('../../wp-admin/images/media-button-2x.png');
+ background-size: 16px 16px;
+ }
+}
+
</ins></span></pre>
</div>
</div>
</body>
</html>