<!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>[27418] trunk/src: Introduce a `.dashicons-before` CSS class.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/27418">27418</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2014-03-05 20:03:33 +0000 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/26630">#26630</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssadminmenucss">trunk/src/wp-admin/css/admin-menu.css</a></li>
<li><a href="#trunksrcwpadminmenuheaderphp">trunk/src/wp-admin/menu-header.php</a></li>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
<li><a href="#trunksrcwpadminnetworkmenuphp">trunk/src/wp-admin/network/menu.php</a></li>
<li><a href="#trunksrcwpincludescssdashiconscss">trunk/src/wp-includes/css/dashicons.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssadminmenucss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/admin-menu.css (27417 => 27418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/admin-menu.css 2014-03-05 19:27:04 UTC (rev 27417)
+++ trunk/src/wp-admin/css/admin-menu.css 2014-03-05 20:03:33 UTC (rev 27418)
</span><span class="lines">@@ -51,69 +51,56 @@
</span><span class="cx"> transition: all .1s ease-in-out;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-dashboard:before,
-#adminmenu .menu-icon-dashboard div.wp-menu-image:before {
</del><ins>+.icon16.icon-dashboard:before {
</ins><span class="cx"> content: '\f226';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-post:before,
-#adminmenu .menu-icon-post div.wp-menu-image:before {
</del><ins>+.icon16.icon-post:before {
</ins><span class="cx"> content: '\f109';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-media:before,
-#adminmenu .menu-icon-media div.wp-menu-image:before {
</del><ins>+.icon16.icon-media:before {
</ins><span class="cx"> content: '\f104';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-links:before,
-#adminmenu .menu-icon-links div.wp-menu-image:before {
</del><ins>+.icon16.icon-links:before {
</ins><span class="cx"> content: '\f103';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-page:before,
-#adminmenu .menu-icon-page div.wp-menu-image:before {
</del><ins>+.icon16.icon-page:before {
</ins><span class="cx"> content: '\f105';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-comments:before,
-#adminmenu .menu-icon-comments div.wp-menu-image:before {
</del><ins>+.icon16.icon-comments:before {
</ins><span class="cx"> content: '\f101';
</span><span class="cx"> margin-top: 1px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-appearance:before,
-#adminmenu .menu-icon-appearance div.wp-menu-image:before {
</del><ins>+.icon16.icon-appearance:before {
</ins><span class="cx"> content: '\f100';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-plugins:before,
-#adminmenu .menu-icon-plugins div.wp-menu-image:before {
</del><ins>+.icon16.icon-plugins:before {
</ins><span class="cx"> content: '\f106';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-users:before,
-#adminmenu .menu-icon-users div.wp-menu-image:before {
</del><ins>+.icon16.icon-users:before {
</ins><span class="cx"> content: '\f110';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-tools:before,
-#adminmenu .menu-icon-tools div.wp-menu-image:before {
</del><ins>+.icon16.icon-tools:before {
</ins><span class="cx"> content: '\f107';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-settings:before,
-#adminmenu .menu-icon-settings div.wp-menu-image:before {
</del><ins>+.icon16.icon-settings:before {
</ins><span class="cx"> content: '\f108';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-site:before,
-#adminmenu .menu-icon-site div.wp-menu-image:before {
</del><ins>+.icon16.icon-site:before {
</ins><span class="cx"> content: '\f112'
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.icon16.icon-generic:before,
-#adminmenu .menu-icon-generic div.wp-menu-image:before {
</del><ins>+.icon16.icon-generic:before {
</ins><span class="cx"> content: '\f111';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -357,15 +344,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.wp-menu-image:before {
</span><del>- font: normal 20px/1 'dashicons' !important;
- speak: none;
</del><span class="cx"> color: #999;
</span><span class="cx"> padding: 7px 0;
</span><del>- height: 20px;
- width: 20px;
- display: inline-block;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
</del><span class="cx"> -webkit-transition: all .1s ease-in-out;
</span><span class="cx"> transition: all .1s ease-in-out;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminmenuheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/menu-header.php (27417 => 27418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/menu-header.php 2014-03-05 19:27:04 UTC (rev 27417)
+++ trunk/src/wp-admin/menu-header.php 2014-03-05 20:03:33 UTC (rev 27418)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> $img_class = ' svg';
</span><span class="cx"> } elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
</span><span class="cx"> $img = '<br />';
</span><del>- $img_class = ' dashicons ' . sanitize_html_class( $item[6] );
</del><ins>+ $img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> $arrow = '<div class="wp-menu-arrow"><div></div></div>';
</span></span></pre></div>
<a id="trunksrcwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/menu.php (27417 => 27418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/menu.php 2014-03-05 19:27:04 UTC (rev 27417)
+++ trunk/src/wp-admin/menu.php 2014-03-05 20:03:33 UTC (rev 27418)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><span class="cx">
</span><del>-$menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'none' );
</del><ins>+$menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
</ins><span class="cx">
</span><span class="cx"> $submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
</span><span class="cx">
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
</span><span class="cx">
</span><del>-$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'none' );
</del><ins>+$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'dashicons-admin-post' );
</ins><span class="cx"> $submenu['edit.php'][5] = array( __('All Posts'), 'edit_posts', 'edit.php' );
</span><span class="cx"> /* translators: add new post */
</span><span class="cx"> $submenu['edit.php'][10] = array( _x('Add New', 'post'), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' );
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> }
</span><span class="cx"> unset($tax);
</span><span class="cx">
</span><del>-$menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'none' );
</del><ins>+$menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' );
</ins><span class="cx"> $submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
</span><span class="cx"> /* translators: add new file */
</span><span class="cx"> $submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
</span><span class="lines">@@ -72,13 +72,13 @@
</span><span class="cx"> }
</span><span class="cx"> unset($tax);
</span><span class="cx">
</span><del>-$menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'none' );
</del><ins>+$menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' );
</ins><span class="cx"> $submenu['link-manager.php'][5] = array( _x('All Links', 'admin menu'), 'manage_links', 'link-manager.php' );
</span><span class="cx"> /* translators: add new links */
</span><span class="cx"> $submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
</span><span class="cx"> $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );
</span><span class="cx">
</span><del>-$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'none' );
</del><ins>+$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'dashicons-admin-page' );
</ins><span class="cx"> $submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
</span><span class="cx"> /* translators: add new page */
</span><span class="cx"> $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), get_post_type_object( 'page' )->cap->create_posts, 'post-new.php?post_type=page' );
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> $awaiting_mod = wp_count_comments();
</span><span class="cx"> $awaiting_mod = $awaiting_mod->moderated;
</span><del>-$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' );
</del><ins>+$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' );
</ins><span class="cx"> unset($awaiting_mod);
</span><span class="cx">
</span><span class="cx"> $submenu[ 'edit-comments.php' ][0] = array( __('All Comments'), 'edit_posts', 'edit-comments.php' );
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> }
</span><span class="cx"> $ptype_class = $ptype_for_id;
</span><span class="cx"> } else {
</span><del>- $menu_icon = 'none';
</del><ins>+ $menu_icon = 'dashicons-admin-post';
</ins><span class="cx"> $ptype_class = 'post';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> $appearance_cap = current_user_can( 'switch_themes') ? 'switch_themes' : 'edit_theme_options';
</span><span class="cx">
</span><del>-$menu[60] = array( __('Appearance'), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
</del><ins>+$menu[60] = array( __('Appearance'), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
</ins><span class="cx"> $submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
</span><span class="cx"> $submenu['themes.php'][6] = array( __( 'Customize' ), 'edit_theme_options', 'customize.php', 'hide-if-no-customize' );
</span><span class="cx"> if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> $count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'none' );
</del><ins>+$menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
</ins><span class="cx">
</span><span class="cx"> $submenu['plugins.php'][5] = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );
</span><span class="cx">
</span><span class="lines">@@ -180,9 +180,9 @@
</span><span class="cx"> unset( $update_data );
</span><span class="cx">
</span><span class="cx"> if ( current_user_can('list_users') )
</span><del>- $menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'none' );
</del><ins>+ $menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
</ins><span class="cx"> else
</span><del>- $menu[70] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'none' );
</del><ins>+ $menu[70] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
</ins><span class="cx">
</span><span class="cx"> if ( current_user_can('list_users') ) {
</span><span class="cx"> $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> $submenu['profile.php'][10] = array(__('Add New User'), 'promote_users', 'user-new.php');
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'none' );
</del><ins>+$menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' );
</ins><span class="cx"> $submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' );
</span><span class="cx"> $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
</span><span class="cx"> $submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' );
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
</span><span class="cx"> $submenu['tools.php'][50] = array(__('Network Setup'), 'manage_options', 'network.php');
</span><span class="cx">
</span><del>-$menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'none' );
</del><ins>+$menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
</ins><span class="cx"> $submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
</span><span class="cx"> $submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
</span><span class="cx"> $submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
</span></span></pre></div>
<a id="trunksrcwpadminnetworkmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/menu.php (27417 => 27418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/menu.php 2014-03-05 19:27:04 UTC (rev 27417)
+++ trunk/src/wp-admin/network/menu.php 2014-03-05 20:03:33 UTC (rev 27418)
</span><span class="lines">@@ -8,16 +8,16 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /* translators: Network menu item */
</span><del>-$menu[2] = array(__('Dashboard'), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'div');
</del><ins>+$menu[2] = array(__('Dashboard'), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard');
</ins><span class="cx">
</span><span class="cx"> $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
</span><span class="cx">
</span><span class="cx"> /* translators: Sites menu item */
</span><del>-$menu[5] = array(__('Sites'), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'div');
</del><ins>+$menu[5] = array(__('Sites'), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'dashicons-admin-network');
</ins><span class="cx"> $submenu['sites.php'][5] = array( __('All Sites'), 'manage_sites', 'sites.php' );
</span><span class="cx"> $submenu['sites.php'][10] = array( _x('Add New', 'site'), 'create_sites', 'site-new.php' );
</span><span class="cx">
</span><del>-$menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'div');
</del><ins>+$menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users');
</ins><span class="cx"> $submenu['users.php'][5] = array( __('All Users'), 'manage_network_users', 'users.php' );
</span><span class="cx"> $submenu['users.php'][10] = array( _x('Add New', 'user'), 'create_users', 'user-new.php' );
</span><span class="cx">
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> if ( $update_data['counts']['themes'] ) {
</span><span class="cx"> $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' );
</span><span class="cx"> } else {
</span><del>- $menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
</del><ins>+ $menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
</ins><span class="cx"> }
</span><span class="cx"> $submenu['themes.php'][5] = array( __('Installed Themes'), 'manage_network_themes', 'themes.php' );
</span><span class="cx"> $submenu['themes.php'][10] = array( _x('Add New', 'theme'), 'install_themes', 'theme-install.php' );
</span><span class="lines">@@ -35,13 +35,13 @@
</span><span class="cx"> if ( current_user_can( 'update_plugins' ) ) {
</span><span class="cx"> $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');
</span><span class="cx"> } else {
</span><del>- $menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
</del><ins>+ $menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
</ins><span class="cx"> }
</span><span class="cx"> $submenu['plugins.php'][5] = array( __('Installed Plugins'), 'manage_network_plugins', 'plugins.php' );
</span><span class="cx"> $submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' );
</span><span class="cx"> $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
</span><span class="cx">
</span><del>-$menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'div');
</del><ins>+$menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings');
</ins><span class="cx"> if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
</span><span class="cx"> $submenu['settings.php'][5] = array( __('Network Settings'), 'manage_network_options', 'settings.php' );
</span><span class="cx"> $submenu['settings.php'][10] = array( __('Network Setup'), 'manage_network_options', 'setup.php' );
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> if ( $update_data['counts']['total'] ) {
</span><span class="cx"> $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' );
</span><span class="cx"> } else {
</span><del>- $menu[30] = array( __( 'Updates' ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'div' );
</del><ins>+ $menu[30] = array( __( 'Updates' ), 'manage_network', 'upgrade.php', '', 'menu-top menu-icon-tools', 'menu-update', 'dashicons-admin-tools' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unset($update_data);
</span></span></pre></div>
<a id="trunksrcwpincludescssdashiconscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/dashicons.css (27417 => 27418)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/dashicons.css 2014-03-05 19:27:04 UTC (rev 27417)
+++ trunk/src/wp-includes/css/dashicons.css 2014-03-05 20:03:33 UTC (rev 27418)
</span><span class="lines">@@ -12,11 +12,11 @@
</span><span class="cx"> font-style: normal;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.dashicons {
</del><ins>+.dashicons,
+.dashicons-before:before {
</ins><span class="cx"> display: inline-block;
</span><span class="cx"> width: 20px;
</span><span class="cx"> height: 20px;
</span><del>- -webkit-font-smoothing: antialiased;
</del><span class="cx"> font-size: 20px;
</span><span class="cx"> line-height: 1;
</span><span class="cx"> font-family: "dashicons";
</span><span class="lines">@@ -24,12 +24,13 @@
</span><span class="cx"> font-weight: normal;
</span><span class="cx"> font-style: normal;
</span><span class="cx"> vertical-align: top;
</span><del>- -moz-transition: color .1s ease-in 0;
</del><ins>+ text-align: center;
</ins><span class="cx"> -webkit-transition: color .1s ease-in 0;
</span><del>- text-align: center;
</del><ins>+ transition: color .1s ease-in 0;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> /* Admin Menu Icons */
</span><span class="cx">
</span><span class="cx"> .dashicons-menu:before {
</span></span></pre>
</div>
</div>
</body>
</html>