Changeset 22393

Timestamp:

11/06/2012 12:25:18 AM (12 years ago)

Author:

nacin

Message:

HiDPI versions of the generic menu page icon. props empireoflight, lessbloat. see #21019.

Location:

trunk/wp-admin

Files:

• css/colors-classic.css (modified) (6 diffs)
• css/colors-fresh.css (modified) (6 diffs)
• images/icons32-2x.png (modified) (previous)
• images/icons32-vs-2x.png (modified) (previous)
• images/icons32-vs.png (modified) (previous)
• images/icons32.png (modified) (previous)
• images/menu-vs.png (modified) (previous)
• includes/plugin.php (modified) (1 diff)

trunk/wp-admin/css/colors-classic.css

@@ -1091 +1091 @@
 .menu-icon-settings div.wp-menu-image,
 .icon16.icon-site,
-.menu-icon-site div.wp-menu-image {
-    background-image: url('../images/menu-vs.png?ver=20120201');
+.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);
 }
 
@@ -1225 +1227 @@
 #adminmenu .menu-icon-site.current div.wp-menu-image {
     background-position: -359px -1px;
+}
+
+.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;
 }
 /* end menu and screen icons */
@@ -1259 +1272 @@
 #icon-options-general,
 .icon32.icon-site,
-#icon-ms-admin {
-    background-image: url(../images/icons32-vs.png?ver=20111206);
+#icon-ms-admin,
+.icon32.icon-generic,
+#icon-generic {
+    background-image: url(../images/icons32-vs.png?ver=20121105);
 }
 
@@ -1328 +1343 @@
 #icon-ms-admin {
     background-position: -659px -5px;
+}
+
+.icon32.icon-generic,
+#icon-generic {
+    background-position: -708px -5px;
 }
 
@@ -2078 +2098 @@
     #icon-options-general,
     .icon32.icon-site,
-    #icon-ms-admin {
-        background-image: url("../images/icons32-vs-2x.png?ver=20120916");
-        background-size: 708px 45px;
+    #icon-ms-admin,
+    .icon32.icon-generic,
+    #icon-generic {
+        background-image: url(../images/icons32-vs-2x.png?ver=20121105);
+        background-size: 756px 45px;
     }
 
@@ -2106 +2128 @@
     .menu-icon-settings div.wp-menu-image,
     .icon16.icon-site,
-    .menu-icon-site div.wp-menu-image {
-        background-image: url("../images/menu-2x.png?ver=20120916"); // @todo needs menu-vs-2x.png
+    .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);
         background-size: 390px 64px;
     }

trunk/wp-admin/css/colors-fresh.css

@@ -1047 +1047 @@
 .menu-icon-settings div.wp-menu-image,
 .icon16.icon-site,
-.menu-icon-site div.wp-menu-image {
-    background-image: url('../images/menu.png?ver=20120201');
+.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);
 }
 
@@ -1182 +1184 @@
     background-position: -359px -1px;
 }
+
+.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;
+}
+
 /* end menu and screen icons */
 
@@ -1215 +1229 @@
 #icon-options-general,
 .icon32.icon-site,
-#icon-ms-admin {
-    background-image: url(../images/icons32.png?ver=20111206);
+#icon-ms-admin,
+.icon32.icon-generic,
+#icon-generic {
+    background-image: url(../images/icons32.png?ver=20121105);
 }
 
@@ -1284 +1300 @@
 #icon-ms-admin {
     background-position: -659px -5px;
+}
+
+.icon32.icon-generic,
+#icon-generic {
+    background-position: -708px -5px;
 }
 
@@ -1956 +1977 @@
     #icon-options-general,
     .icon32.icon-site,
-    #icon-ms-admin {
-        background-image: url("../images/icons32-2x.png?ver=20120916");
-        background-size: 708px 45px;
+    #icon-ms-admin,
+    .icon32.icon-generic,
+    #icon-generic {
+        background-image: url(../images/icons32-2x.png?ver=20121105);
+        background-size: 756px 45px;
     }
 
@@ -1984 +2007 @@
     .menu-icon-settings div.wp-menu-image,
     .icon16.icon-site,
-    .menu-icon-site div.wp-menu-image {
-        background-image: url("../images/menu-2x.png?ver=20120916");
+    .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);
         background-size: 390px 64px;
     }

trunk/wp-admin/includes/plugin.php

@@ -903 +903 @@
         add_action( $hookname, $function );
 
-    if ( empty($icon_url) )
-        $icon_url = esc_url( admin_url( 'images/generic.png' ) );
-    else
+    if ( empty($icon_url) ) {
+        $icon_url = 'none';
+        $icon_class = 'menu-icon-generic ';
+    } else {
         $icon_url = set_url_scheme( $icon_url );
-
-    $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
+        $icon_class = '';
+    }
+
+    $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url );
 
     if ( null === $position )