WordPress.org

Make WordPress Core

Changeset 22393


Ignore:
Timestamp:
11/06/2012 12:25:18 AM (7 years ago)
Author:
nacin
Message:

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

Location:
trunk/wp-admin
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/css/colors-classic.css

    r22391 r22393  
    10911091.menu-icon-settings div.wp-menu-image,
    10921092.icon16.icon-site,
    1093 .menu-icon-site div.wp-menu-image {
    1094     background-image: url('../images/menu-vs.png?ver=20120201');
     1093.menu-icon-site div.wp-menu-image,
     1094.icon16.icon-generic,
     1095.menu-icon-generic div.wp-menu-image {
     1096    background-image: url(../images/menu-vs.png?ver=20121105);
    10951097}
    10961098
     
    12251227#adminmenu .menu-icon-site.current div.wp-menu-image {
    12261228    background-position: -359px -1px;
     1229}
     1230
     1231.icon16.icon-generic,
     1232#adminmenu .menu-icon-generic div.wp-menu-image {
     1233    background-position: -330px -34px;
     1234}
     1235
     1236#adminmenu .menu-icon-generic:hover div.wp-menu-image,
     1237#adminmenu .menu-icon-generic.wp-has-current-submenu div.wp-menu-image,
     1238#adminmenu .menu-icon-generic.current div.wp-menu-image {
     1239    background-position: -330px -2px;
    12271240}
    12281241/* end menu and screen icons */
     
    12591272#icon-options-general,
    12601273.icon32.icon-site,
    1261 #icon-ms-admin {
    1262     background-image: url(../images/icons32-vs.png?ver=20111206);
     1274#icon-ms-admin,
     1275.icon32.icon-generic,
     1276#icon-generic {
     1277    background-image: url(../images/icons32-vs.png?ver=20121105);
    12631278}
    12641279
     
    13281343#icon-ms-admin {
    13291344    background-position: -659px -5px;
     1345}
     1346
     1347.icon32.icon-generic,
     1348#icon-generic {
     1349    background-position: -708px -5px;
    13301350}
    13311351
     
    20782098    #icon-options-general,
    20792099    .icon32.icon-site,
    2080     #icon-ms-admin {
    2081         background-image: url("../images/icons32-vs-2x.png?ver=20120916");
    2082         background-size: 708px 45px;
     2100    #icon-ms-admin,
     2101    .icon32.icon-generic,
     2102    #icon-generic {
     2103        background-image: url(../images/icons32-vs-2x.png?ver=20121105);
     2104        background-size: 756px 45px;
    20832105    }
    20842106
     
    21062128    .menu-icon-settings div.wp-menu-image,
    21072129    .icon16.icon-site,
    2108     .menu-icon-site div.wp-menu-image {
    2109         background-image: url("../images/menu-2x.png?ver=20120916"); // @todo needs menu-vs-2x.png
     2130    .menu-icon-site div.wp-menu-image,
     2131    .icon16.icon-generic,
     2132    .menu-icon-generic div.wp-menu-image {
     2133        background-image: url(../images/menu-vs-2x.png?ver=20121105);
    21102134        background-size: 390px 64px;
    21112135    }
  • trunk/wp-admin/css/colors-fresh.css

    r22391 r22393  
    10471047.menu-icon-settings div.wp-menu-image,
    10481048.icon16.icon-site,
    1049 .menu-icon-site div.wp-menu-image {
    1050     background-image: url('../images/menu.png?ver=20120201');
     1049.menu-icon-site div.wp-menu-image,
     1050.icon16.icon-generic,
     1051.menu-icon-generic div.wp-menu-image {
     1052    background-image: url(../images/menu.png?ver=20121105);
    10511053}
    10521054
     
    11821184    background-position: -359px -1px;
    11831185}
     1186
     1187.icon16.icon-generic,
     1188#adminmenu .menu-icon-generic div.wp-menu-image {
     1189    background-position: -330px -34px;
     1190}
     1191
     1192#adminmenu .menu-icon-generic:hover div.wp-menu-image,
     1193#adminmenu .menu-icon-generic.wp-has-current-submenu div.wp-menu-image,
     1194#adminmenu .menu-icon-generic.current div.wp-menu-image {
     1195    background-position: -330px -2px;
     1196}
     1197
    11841198/* end menu and screen icons */
    11851199
     
    12151229#icon-options-general,
    12161230.icon32.icon-site,
    1217 #icon-ms-admin {
    1218     background-image: url(../images/icons32.png?ver=20111206);
     1231#icon-ms-admin,
     1232.icon32.icon-generic,
     1233#icon-generic {
     1234    background-image: url(../images/icons32.png?ver=20121105);
    12191235}
    12201236
     
    12841300#icon-ms-admin {
    12851301    background-position: -659px -5px;
     1302}
     1303
     1304.icon32.icon-generic,
     1305#icon-generic {
     1306    background-position: -708px -5px;
    12861307}
    12871308
     
    19561977    #icon-options-general,
    19571978    .icon32.icon-site,
    1958     #icon-ms-admin {
    1959         background-image: url("../images/icons32-2x.png?ver=20120916");
    1960         background-size: 708px 45px;
     1979    #icon-ms-admin,
     1980    .icon32.icon-generic,
     1981    #icon-generic {
     1982        background-image: url(../images/icons32-2x.png?ver=20121105);
     1983        background-size: 756px 45px;
    19611984    }
    19621985
     
    19842007    .menu-icon-settings div.wp-menu-image,
    19852008    .icon16.icon-site,
    1986     .menu-icon-site div.wp-menu-image {
    1987         background-image: url("../images/menu-2x.png?ver=20120916");
     2009    .menu-icon-site div.wp-menu-image,
     2010    .icon16.icon-generic,
     2011    .menu-icon-generic div.wp-menu-image {
     2012        background-image: url(../images/menu-2x.png?ver=20121105);
    19882013        background-size: 390px 64px;
    19892014    }
  • trunk/wp-admin/includes/plugin.php

    r21877 r22393  
    903903        add_action( $hookname, $function );
    904904
    905     if ( empty($icon_url) )
    906         $icon_url = esc_url( admin_url( 'images/generic.png' ) );
    907     else
     905    if ( empty($icon_url) ) {
     906        $icon_url = 'none';
     907        $icon_class = 'menu-icon-generic ';
     908    } else {
    908909        $icon_url = set_url_scheme( $icon_url );
    909 
    910     $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
     910        $icon_class = '';
     911    }
     912
     913    $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url );
    911914
    912915    if ( null === $position )
Note: See TracChangeset for help on using the changeset viewer.