Ticket #32678: 32678.5.diff
File 32678.5.diff, 25.9 KB (added by , 10 years ago) |
---|
-
src/wp-admin/css/admin-menu.css
885 885 border: 1px solid transparent; 886 886 background: none; 887 887 height: 44px; 888 margin-left: -1px;889 888 } 890 889 891 890 .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle a { … … 901 900 } 902 901 903 902 #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { 904 content: '\f 228';903 content: '\f120'; 905 904 display: inline-block; 906 905 float: left; 907 font: normal 40px/45px 'Dashicons';906 font: normal 20px/46px 'Dashicons'; 908 907 vertical-align: middle; 909 908 outline: none; 910 909 margin: 0; -
src/wp-admin/menu.php
41 41 $submenu[ 'index.php' ][10] = 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>" ), $cap, 'update-core.php'); 42 42 unset( $cap ); 43 43 } 44 $submenu[ 'index.php' ][15] = array( __('About'), 'read', 'about.php' ); 44 45 45 46 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' ); 46 47 … … 155 156 $submenu['themes.php'][10] = array( __( 'Menus' ), 'edit_theme_options', 'nav-menus.php' ); 156 157 } 157 158 158 if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize') ) {159 $customize_header_url = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url );160 $submenu['themes.php'][15] = array( __( 'Header' ), $appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' );161 }162 163 if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize') ) {164 $customize_background_url = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url );165 $submenu['themes.php'][20] = array( __( 'Background' ), $appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' );166 }167 168 159 unset( $customize_url ); 169 160 170 161 unset( $appearance_cap ); -
src/wp-includes/admin-bar.php
96 96 } 97 97 98 98 /** 99 * Add the WordPress logo menu.100 *101 * @since 3.3.0102 *103 * @param WP_Admin_Bar $wp_admin_bar104 */105 function wp_admin_bar_wp_menu( $wp_admin_bar ) {106 $wp_admin_bar->add_menu( array(107 'id' => 'wp-logo',108 'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'About WordPress' ) . '</span>',109 'href' => self_admin_url( 'about.php' ),110 ) );111 112 if ( is_user_logged_in() ) {113 // Add "About WordPress" link114 $wp_admin_bar->add_menu( array(115 'parent' => 'wp-logo',116 'id' => 'about',117 'title' => __('About WordPress'),118 'href' => self_admin_url( 'about.php' ),119 ) );120 }121 122 // Add WordPress.org link123 $wp_admin_bar->add_menu( array(124 'parent' => 'wp-logo-external',125 'id' => 'wporg',126 'title' => __('WordPress.org'),127 'href' => __('https://wordpress.org/'),128 ) );129 130 // Add codex link131 $wp_admin_bar->add_menu( array(132 'parent' => 'wp-logo-external',133 'id' => 'documentation',134 'title' => __('Documentation'),135 'href' => __('https://codex.wordpress.org/'),136 ) );137 138 // Add forums link139 $wp_admin_bar->add_menu( array(140 'parent' => 'wp-logo-external',141 'id' => 'support-forums',142 'title' => __('Support Forums'),143 'href' => __('https://wordpress.org/support/'),144 ) );145 146 // Add feedback link147 $wp_admin_bar->add_menu( array(148 'parent' => 'wp-logo-external',149 'id' => 'feedback',150 'title' => __('Feedback'),151 'href' => __('https://wordpress.org/support/forum/requests-and-feedback'),152 ) );153 }154 155 /**156 99 * Add the sidebar toggle button. 157 100 * 158 101 * @since 3.8.0 … … 278 221 279 222 $title = wp_html_excerpt( $blogname, 40, '…' ); 280 223 281 $wp_admin_bar->add_menu( array( 282 'id' => 'site-name', 283 'title' => $title, 284 'href' => is_admin() ? home_url( '/' ) : admin_url(), 285 ) ); 224 $notification = false; 225 $awaiting_mod = wp_count_comments(); 226 if ( current_user_can( 'edit_posts' ) && $awaiting_mod->moderated > 0 ) { 227 $notification = true; 228 } elseif ( ! is_multisite() && current_user_can( 'update_plugins' ) ) { 229 $update_data = wp_get_update_data(); 230 if ( $update_data['counts']['plugins'] > 0 ) { 231 $notification = true; 232 } 233 } 286 234 287 // Create submenu items.235 // Add front/admin cross-links. 288 236 289 237 if ( is_admin() ) { 290 238 // Add an option to visit the site. 291 239 $wp_admin_bar->add_menu( array( 292 'parent' => 'site-name', 293 'id' => 'view-site', 240 'id' => 'visit-site', 294 241 'title' => __( 'Visit Site' ), 295 242 'href' => home_url( '/' ), 296 243 ) ); 297 298 if ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) {299 $wp_admin_bar->add_menu( array(300 'parent' => 'site-name',301 'id' => 'edit-site',302 'title' => __( 'Edit Site' ),303 'href' => network_admin_url( 'site-info.php?id=' . get_current_blog_id() ),304 ) );305 }306 307 244 } else { 308 245 // We're on the front end, link to the Dashboard. 309 246 $wp_admin_bar->add_menu( array( 247 'id' => 'site-name', 248 'title' => $title, 249 'href' => admin_url(), 250 'meta' => array( 251 'class' => ( ! is_admin() && $notification ) ? 'notification-pending' : '', 252 ), 253 ) ); 254 255 // Add a Dashboard link to the site name submenu. 256 $icon = '<span class="ab-icon dashicons-dashboard"></span>'; 257 $wp_admin_bar->add_menu( array( 310 258 'parent' => 'site-name', 311 259 'id' => 'dashboard', 312 'title' => __( 'Dashboard' ),260 'title' => $icon . '<span class="ab-label">' . __( 'Dashboard' ) . '</span>', 313 261 'href' => admin_url(), 314 262 ) ); 315 263 316 // Add the appearance submenu items. 317 wp_admin_bar_appearance_menu( $wp_admin_bar ); 264 // Add the admin submenu items. 265 wp_admin_bar_admin_menu( $wp_admin_bar ); 266 267 // Pair the dashboard icon on the toolbar with the visit site icon (for mobile). 268 $wp_admin_bar->add_menu( array( 269 'id' => 'dashboard-toggle', 270 'title' => $icon . '<span class="ab-label">' . __( 'Dashboard' ) . '</span>', 271 'href' => admin_url(), 272 ) ); 318 273 } 319 274 } 320 275 … … 629 584 } 630 585 631 586 /** 632 * Add edit comments link with awaiting moderation count bubble.587 * Add "Customize" menu. 633 588 * 634 * @since 3.1.0589 * @since 4.3.0 635 590 * 636 591 * @param WP_Admin_Bar $wp_admin_bar 637 592 */ 638 function wp_admin_bar_comments_menu( $wp_admin_bar ) { 639 if ( !current_user_can('edit_posts') ) 640 return; 641 642 $awaiting_mod = wp_count_comments(); 643 $awaiting_mod = $awaiting_mod->moderated; 644 $awaiting_title = esc_attr( sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) ) ); 645 646 $icon = '<span class="ab-icon"></span>'; 647 $title = '<span id="ab-awaiting-mod" class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '">' . number_format_i18n( $awaiting_mod ) . '</span>'; 648 649 $wp_admin_bar->add_menu( array( 650 'id' => 'comments', 651 'title' => $icon . $title, 652 'href' => admin_url('edit-comments.php'), 653 'meta' => array( 'title' => $awaiting_title ), 654 ) ); 593 function wp_admin_bar_customize_menu( $wp_admin_bar ) { 594 if ( current_user_can( 'customize' ) ) { 595 $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; 596 $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ); 597 $title = '<span class="ab-icon"></span><span class="ab-label">' . __( 'Customize' ) . '</span>'; 598 $wp_admin_bar->add_menu( array( 599 'id' => 'customize', 600 'title' => $title, 601 'href' => $customize_url, 602 'meta' => array( 603 'class' => 'hide-if-no-customize', 604 ), 605 ) ); 606 add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' ); 607 } 655 608 } 656 609 657 610 /** 658 * Add a ppearancesubmenu items to the "Site Name" menu.611 * Add admin submenu items to the "Site Name" menu. 659 612 * 660 * @since 3.1.0613 * @since 4.3.0 661 614 * 662 615 * @param WP_Admin_Bar $wp_admin_bar 663 616 */ 664 function wp_admin_bar_a ppearance_menu( $wp_admin_bar ) {665 $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'a ppearance' ) );617 function wp_admin_bar_admin_menu( $wp_admin_bar ) { 618 $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'admin' ) ); 666 619 667 $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];668 $c ustomize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url());620 // Post types. 621 $cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' ); 669 622 670 if ( current_user_can( 'switch_themes' ) ) { 671 $wp_admin_bar->add_menu( array( 672 'parent' => 'appearance', 673 'id' => 'themes', 674 'title' => __( 'Themes' ), 675 'href' => admin_url( 'themes.php' ), 676 'meta' => array( 677 'class' => 'hide-if-customize', 678 ), 679 ) ); 623 if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->edit_posts ) ) { 624 $menu_icon = '<span class="ab-icon dashicons-admin-post"></span>'; 625 $actions[ 'edit.php' ] = array( $cpts['post']->labels->name, 'edit-posts', $menu_icon ); 626 } 680 627 681 if ( current_user_can( 'customize' ) ) { 682 $wp_admin_bar->add_menu( array( 683 'parent' => 'appearance', 684 'id' => 'customize-themes', 685 'title' => __( 'Themes' ), 686 'href' => add_query_arg( urlencode( 'autofocus[section]' ), 'themes', $customize_url ), // urlencode() needed due to #16859 687 'meta' => array( 688 'class' => 'hide-if-no-customize', 689 ), 690 ) ); 691 } 628 if ( isset( $cpts['attachment'] ) && current_user_can( 'edit_posts' ) ) { 629 $menu_icon = '<span class="ab-icon dashicons-admin-media"></span>'; 630 $actions[ 'upload.php' ] = array( $cpts['attachment']->labels->name, 'edit-media', $menu_icon ); 692 631 } 693 632 694 if ( current_user_can( 'customize' ) ) { 695 $wp_admin_bar->add_menu( array( 696 'parent' => 'appearance', 697 'id' => 'customize', 698 'title' => __('Customize'), 699 'href' => $customize_url, 700 'meta' => array( 701 'class' => 'hide-if-no-customize', 702 ), 703 ) ); 704 add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' ); 633 if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->edit_posts ) ) { 634 $menu_icon = '<span class="ab-icon dashicons-admin-page"></span>'; 635 $actions[ 'edit.php?post_type=page' ] = array( $cpts['page']->labels->name, 'edit-pages', $menu_icon ); 705 636 } 706 637 707 if ( ! current_user_can( 'edit_theme_options' ) ) { 708 return; 638 unset( $cpts['post'], $cpts['page'], $cpts['attachment'] ); 639 640 // Add any additional custom post types. 641 foreach ( $cpts as $cpt ) { 642 if ( ! current_user_can( $cpt->cap->edit_posts ) ) { 643 continue; 644 } 645 if ( is_string( $cpt->menu_icon ) ) { 646 // Special handling for data:image/svg+xml and Dashicons. 647 if ( 0 === strpos( $cpt->menu_icon, 'dashicons-' ) ) { 648 $menu_icon = '<span class="ab-icon ' . $cpt->menu_icon . '"></span>'; 649 } elseif ( 0 === strpos( $cpt->menu_icon, 'data:image/svg+xml;base64,' ) ) { 650 $menu_icon = '<span class="ab-icon"><img src="' . $cpt->menu_icon . '"></span>'; 651 } else { 652 $menu_icon = '<span class="ab-icon"><img src="' . esc_url( $cpt->menu_icon ) . '"></span>'; 653 } 654 } else { 655 $menu_icon = '<span class="ab-icon dashicons-admin-post"></span>'; 656 } 657 $key = 'edit.php?post_type=' . $cpt->name; 658 $actions[ $key ] = array( $cpt->labels->menu_name, 'edit-' . $cpt->name, $menu_icon ); 709 659 } 710 660 711 if ( current_theme_supports( 'widgets' ) ) { 712 $wp_admin_bar->add_menu( array( 713 'parent' => 'appearance', 714 'id' => 'widgets', 715 'title' => __( 'Widgets' ), 716 'href' => admin_url( 'widgets.php' ), 717 'meta' => array( 718 'class' => 'hide-if-customize', 719 ), 720 ) ); 661 if ( $actions ) { 662 foreach ( $actions as $link => $action ) { 663 list( $title, $id, $menu_icon ) = $action; 721 664 722 if ( current_user_can( 'customize' ) ) {723 665 $wp_admin_bar->add_menu( array( 724 'parent' => 'appearance', 725 'id' => 'customize-widgets', 726 'title' => __( 'Widgets' ), 727 'href' => add_query_arg( urlencode( 'autofocus[panel]' ), 'widgets', $customize_url ), // urlencode() needed due to #16859 728 'meta' => array( 729 'class' => 'hide-if-no-customize', 730 ), 666 'parent' => 'admin', 667 'id' => $id, 668 'title' => $menu_icon . '<span class="ab-label">' . $title . '</span>', 669 'href' => admin_url( $link ) 731 670 ) ); 732 671 } 733 672 } 734 673 735 if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) 736 $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) ); 674 // Comments 675 if ( current_user_can( 'edit_posts' ) ) { 676 $awaiting_mod = wp_count_comments(); 677 $awaiting_mod = $awaiting_mod->moderated; 678 $icon = '<span class="ab-icon dashicons-admin-comments"></span>'; 679 $wp_admin_bar->add_menu( array( 680 'parent' => 'admin', 681 'id' => 'comments', 682 'title' => $icon . '<span class="ab-label">' . sprintf( __( 'Comments %s' ), "<span class='awaiting-mod count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n( $awaiting_mod ) . "</span></span>" ) . '</span>', 683 'href' => admin_url( 'edit-comments.php' ), 684 ) ); 685 } 737 686 738 if ( current_theme_supports( 'custom-background' ) ) { 687 // Appearance. 688 if ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) { 689 $icon = '<span class="ab-icon dashicons-admin-appearance"></span>'; 739 690 $wp_admin_bar->add_menu( array( 740 'parent' => 'appearance', 741 'id' => 'background', 742 'title' => __( 'Background' ), 743 'href' => admin_url( 'themes.php?page=custom-background' ), 744 'meta' => array( 745 'class' => 'hide-if-customize', 746 ), 691 'parent' => 'admin', 692 'id' => 'themes', 693 'title' => $icon . '<span class="ab-label">' . __( 'Appearance' ) . '</span>', // @todo should we just say themes here since there isn't a submenu? 694 'href' => admin_url( 'themes.php' ) 747 695 ) ); 696 } 748 697 749 if ( current_user_can( 'customize' ) ) { 750 $wp_admin_bar->add_menu( array( 751 'parent' => 'appearance', 752 'id' => 'customize-background', 753 'title' => __( 'Background' ), 754 'href' => add_query_arg( urlencode( 'autofocus[control]' ), 'background_image', $customize_url ), // urlencode() needed due to #16859 755 'meta' => array( 756 'class' => 'hide-if-no-customize', 757 ), 758 ) ); 698 // Plugins. 699 if ( current_user_can( 'activate_plugins' ) ) { 700 if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) { 701 $update_data = wp_get_update_data(); 702 $count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>"; 703 } else { 704 $count = ''; 759 705 } 706 $icon = '<span class="ab-icon dashicons-admin-plugins"></span>'; 707 $wp_admin_bar->add_menu( array( 708 'parent' => 'admin', 709 'id' => 'plugins', 710 'title' => $icon . '<span class="ab-label">' . sprintf( __( 'Plugins %s' ), $count ) . '</span>', 711 'href' => admin_url( 'plugins.php' ), 712 ) ); 760 713 } 761 714 762 if ( current_theme_supports( 'custom-header' ) ) { 715 // Users. 716 if ( current_user_can( 'list_users' ) ) { 717 $icon = '<span class="ab-icon dashicons-admin-users"></span>'; 763 718 $wp_admin_bar->add_menu( array( 764 'parent' => 'appearance', 765 'id' => 'header', 766 'title' => __( 'Header' ), 767 'href' => admin_url( 'themes.php?page=custom-header' ), 768 'meta' => array( 769 'class' => 'hide-if-customize', 770 ), 719 'parent' => 'admin', 720 'id' => 'edit-users', 721 'title' => $icon . '<span class="ab-label">' . __( 'Users' ) . '</span>', 722 'href' => admin_url( 'users.php' ), 771 723 ) ); 724 } 772 725 773 if ( current_user_can( 'customize' ) ) { 774 $wp_admin_bar->add_menu( array( 775 'parent' => 'appearance', 776 'id' => 'customize-header', 777 'title' => __( 'Header' ), 778 'href' => add_query_arg( urlencode( 'autofocus[control]' ), 'header_image', $customize_url ), // urlencode() needed due to #16859 779 'meta' => array( 780 'class' => 'hide-if-no-customize', 781 ), 782 ) ); 783 } 726 // Users. 727 if ( current_user_can( 'edit_posts' ) ) { 728 $icon = '<span class="ab-icon dashicons-admin-tools"></span>'; 729 $wp_admin_bar->add_menu( array( 730 'parent' => 'admin', 731 'id' => 'tools', 732 'title' => $icon . '<span class="ab-label">' . __( 'Tools' ) . '</span>', 733 'href' => admin_url( 'tools.php' ) 734 ) ); 784 735 } 785 736 737 // Settings. 738 if ( current_user_can( 'manage_options' ) ) { 739 $icon = '<span class="ab-icon dashicons-admin-settings"></span>'; 740 $wp_admin_bar->add_menu( array( 741 'parent' => 'admin', 742 'id' => 'settings', 743 'title' => $icon . '<span class="ab-label">' . __( 'Settings' ) . '</span>', 744 'href' => admin_url( 'options.php' ) 745 ) ); 746 } 786 747 } 787 748 788 749 /** … … 854 815 'class' => 'ab-top-secondary', 855 816 ), 856 817 ) ); 857 858 $wp_admin_bar->add_group( array(859 'parent' => 'wp-logo',860 'id' => 'wp-logo-external',861 'meta' => array(862 'class' => 'ab-sub-secondary',863 ),864 ) );865 818 } 866 819 867 820 /** -
src/wp-includes/class-wp-admin-bar.php
553 553 554 554 // Site related. 555 555 add_action( 'admin_bar_menu', 'wp_admin_bar_sidebar_toggle', 0 ); 556 add_action( 'admin_bar_menu', 'wp_admin_bar_ wp_menu', 10 );557 add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );558 add_action( 'admin_bar_menu', 'wp_admin_bar_ site_menu', 30);556 add_action( 'admin_bar_menu', 'wp_admin_bar_site_menu', 20 ); 557 add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 30 ); 558 add_action( 'admin_bar_menu', 'wp_admin_bar_customize_menu', 35 ); 559 559 add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 40 ); 560 560 561 561 // Content related. 562 562 if ( ! is_network_admin() && ! is_user_admin() ) { 563 add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );564 563 add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 ); 565 564 } 566 565 add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 ); -
src/wp-includes/css/admin-bar.css
215 215 color: #00b9eb; 216 216 } 217 217 218 #wpadminbar > #wp-toolbar li :hoverspan.ab-label,219 #wpadminbar > #wp-toolbar li .hoverspan.ab-label,220 #wpadminbar > #wp-toolbar a:focus span.ab-label {218 #wpadminbar > #wp-toolbar li.hover > a span.ab-label, 219 #wpadminbar > #wp-toolbar li:hover > a span.ab-label, 220 #wpadminbar > #wp-toolbar a:focus > span.ab-label { 221 221 color: #00b9eb; 222 222 } 223 223 … … 276 276 #wpadminbar .quicklinks .menupop.hover ul li a:focus, 277 277 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, 278 278 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus, 279 #wpadminbar li:hover .ab-icon:before,280 #wpadminbar li:hover .ab-item:before,281 #wpadminbar li a:focus .ab-icon:before,279 #wpadminbar li:hover > a .ab-icon:before, 280 #wpadminbar li:hover > .ab-item:before, 281 #wpadminbar li a:focus > .ab-icon:before, 282 282 #wpadminbar li .ab-item:focus:before, 283 #wpadminbar li.hover .ab-icon:before,284 #wpadminbar li.hover .ab-item:before,285 283 #wpadminbar li:hover #adminbarsearch:before, 286 284 #wpadminbar li #adminbarsearch.adminbar-focused:before { 287 285 color: #00b9eb; … … 458 456 width: auto; 459 457 } 460 458 461 /**462 * WP Logo463 */464 #wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon {465 width: 15px;466 height: 20px;467 margin-right: 0;468 padding: 6px 0 5px;469 }470 471 #wpadminbar #wp-admin-bar-wp-logo > .ab-item {472 padding: 0 7px;473 }474 475 #wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before {476 content: '\f120';477 top: 2px;478 }479 480 459 /* 481 460 * My Sites & Site Title 482 461 */ … … 501 480 margin: 6px 8px 0 -2px; 502 481 } 503 482 504 #wpadminbar #wp-admin-bar- appearance{505 margin-top: -12px;483 #wpadminbar #wp-admin-bar-site-name-default { 484 padding: 11px 0; 506 485 } 507 486 508 #wpadminbar #wp-admin-bar-my-sites > .ab-item:before, 509 #wpadminbar #wp-admin-bar-site-name > .ab-item:before { 487 #wpadminbar #wp-admin-bar-themes { 488 margin-top: 11px; 489 } 490 491 #wpadminbar #wp-admin-bar-my-sites > .ab-item:before { 510 492 content: '\f112'; 511 493 top: 2px; 512 494 } … … 516 498 top: 2px; 517 499 } 518 500 501 #wpadminbar #wp-admin-bar-view > .ab-item:before { 502 content: '\f177'; 503 top: 2px; 504 } 505 519 506 #wpadminbar #wp-admin-bar-site-name > .ab-item:before { 520 content: "\f226"; 507 content: "\f120"; 508 top: 2px; 521 509 } 522 510 523 .wp-admin #wpadminbar #wp-admin-bar-site-name > .ab-item:before {511 #wpadminbar #wp-admin-bar-visit-site > .ab-item:before { 524 512 content: "\f102"; 513 top: 2px; 525 514 } 526 515 516 #wpadminbar #wp-admin-bar-dashboard .ab-icon:before { 517 top: -4px; 518 } 527 519 520 #wpadminbar #wp-admin-bar-dashboard-toggle { 521 display: none; 522 } 528 523 529 524 /** 525 * Admin Menu 526 */ 527 #wpadminbar #wp-admin-bar-admin.ab-submenu { 528 padding: 0; 529 } 530 531 #wp-admin-bar-site-name .ab-sub-wrapper { 532 width: 160px; 533 } 534 535 #wp-admin-bar-site-name ul .ab-item { 536 font-size: 18px; 537 } 538 539 #wpadminbar #wp-admin-bar-site-name ul > li > .ab-item { 540 font-size: 14px; 541 line-height: 18px; 542 padding: 0; 543 min-height: 34px; 544 } 545 546 #wpadminbar #wp-admin-bar-site-name ul > li> .ab-item .ab-label { 547 height: auto; 548 display: inline-block; 549 font-size: 14px; 550 line-height: 14px; 551 padding: 10px 0; 552 } 553 554 #wpadminbar > #wp-toolbar #wp-admin-bar-site-name ul > li > .ab-item .ab-icon { 555 padding: 0; 556 width: 34px; 557 text-align: center; 558 margin-right: 0; 559 } 560 561 #wpadminbar > #wp-toolbar #wp-admin-bar-site-name ul > li > .ab-item .ab-icon:before { 562 line-height: 40px; 563 display: inline-block; 564 } 565 566 567 /** 530 568 * Comments 531 569 */ 532 #wpadminbar #wp-admin-bar-comments .ab-icon { 533 margin-right: 6px; 570 #wp-admin-bar-site-name.notification-pending:before { 571 content: ""; 572 width: 6px; 573 height: 6px; 574 background: #d54e21; 575 position: absolute; 576 top: 6px; 577 left: 23px; 578 border-radius: 100%; 579 z-index: 1; 534 580 } 535 581 536 #wpadminbar #wp-admin-bar-comments .ab-icon:before { 537 content: '\f101'; 538 top: 3px; 582 #wpadminbar .awaiting-mod, 583 #wpadminbar .update-plugins { 584 display: inline-block; 585 background-color: #d54e21; 586 color: #fff; 587 font-size: 9px; 588 line-height: 17px; 589 font-weight: 600; 590 margin: -2px 0 0 2px; 591 vertical-align: top; 592 -webkit-border-radius: 10px; 593 border-radius: 10px; 594 z-index: 26; 539 595 } 540 596 541 #wpadminbar #wp-admin-bar-comments .count-0 { 542 opacity: .5; 597 #wpadminbar li .awaiting-mod span, 598 #wpadminbar li span.update-plugins span { 599 display: block; 600 padding: 0 6px; 601 font-size: 9px; 602 line-height: 17px; 543 603 } 544 604 605 #wpadminbar li span.count-0 { 606 display: none; 607 } 608 545 609 /** 546 610 * New Content 547 611 */ … … 551 615 } 552 616 553 617 /** 618 * Customize 619 */ 620 #wpadminbar #wp-admin-bar-customize .ab-icon { 621 margin-right: 6px; 622 } 623 624 #wpadminbar #wp-admin-bar-customize .ab-icon:before { 625 content: '\f180'; 626 top: 2px; 627 } 628 629 /** 554 630 * Updates 555 631 */ 556 632 #wpadminbar #wp-admin-bar-updates .ab-icon:before { … … 797 873 } 798 874 799 875 #wpadminbar .ab-icon { 800 font: 40px/1dashicons !important;876 font: 20px/40px dashicons !important; 801 877 margin: 0; 802 878 padding: 0; 803 879 width: 52px; … … 805 881 text-align: center; 806 882 } 807 883 884 #wpadminbar li#wp-admin-bar-menu-toggle { 885 width: 52px; 886 } 887 808 888 #wpadminbar .ab-icon:before { 809 889 text-align: center; 810 890 } … … 846 926 display: none; 847 927 } 848 928 849 /* WP logo */850 #wpadminbar #wp-admin-bar-wp-logo > .ab-item {851 padding: 0;852 }853 854 #wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon {855 padding: 0;856 width: 52px;857 height: 46px;858 text-align: center;859 vertical-align: top;860 }861 862 #wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before {863 font: 28px/1 'dashicons' !important;864 top: -3px;865 }866 867 929 #wpadminbar .ab-icon, 868 930 #wpadminbar .ab-item:before { 869 931 padding: 0; … … 870 932 } 871 933 872 934 /* My Sites and "Site Title" menu */ 935 #wpadminbar #wp-admin-bar-site-name > .ab-item, 873 936 #wpadminbar #wp-admin-bar-my-sites > .ab-item, 874 #wpadminbar #wp-admin-bar- site-name > .ab-item,937 #wpadminbar #wp-admin-bar-visit-site > .ab-item, 875 938 #wpadminbar #wp-admin-bar-edit > .ab-item, 939 #wpadminbar #wp-admin-bar-view > .ab-item, 876 940 #wpadminbar #wp-admin-bar-my-account > .ab-item { 877 941 text-indent: 100%; 878 942 white-space: nowrap; … … 890 954 margin-right: 0; 891 955 } 892 956 957 #wpadminbar #wp-admin-bar-visit-site > .ab-item:before, 893 958 #wpadminbar #wp-admin-bar-edit > .ab-item:before, 959 #wpadminbar #wp-admin-bar-view > .ab-item:before, 894 960 #wpadminbar #wp-admin-bar-my-sites > .ab-item:before, 895 961 #wpadminbar #wp-admin-bar-site-name > .ab-item:before, 962 #wpadminbar #wp-admin-bar-customize > .ab-item:before, 896 963 #wpadminbar #wp-admin-bar-my-account > .ab-item:before { 897 964 display: block; 898 965 text-indent: 0; 899 font: normal 32px/1'dashicons';966 font: normal 20px/40px 'dashicons'; 900 967 speak: none; 901 top: 7px;902 968 width: 52px; 903 969 text-align: center; 904 970 -webkit-font-smoothing: antialiased; … … 905 971 -moz-osx-font-smoothing: grayscale; 906 972 } 907 973 974 #wpadminbar #wp-admin-bar-dashboard-toggle .ab-icon:before { 975 top: 4px; 976 } 977 908 978 #wpadminbar #wp-admin-bar-appearance { 909 979 margin-top: 0; 910 980 } … … 937 1007 top: 3px; 938 1008 } 939 1009 940 /* C omments*/941 #wpadminbar #wp-admin-bar-c omments.ab-icon {1010 /* Customize */ 1011 #wpadminbar #wp-admin-bar-customize .ab-icon { 942 1012 margin: 0; 943 1013 } 944 1014 945 #wpadminbar #wp-admin-bar-c omments.ab-icon:before {1015 #wpadminbar #wp-admin-bar-customize .ab-icon:before { 946 1016 display: block; 947 font-size: 34px;948 1017 height: 46px; 949 1018 line-height: 47px; 950 1019 top: 0; … … 1002 1071 } 1003 1072 1004 1073 #wpadminbar li#wp-admin-bar-menu-toggle, 1005 #wpadminbar li#wp-admin-bar-wp-logo, 1074 #wpadminbar li#wp-admin-bar-site-name, 1075 #wpadminbar li#wp-admin-bar-visit-site, 1076 #wpadminbar li#wp-admin-bar-dashboard-toggle, 1006 1077 #wpadminbar li#wp-admin-bar-my-sites, 1007 1078 #wpadminbar li#wp-admin-bar-updates, 1008 #wpadminbar li#wp-admin-bar-site-name,1009 1079 #wpadminbar li#wp-admin-bar-new-content, 1010 1080 #wpadminbar li#wp-admin-bar-edit, 1011 #wpadminbar li#wp-admin-bar-comments, 1081 #wpadminbar li#wp-admin-bar-view, 1082 #wpadminbar li#wp-admin-bar-customize, 1012 1083 #wpadminbar li#wp-admin-bar-my-account { 1013 1084 display: block; 1014 1085 }