<!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>[22393] trunk/wp-admin: HiDPI versions of the generic menu page icon.</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/22393">22393</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-11-06 00:25:18 +0000 (Tue, 06 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>HiDPI versions of the generic menu page icon. props empireoflight, lessbloat. see <a href="http://core.trac.wordpress.org/ticket/21019">#21019</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsscolorsclassiccss">trunk/wp-admin/css/colors-classic.css</a></li>
<li><a href="#trunkwpadmincsscolorsfreshcss">trunk/wp-admin/css/colors-fresh.css</a></li>
<li><a href="#trunkwpadminimagesicons322xpng">trunk/wp-admin/images/icons32-2x.png</a></li>
<li><a href="#trunkwpadminimagesicons32vs2xpng">trunk/wp-admin/images/icons32-vs-2x.png</a></li>
<li><a href="#trunkwpadminimagesicons32vspng">trunk/wp-admin/images/icons32-vs.png</a></li>
<li><a href="#trunkwpadminimagesicons32png">trunk/wp-admin/images/icons32.png</a></li>
<li><a href="#trunkwpadminimagesmenuvspng">trunk/wp-admin/images/menu-vs.png</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsscolorsclassiccss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-classic.css (22392 => 22393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-classic.css 2012-11-06 00:06:44 UTC (rev 22392)
+++ trunk/wp-admin/css/colors-classic.css 2012-11-06 00:25:18 UTC (rev 22393)
</span><span class="lines">@@ -1090,8 +1090,10 @@
</span><span class="cx"> .icon16.icon-settings,
</span><span class="cx"> .menu-icon-settings div.wp-menu-image,
</span><span class="cx"> .icon16.icon-site,
</span><del>-.menu-icon-site div.wp-menu-image {
- background-image: url('../images/menu-vs.png?ver=20120201');
</del><ins>+.menu-icon-site div.wp-menu-image,
+.icon16.icon-generic,
+.menu-icon-generic div.wp-menu-image {
+ background-image: url(../images/menu-vs.png?ver=20121105);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .icon16.icon-dashboard,
</span><span class="lines">@@ -1225,6 +1227,17 @@
</span><span class="cx"> #adminmenu .menu-icon-site.current div.wp-menu-image {
</span><span class="cx"> background-position: -359px -1px;
</span><span class="cx"> }
</span><ins>+
+.icon16.icon-generic,
+#adminmenu .menu-icon-generic div.wp-menu-image {
+ background-position: -330px -34px;
+}
+
+#adminmenu .menu-icon-generic:hover div.wp-menu-image,
+#adminmenu .menu-icon-generic.wp-has-current-submenu div.wp-menu-image,
+#adminmenu .menu-icon-generic.current div.wp-menu-image {
+ background-position: -330px -2px;
+}
</ins><span class="cx"> /* end menu and screen icons */
</span><span class="cx">
</span><span class="cx"> /* Screen Icons */
</span><span class="lines">@@ -1258,8 +1271,10 @@
</span><span class="cx"> .icon32.icon-settings,
</span><span class="cx"> #icon-options-general,
</span><span class="cx"> .icon32.icon-site,
</span><del>-#icon-ms-admin {
- background-image: url(../images/icons32-vs.png?ver=20111206);
</del><ins>+#icon-ms-admin,
+.icon32.icon-generic,
+#icon-generic {
+ background-image: url(../images/icons32-vs.png?ver=20121105);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .icon32.icon-post,
</span><span class="lines">@@ -1329,6 +1344,11 @@
</span><span class="cx"> background-position: -659px -5px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.icon32.icon-generic,
+#icon-generic {
+ background-position: -708px -5px;
+}
+
</ins><span class="cx"> /* end screen icons */
</span><span class="cx">
</span><span class="cx"> /* Diff */
</span><span class="lines">@@ -2077,9 +2097,11 @@
</span><span class="cx"> .icon32.icon-settings,
</span><span class="cx"> #icon-options-general,
</span><span class="cx"> .icon32.icon-site,
</span><del>- #icon-ms-admin {
- background-image: url("../images/icons32-vs-2x.png?ver=20120916");
- background-size: 708px 45px;
</del><ins>+ #icon-ms-admin,
+ .icon32.icon-generic,
+ #icon-generic {
+ background-image: url(../images/icons32-vs-2x.png?ver=20121105);
+ background-size: 756px 45px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .icon16.icon-dashboard,
</span><span class="lines">@@ -2105,8 +2127,10 @@
</span><span class="cx"> .icon16.icon-settings,
</span><span class="cx"> .menu-icon-settings div.wp-menu-image,
</span><span class="cx"> .icon16.icon-site,
</span><del>- .menu-icon-site div.wp-menu-image {
- background-image: url("../images/menu-2x.png?ver=20120916"); // @todo needs menu-vs-2x.png
</del><ins>+ .menu-icon-site div.wp-menu-image,
+ .icon16.icon-generic,
+ .menu-icon-generic div.wp-menu-image {
+ background-image: url(../images/menu-vs-2x.png?ver=20121105);
</ins><span class="cx"> background-size: 390px 64px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmincsscolorsfreshcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/colors-fresh.css (22392 => 22393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/colors-fresh.css 2012-11-06 00:06:44 UTC (rev 22392)
+++ trunk/wp-admin/css/colors-fresh.css 2012-11-06 00:25:18 UTC (rev 22393)
</span><span class="lines">@@ -1046,8 +1046,10 @@
</span><span class="cx"> .icon16.icon-settings,
</span><span class="cx"> .menu-icon-settings div.wp-menu-image,
</span><span class="cx"> .icon16.icon-site,
</span><del>-.menu-icon-site div.wp-menu-image {
- background-image: url('../images/menu.png?ver=20120201');
</del><ins>+.menu-icon-site div.wp-menu-image,
+.icon16.icon-generic,
+.menu-icon-generic div.wp-menu-image {
+ background-image: url(../images/menu.png?ver=20121105);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .icon16.icon-dashboard,
</span><span class="lines">@@ -1181,6 +1183,18 @@
</span><span class="cx"> #adminmenu .menu-icon-site.current div.wp-menu-image {
</span><span class="cx"> background-position: -359px -1px;
</span><span class="cx"> }
</span><ins>+
+.icon16.icon-generic,
+#adminmenu .menu-icon-generic div.wp-menu-image {
+ background-position: -330px -34px;
+}
+
+#adminmenu .menu-icon-generic:hover div.wp-menu-image,
+#adminmenu .menu-icon-generic.wp-has-current-submenu div.wp-menu-image,
+#adminmenu .menu-icon-generic.current div.wp-menu-image {
+ background-position: -330px -2px;
+}
+
</ins><span class="cx"> /* end menu and screen icons */
</span><span class="cx">
</span><span class="cx"> /* Screen Icons */
</span><span class="lines">@@ -1214,8 +1228,10 @@
</span><span class="cx"> .icon32.icon-settings,
</span><span class="cx"> #icon-options-general,
</span><span class="cx"> .icon32.icon-site,
</span><del>-#icon-ms-admin {
- background-image: url(../images/icons32.png?ver=20111206);
</del><ins>+#icon-ms-admin,
+.icon32.icon-generic,
+#icon-generic {
+ background-image: url(../images/icons32.png?ver=20121105);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .icon32.icon-post,
</span><span class="lines">@@ -1285,6 +1301,11 @@
</span><span class="cx"> background-position: -659px -5px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.icon32.icon-generic,
+#icon-generic {
+ background-position: -708px -5px;
+}
+
</ins><span class="cx"> /* end screen icons */
</span><span class="cx">
</span><span class="cx"> /* Diff */
</span><span class="lines">@@ -1955,9 +1976,11 @@
</span><span class="cx"> .icon32.icon-settings,
</span><span class="cx"> #icon-options-general,
</span><span class="cx"> .icon32.icon-site,
</span><del>- #icon-ms-admin {
- background-image: url("../images/icons32-2x.png?ver=20120916");
- background-size: 708px 45px;
</del><ins>+ #icon-ms-admin,
+ .icon32.icon-generic,
+ #icon-generic {
+ background-image: url(../images/icons32-2x.png?ver=20121105);
+ background-size: 756px 45px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .icon16.icon-dashboard,
</span><span class="lines">@@ -1983,8 +2006,10 @@
</span><span class="cx"> .icon16.icon-settings,
</span><span class="cx"> .menu-icon-settings div.wp-menu-image,
</span><span class="cx"> .icon16.icon-site,
</span><del>- .menu-icon-site div.wp-menu-image {
- background-image: url("../images/menu-2x.png?ver=20120916");
</del><ins>+ .menu-icon-site div.wp-menu-image,
+ .icon16.icon-generic,
+ .menu-icon-generic div.wp-menu-image {
+ background-image: url(../images/menu-2x.png?ver=20121105);
</ins><span class="cx"> background-size: 390px 64px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminimagesicons322xpng"></a>
<div class="binary"><h4>Modified: trunk/wp-admin/images/icons32-2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkwpadminimagesicons32vs2xpng"></a>
<div class="binary"><h4>Modified: trunk/wp-admin/images/icons32-vs-2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkwpadminimagesicons32vspng"></a>
<div class="binary"><h4>Modified: trunk/wp-admin/images/icons32-vs.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkwpadminimagesicons32png"></a>
<div class="binary"><h4>Modified: trunk/wp-admin/images/icons32.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkwpadminimagesmenuvspng"></a>
<div class="binary"><h4>Modified: trunk/wp-admin/images/menu-vs.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (22392 => 22393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2012-11-06 00:06:44 UTC (rev 22392)
+++ trunk/wp-admin/includes/plugin.php 2012-11-06 00:25:18 UTC (rev 22393)
</span><span class="lines">@@ -902,12 +902,15 @@
</span><span class="cx"> if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
</span><span class="cx"> add_action( $hookname, $function );
</span><span class="cx">
</span><del>- if ( empty($icon_url) )
- $icon_url = esc_url( admin_url( 'images/generic.png' ) );
- else
</del><ins>+ if ( empty($icon_url) ) {
+ $icon_url = 'none';
+ $icon_class = 'menu-icon-generic ';
+ } else {
</ins><span class="cx"> $icon_url = set_url_scheme( $icon_url );
</span><ins>+ $icon_class = '';
+ }
</ins><span class="cx">
</span><del>- $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
</del><ins>+ $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url );
</ins><span class="cx">
</span><span class="cx"> if ( null === $position )
</span><span class="cx"> $menu[] = $new_menu;
</span></span></pre>
</div>
</div>
</body>
</html>