WordPress.org
Get WordPress

Make WordPress Core

Ticket #21019: 21019.2-with-sprites.diff

File 21019.2-with-sprites.diff, 6.5 KB (added by lessbloat, 12 years ago)

Updated CSS for 21019.2.diff​

  • wp-admin/includes/plugin.php

     
    902902        if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
    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 );
     910                $icon_class = '';
     911        }
    909912
    910         $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url );
     913        $new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url );
    911914
    912915        if ( null === $position )
    913916                $menu[] = $new_menu;

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

    Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
     
    10431043.icon16.icon-settings,
    10441044.menu-icon-settings div.wp-menu-image,
    10451045.icon16.icon-site,
    1046 .menu-icon-site div.wp-menu-image {
     1046.menu-icon-site div.wp-menu-image,
     1047.icon16.icon-generic,
     1048.menu-icon-generic div.wp-menu-image {
    10471049        background-image: url('../images/menu.png?ver=20120201');
    10481050}
    10491051
    … …  
    11781180#adminmenu .menu-icon-site.current div.wp-menu-image {
    11791181        background-position: -359px -1px;
    11801182}
     1183
     1184.icon16.icon-generic,
     1185#adminmenu .menu-icon-generic div.wp-menu-image {
     1186        background-position: -330px -34px;
     1187}
     1188
     1189#adminmenu .menu-icon-generic:hover div.wp-menu-image,
     1190#adminmenu .menu-icon-generic.wp-has-current-submenu div.wp-menu-image,
     1191#adminmenu .menu-icon-generic.current div.wp-menu-image {
     1192        background-position: -330px -2px;
     1193}
     1194
    11811195/* end menu and screen icons */
    11821196
    11831197/* Screen Icons */
    … …  
    12111225.icon32.icon-settings,
    12121226#icon-options-general,
    12131227.icon32.icon-site,
    1214 #icon-ms-admin {
     1228#icon-ms-admin,
     1229.icon32.icon-generic,
     1230#icon-generic {
    12151231        background-image: url(../images/icons32.png?ver=20111206);
    12161232}
    12171233
    … …  
    12821298        background-position: -659px -5px;
    12831299}
    12841300
     1301.icon32.icon-generic,
     1302#icon-generic {
     1303        background-position: -???px -5px;
     1304}
     1305
    12851306/* end screen icons */
    12861307
    12871308/* Diff */
    … …  
    19521973        .icon32.icon-settings,
    19531974        #icon-options-general,
    19541975        .icon32.icon-site,
    1955         #icon-ms-admin {
     1976        #icon-ms-admin,
     1977        .icon32.icon-generic,
     1978        #icon-generic {
    19561979                background-image: url("../images/icons32-2x.png?ver=20120916");
    1957                 background-size: 708px 45px;
     1980                background-size: 756px 45px;
    19581981        }
    19591982
    19601983        .icon16.icon-dashboard,
    … …  
    19802003        .icon16.icon-settings,
    19812004        .menu-icon-settings div.wp-menu-image,
    19822005        .icon16.icon-site,
    1983         .menu-icon-site div.wp-menu-image {
     2006        .menu-icon-site div.wp-menu-image,
     2007        .icon16.icon-generic,
     2008        .menu-icon-generic div.wp-menu-image {
    19842009                background-image: url("../images/menu-2x.png?ver=20120916");
    19852010                background-size: 390px 64px;
    19862011        }

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

     
    10871087.icon16.icon-settings,
    10881088.menu-icon-settings div.wp-menu-image,
    10891089.icon16.icon-site,
    1090 .menu-icon-site div.wp-menu-image {
     1090.menu-icon-site div.wp-menu-image,
     1091.icon16.icon-generic,
     1092.menu-icon-generic div.wp-menu-image {
    10911093        background-image: url('../images/menu-vs.png?ver=20120201');
    10921094}
    10931095
    … …  
    12221224#adminmenu .menu-icon-site.current div.wp-menu-image {
    12231225        background-position: -359px -1px;
    12241226}
     1227
     1228.icon16.icon-generic,
     1229#adminmenu .menu-icon-generic div.wp-menu-image {
     1230        background-position: -330px -34px;
     1231}
     1232
     1233#adminmenu .menu-icon-generic:hover div.wp-menu-image,
     1234#adminmenu .menu-icon-generic.wp-has-current-submenu div.wp-menu-image,
     1235#adminmenu .menu-icon-generic.current div.wp-menu-image {
     1236        background-position: -330px -2px;
     1237}
    12251238/* end menu and screen icons */
    12261239
    12271240/* Screen Icons */
    … …  
    12551268.icon32.icon-settings,
    12561269#icon-options-general,
    12571270.icon32.icon-site,
    1258 #icon-ms-admin {
     1271#icon-ms-admin,
     1272.icon32.icon-generic,
     1273#icon-generic {
    12591274        background-image: url(../images/icons32-vs.png?ver=20111206);
    12601275}
    12611276
    … …  
    13261341        background-position: -659px -5px;
    13271342}
    13281343
     1344.icon32.icon-generic,
     1345#icon-generic {
     1346        background-position: -708px -5px;
     1347}
     1348
    13291349/* end screen icons */
    13301350
    13311351/* Diff */
    … …  
    20292049
    20302050        #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
    20312051        #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle,
    2032         .nav-menus-php .item-edit:hover,       
     2052        .nav-menus-php .item-edit:hover,
    20332053        .sidebar-name:hover .sidebar-name-arrow,
    20342054        .rtl #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
    20352055        .rtl #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle,
    … …  
    20742094        .icon32.icon-settings,
    20752095        #icon-options-general,
    20762096        .icon32.icon-site,
    2077         #icon-ms-admin {
     2097        #icon-ms-admin,
     2098        .icon32.icon-generic,
     2099        #icon-generic {
    20782100                background-image: url("../images/icons32-vs-2x.png?ver=20120916");
    2079                 background-size: 708px 45px;
     2101                background-size: 756px 45px;
    20802102        }
    20812103
    20822104        .icon16.icon-dashboard,
    … …  
    21022124        .icon16.icon-settings,
    21032125        .menu-icon-settings div.wp-menu-image,
    21042126        .icon16.icon-site,
    2105         .menu-icon-site div.wp-menu-image {
    2106                 background-image: url("../images/menu-2x.png?ver=20120916"); // @todo needs menu-vs-2x.png
     2127        .menu-icon-site div.wp-menu-image,
     2128        .icon16.icon-generic,
     2129        .menu-icon-generic div.wp-menu-image {
     2130                background-image: url("../images/menu-vs-2x.png?ver=20120916");
    21072131                background-size: 390px 64px;
    21082132        }
    21092133