WordPress.org
Get WordPress

Make WordPress Core

Changeset 27418


Ignore:
Timestamp:
03/05/2014 08:03:33 PM (11 years ago)
Author:
ocean90
Message:

Introduce a .dashicons-before CSS class.

If you want to use a Dashicon before an element you can use the class because it will not change the elements content styling. With that you don't need to copy the entire .dashicons styling to your :before styling anymore.
To demonstrate this change, Admin Menu now uses Dashicons classes directly.

And it fixes a glitch in IE.

fixes #26630.

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/css/admin-menu.css

    r27410 r27418  
    5252}
    5353
    54 .icon16.icon-dashboard:before,
    55 #adminmenu .menu-icon-dashboard div.wp-menu-image:before {
     54.icon16.icon-dashboard:before {
    5655    content: '\f226';
    5756}
    5857
    59 .icon16.icon-post:before,
    60 #adminmenu .menu-icon-post div.wp-menu-image:before {
     58.icon16.icon-post:before {
    6159    content: '\f109';
    6260}
    6361
    64 .icon16.icon-media:before,
    65 #adminmenu .menu-icon-media div.wp-menu-image:before {
     62.icon16.icon-media:before {
    6663    content: '\f104';
    6764}
    6865
    69 .icon16.icon-links:before,
    70 #adminmenu .menu-icon-links div.wp-menu-image:before {
     66.icon16.icon-links:before {
    7167    content: '\f103';
    7268}
    7369
    74 .icon16.icon-page:before,
    75 #adminmenu .menu-icon-page div.wp-menu-image:before {
     70.icon16.icon-page:before {
    7671    content: '\f105';
    7772}
    7873
    79 .icon16.icon-comments:before,
    80 #adminmenu .menu-icon-comments div.wp-menu-image:before {
     74.icon16.icon-comments:before {
    8175    content: '\f101';
    8276    margin-top: 1px;
    8377}
    8478
    85 .icon16.icon-appearance:before,
    86 #adminmenu .menu-icon-appearance div.wp-menu-image:before {
     79.icon16.icon-appearance:before {
    8780    content: '\f100';
    8881}
    8982
    90 .icon16.icon-plugins:before,
    91 #adminmenu .menu-icon-plugins div.wp-menu-image:before {
     83.icon16.icon-plugins:before {
    9284    content: '\f106';
    9385}
    9486
    95 .icon16.icon-users:before,
    96 #adminmenu .menu-icon-users div.wp-menu-image:before {
     87.icon16.icon-users:before {
    9788    content: '\f110';
    9889}
    9990
    100 .icon16.icon-tools:before,
    101 #adminmenu .menu-icon-tools div.wp-menu-image:before {
     91.icon16.icon-tools:before {
    10292    content: '\f107';
    10393}
    10494
    105 .icon16.icon-settings:before,
    106 #adminmenu .menu-icon-settings div.wp-menu-image:before {
     95.icon16.icon-settings:before {
    10796    content: '\f108';
    10897}
    10998
    110 .icon16.icon-site:before,
    111 #adminmenu .menu-icon-site div.wp-menu-image:before {
     99.icon16.icon-site:before {
    112100    content: '\f112'
    113101}
    114102
    115 .icon16.icon-generic:before,
    116 #adminmenu .menu-icon-generic div.wp-menu-image:before {
     103.icon16.icon-generic:before {
    117104    content: '\f111';
    118105}
    … …  
    358345
    359346div.wp-menu-image:before {
    360     font: normal 20px/1 'dashicons' !important;
    361     speak: none;
    362347    color: #999;
    363348    padding: 7px 0;
    364     height: 20px;
    365     width: 20px;
    366     display: inline-block;
    367     -webkit-font-smoothing: antialiased;
    368     -moz-osx-font-smoothing: grayscale;
    369349    -webkit-transition: all .1s ease-in-out;
    370350    transition: all .1s ease-in-out;

  • trunk/src/wp-admin/menu-header.php

    r27151 r27418  
    9494            } elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
    9595                $img = '<br />';
    96                 $img_class = ' dashicons ' . sanitize_html_class( $item[6] );
     96                $img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
    9797            }
    9898        }

  • trunk/src/wp-admin/menu.php

    r26664 r27418  
    2323 */
    2424
    25 $menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'none' );
     25$menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
    2626
    2727$submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
    … …  
    4747$menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
    4848
    49 $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'none' );
     49$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'dashicons-admin-post' );
    5050    $submenu['edit.php'][5]  = array( __('All Posts'), 'edit_posts', 'edit.php' );
    5151    /* translators: add new post */
    … …  
    6161    unset($tax);
    6262
    63 $menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'none' );
     63$menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' );
    6464    $submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
    6565    /* translators: add new file */
    … …  
    7373    unset($tax);
    7474
    75 $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'none' );
     75$menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' );
    7676    $submenu['link-manager.php'][5] = array( _x('All Links', 'admin menu'), 'manage_links', 'link-manager.php' );
    7777    /* translators: add new links */
    … …  
    7979    $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );
    8080
    81 $menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'none' );
     81$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'dashicons-admin-page' );
    8282    $submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
    8383    /* translators: add new page */
    … …  
    9494$awaiting_mod = wp_count_comments();
    9595$awaiting_mod = $awaiting_mod->moderated;
    96 $menu[25] = array( sprintf( __('Comments %s'), "<span class='awaiting-mod count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top menu-icon-comments', 'menu-comments', 'none' );
     96$menu[25] = array( sprintf( __('Comments %s'), "<span class='awaiting-mod count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'edit_posts', 'edit-comments.php', '', 'menu-top menu-icon-comments', 'menu-comments', 'dashicons-admin-comments' );
    9797unset($awaiting_mod);
    9898
    … …  
    118118        $ptype_class = $ptype_for_id;
    119119    } else {
    120         $menu_icon   = 'none';
     120        $menu_icon   = 'dashicons-admin-post';
    121121        $ptype_class = 'post';
    122122    }
    … …  
    145145$appearance_cap = current_user_can( 'switch_themes') ? 'switch_themes' : 'edit_theme_options';
    146146
    147 $menu[60] = array( __('Appearance'), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
     147$menu[60] = array( __('Appearance'), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
    148148    $submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
    149149    $submenu['themes.php'][6] = array( __( 'Customize' ), 'edit_theme_options', 'customize.php', 'hide-if-no-customize' );
    … …  
    168168}
    169169
    170 $menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'none' );
     170$menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
    171171
    172172$submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );
    … …  
    181181
    182182if ( current_user_can('list_users') )
    183     $menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'none' );
     183    $menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
    184184else
    185     $menu[70] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'none' );
     185    $menu[70] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
    186186
    187187if ( current_user_can('list_users') ) {
    … …  
    203203}
    204204
    205 $menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'none' );
     205$menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' );
    206206    $submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' );
    207207    $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
    … …  
    212212        $submenu['tools.php'][50] = array(__('Network Setup'), 'manage_options', 'network.php');
    213213
    214 $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'none' );
     214$menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
    215215    $submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
    216216    $submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');

  • trunk/src/wp-admin/network/menu.php

    r27066 r27418  
    99
    1010/* translators: Network menu item */
    11 $menu[2] = array(__('Dashboard'), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'div');
     11$menu[2] = array(__('Dashboard'), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard');
    1212
    1313$menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
    1414
    1515/* translators: Sites menu item */
    16 $menu[5] = array(__('Sites'), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'div');
     16$menu[5] = array(__('Sites'), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'dashicons-admin-network');
    1717$submenu['sites.php'][5]  = array( __('All Sites'), 'manage_sites', 'sites.php' );
    1818$submenu['sites.php'][10]  = array( _x('Add New', 'site'), 'create_sites', 'site-new.php' );
    1919
    20 $menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'div');
     20$menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users');
    2121$submenu['users.php'][5]  = array( __('All Users'), 'manage_network_users', 'users.php' );
    2222$submenu['users.php'][10]  = array( _x('Add New', 'user'), 'create_users', 'user-new.php' );
    … …  
    2727    $menu[15] = array(sprintf( __( 'Themes %s' ), "<span class='update-plugins count-{$update_data['counts']['themes']}'><span class='theme-count'>" . number_format_i18n( $update_data['counts']['themes'] ) . "</span></span>" ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
    2828} else {
    29     $menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
     29    $menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
    3030}
    3131$submenu['themes.php'][5]  = array( __('Installed Themes'), 'manage_network_themes', 'themes.php' );
    … …  
    3636    $menu[20] = array( sprintf( __( 'Plugins %s' ), "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n( $update_data['counts']['plugins'] ) . "</span></span>" ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div');
    3737} else {
    38     $menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
     38    $menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
    3939}
    4040$submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'manage_network_plugins', 'plugins.php' );
    … …  
    4242$submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
    4343
    44 $menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div');
     44$menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings');
    4545if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
    4646    $submenu['settings.php'][5]  = array( __('Network Settings'), 'manage_network_options', 'settings.php' );
    … …  
    5151    $menu[30] = array( sprintf( __( 'Updates %s' ), "<span class='update-plugins count-{$update_data['counts']['total']}' title='{$update_data['title']}'><span class='update-count'>" . number_format_i18n($update_data['counts']['total']) . "</span></span>" ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div' );
    5252} else {
    53     $menu[30] = array( __( 'Updates' ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div' );
     53    $menu[30] = array( __( 'Updates' ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'dashicons-admin-tools' );
    5454}
    5555

  • trunk/src/wp-includes/css/dashicons.css

    r27417 r27418  
    1313}
    1414
    15 .dashicons {
     15.dashicons,
     16.dashicons-before:before {
    1617    display: inline-block;
    1718    width: 20px;
    1819    height: 20px;
    19     -webkit-font-smoothing: antialiased;
    2020    font-size: 20px;
    2121    line-height: 1;
    … …  
    2525    font-style: normal;
    2626    vertical-align: top;
    27     -moz-transition: color .1s ease-in 0;
     27    text-align: center;
    2828    -webkit-transition: color .1s ease-in 0;
    29     text-align: center;
    30 }
    31 
     29    transition: color .1s ease-in 0;
     30    -webkit-font-smoothing: antialiased;
     31    -moz-osx-font-smoothing: grayscale;
     32}
    3233
    3334/* Admin Menu Icons */
Note: See TracChangeset for help on using the changeset viewer.