Ticket #32678: 32678.3.diff
File 32678.3.diff, 24.6 KB (added by , 10 years ago) |
---|
-
src/wp-admin/css/admin-menu.css
896 896 } 897 897 898 898 #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { 899 content: '\f 228';899 content: '\f120'; 900 900 display: inline-block; 901 901 float: left; 902 font: normal 40px/45px 'Dashicons';902 font: normal 20px/45px 'Dashicons'; 903 903 vertical-align: middle; 904 904 outline: none; 905 905 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 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 } 234 281 235 $wp_admin_bar->add_menu( array( 282 236 'id' => 'site-name', 283 237 'title' => $title, 284 238 'href' => is_admin() ? home_url( '/' ) : admin_url(), 239 'meta' => array( 240 'class' => ( ! is_admin() && $notification ) ? 'notification-pending' : '', 241 ), 285 242 ) ); 286 243 287 // Create submenu items.244 // Add front/admin cross-links. 288 245 289 246 if ( is_admin() ) { 290 247 // Add an option to visit the site. 291 248 $wp_admin_bar->add_menu( array( 292 'parent' => 'site-name', 293 'id' => 'view-site', 249 'id' => 'visit-site', 294 250 'title' => __( 'Visit Site' ), 295 251 'href' => home_url( '/' ), 296 252 ) ); 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 253 } else { 308 254 // We're on the front end, link to the Dashboard. 255 $icon = '<span class="ab-icon dashicons-dashboard"></span>'; 309 256 $wp_admin_bar->add_menu( array( 310 257 'parent' => 'site-name', 311 258 'id' => 'dashboard', 312 'title' => __( 'Dashboard' ),259 'title' => $icon . '<span class="ab-label">' . __( 'Dashboard' ) . '</span>', 313 260 'href' => admin_url(), 314 261 ) ); 315 262 316 // Add the a ppearancesubmenu items.317 wp_admin_bar_a ppearance_menu( $wp_admin_bar );263 // Add the admin submenu items. 264 wp_admin_bar_admin_menu( $wp_admin_bar ); 318 265 } 319 266 } 320 267 … … 629 576 } 630 577 631 578 /** 632 * Add edit comments link with awaiting moderation count bubble.579 * Add "Customize" menu. 633 580 * 634 * @since 3.1.0581 * @since 4.3.0 635 582 * 636 583 * @param WP_Admin_Bar $wp_admin_bar 637 584 */ 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 ) ); 585 function wp_admin_bar_customize_menu( $wp_admin_bar ) { 586 if ( current_user_can( 'customize' ) ) { 587 $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; 588 $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ); 589 $title = '<span class="ab-icon"></span><span class="ab-label">' . __( 'Customize' ) . '</span>'; 590 $wp_admin_bar->add_menu( array( 591 'id' => 'customize', 592 'title' => $title, 593 'href' => $customize_url, 594 'meta' => array( 595 'class' => 'hide-if-no-customize', 596 ), 597 ) ); 598 add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' ); 599 } 655 600 } 656 601 657 602 /** 658 * Add a ppearancesubmenu items to the "Site Name" menu.603 * Add admin submenu items to the "Site Name" menu. 659 604 * 660 * @since 3.1.0605 * @since 4.3.0 661 606 * 662 607 * @param WP_Admin_Bar $wp_admin_bar 663 608 */ 664 function wp_admin_bar_a ppearance_menu( $wp_admin_bar ) {665 $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'a ppearance' ) );609 function wp_admin_bar_admin_menu( $wp_admin_bar ) { 610 $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'admin' ) ); 666 611 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());612 // Post types. 613 $cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' ); 669 614 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 ) ); 615 if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->edit_posts ) ) { 616 $menu_icon = '<span class="ab-icon dashicons-admin-post"></span>'; 617 $actions[ 'edit.php' ] = array( $cpts['post']->labels->name, 'edit-posts', $menu_icon ); 618 } 680 619 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 } 620 if ( isset( $cpts['attachment'] ) && current_user_can( 'edit_posts' ) ) { 621 $menu_icon = '<span class="ab-icon dashicons-admin-media"></span>'; 622 $actions[ 'upload.php' ] = array( $cpts['attachment']->labels->name, 'edit-media', $menu_icon ); 692 623 } 693 624 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' ); 625 if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->edit_posts ) ) { 626 $menu_icon = '<span class="ab-icon dashicons-admin-page"></span>'; 627 $actions[ 'edit.php?post_type=page' ] = array( $cpts['page']->labels->name, 'edit-pages', $menu_icon ); 705 628 } 706 629 707 if ( ! current_user_can( 'edit_theme_options' ) ) { 708 return; 630 unset( $cpts['post'], $cpts['page'], $cpts['attachment'] ); 631 632 // Add any additional custom post types. 633 foreach ( $cpts as $cpt ) { 634 if ( ! current_user_can( $cpt->cap->edit_posts ) ) { 635 continue; 636 } 637 if ( is_string( $cpt->menu_icon ) ) { 638 // Special handling for data:image/svg+xml and Dashicons. 639 if ( 0 === strpos( $cpt->menu_icon, 'dashicons-' ) ) { 640 $menu_icon = '<span class="ab-icon ' . $cpt->menu_icon . '"></span>'; 641 } elseif ( 0 === strpos( $cpt->menu_icon, 'data:image/svg+xml;base64,' ) ) { 642 $menu_icon = '<span class="ab-icon"><img src="' . $cpt->menu_icon . '"></span>'; 643 } else { 644 $menu_icon = '<span class="ab-icon"><img src="' . esc_url( $cpt->menu_icon ) . '"></span>'; 645 } 646 } else { 647 $menu_icon = '<span class="ab-icon dashicons-admin-post"></span>'; 648 } 649 $key = 'edit.php?post_type=' . $cpt->name; 650 $actions[ $key ] = array( $cpt->labels->menu_name, 'edit-' . $cpt->name, $menu_icon ); 709 651 } 710 652 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 ) ); 653 if ( $actions ) { 654 foreach ( $actions as $link => $action ) { 655 list( $title, $id, $menu_icon ) = $action; 721 656 722 if ( current_user_can( 'customize' ) ) {723 657 $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 ), 658 'parent' => 'admin', 659 'id' => $id, 660 'title' => $menu_icon . '<span class="ab-label">' . $title . '</span>', 661 'href' => admin_url( $link ) 731 662 ) ); 732 663 } 733 664 } 734 665 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') ) ); 666 // Comments 667 if ( current_user_can( 'edit_posts' ) ) { 668 $awaiting_mod = wp_count_comments(); 669 $awaiting_mod = $awaiting_mod->moderated; 670 $icon = '<span class="ab-icon dashicons-admin-comments"></span>'; 671 $wp_admin_bar->add_menu( array( 672 'parent' => 'admin', 673 'id' => 'comments', 674 '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>', 675 'href' => admin_url( 'edit-comments.php' ), 676 ) ); 677 } 737 678 738 if ( current_theme_supports( 'custom-background' ) ) { 679 // Appearance. 680 if ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) { 681 $icon = '<span class="ab-icon dashicons-admin-appearance"></span>'; 739 682 $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 ), 683 'parent' => 'admin', 684 'id' => 'themes', 685 'title' => $icon . '<span class="ab-label">' . __( 'Appearance' ) . '</span>', // @todo should we just say themes here since there isn't a submenu? 686 'href' => admin_url( 'themes.php' ) 747 687 ) ); 688 } 748 689 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 ) ); 690 // Plugins. 691 if ( current_user_can( 'activate_plugins' ) ) { 692 if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) { 693 $update_data = wp_get_update_data(); 694 $count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>"; 695 } else { 696 $count = ''; 759 697 } 698 $icon = '<span class="ab-icon dashicons-admin-plugins"></span>'; 699 $wp_admin_bar->add_menu( array( 700 'parent' => 'admin', 701 'id' => 'plugins', 702 'title' => $icon . '<span class="ab-label">' . sprintf( __( 'Plugins %s' ), $count ) . '</span>', 703 'href' => admin_url( 'plugins.php' ), 704 ) ); 760 705 } 761 706 762 if ( current_theme_supports( 'custom-header' ) ) { 707 // Users. 708 if ( current_user_can( 'list_users' ) ) { 709 $icon = '<span class="ab-icon dashicons-admin-users"></span>'; 763 710 $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 ), 711 'parent' => 'admin', 712 'id' => 'edit-users', 713 'title' => $icon . '<span class="ab-label">' . __( 'Users' ) . '</span>', 714 'href' => admin_url( 'users.php' ), 771 715 ) ); 716 } 772 717 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 } 718 // Users. 719 if ( current_user_can( 'edit_posts' ) ) { 720 $icon = '<span class="ab-icon dashicons-admin-tools"></span>'; 721 $wp_admin_bar->add_menu( array( 722 'parent' => 'admin', 723 'id' => 'tools', 724 'title' => $icon . '<span class="ab-label">' . __( 'Tools' ) . '</span>', 725 'href' => admin_url( 'tools.php' ) 726 ) ); 784 727 } 785 728 729 // Settings. 730 if ( current_user_can( 'manage_options' ) ) { 731 $icon = '<span class="ab-icon dashicons-admin-settings"></span>'; 732 $wp_admin_bar->add_menu( array( 733 'parent' => 'admin', 734 'id' => 'settings', 735 'title' => $icon . '<span class="ab-label">' . __( 'Settings' ) . '</span>', 736 'href' => admin_url( 'options.php' ) 737 ) ); 738 } 786 739 } 787 740 788 741 /** … … 854 807 'class' => 'ab-top-secondary', 855 808 ), 856 809 ) ); 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 810 } 866 811 867 812 /** -
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 487 #wpadminbar #wp-admin-bar-themes { 488 margin-top: 11px; 489 } 490 508 491 #wpadminbar #wp-admin-bar-my-sites > .ab-item:before, 509 492 #wpadminbar #wp-admin-bar-site-name > .ab-item:before { 510 493 content: '\f112'; … … 516 499 top: 2px; 517 500 } 518 501 502 #wpadminbar #wp-admin-bar-view > .ab-item:before { 503 content: '\f177'; 504 top: 2px; 505 } 506 519 507 #wpadminbar #wp-admin-bar-site-name > .ab-item:before { 520 content: "\f226"; 508 content: "\f120"; 509 top: 2px; 510 margin-right: 9px; 521 511 } 522 512 523 .wp-admin #wpadminbar #wp-admin-bar-site-name > .ab-item:before {513 #wpadminbar #wp-admin-bar-visit-site > .ab-item:before { 524 514 content: "\f102"; 515 top: 2px; 525 516 } 526 517 527 518 519 /** 520 * Admin Menu 521 */ 522 #wpadminbar #wp-admin-bar-admin.ab-submenu { 523 padding: 0; 524 } 528 525 526 #wp-admin-bar-site-name .ab-sub-wrapper { 527 width: 160px; 528 } 529 530 #wp-admin-bar-site-name ul .ab-item { 531 font-size: 18px; 532 } 533 534 #wpadminbar #wp-admin-bar-site-name ul > li > .ab-item { 535 font-size: 14px; 536 line-height: 18px; 537 padding: 0; 538 min-height: 34px; 539 } 540 541 #wpadminbar #wp-admin-bar-site-name ul > li> .ab-item .ab-label { 542 height: auto; 543 display: inline-block; 544 font-size: 14px; 545 line-height: 14px; 546 padding: 10px 0; 547 } 548 549 #wpadminbar > #wp-toolbar #wp-admin-bar-site-name ul > li > .ab-item .ab-icon { 550 padding: 0; 551 width: 34px; 552 height: 36px; 553 text-align: center; 554 margin-right: 0; 555 } 556 557 #wpadminbar > #wp-toolbar #wp-admin-bar-site-name ul > li > .ab-item .ab-icon:before { 558 padding: 7px 0; 559 display: inline-block; 560 } 561 562 529 563 /** 530 564 * Comments 531 565 */ 532 #wpadminbar #wp-admin-bar-comments .ab-icon { 533 margin-right: 6px; 566 #wp-admin-bar-site-name.notification-pending:before { 567 content: ""; 568 width: 6px; 569 height: 6px; 570 background: #d54e21; 571 position: absolute; 572 top: 6px; 573 left: 23px; 574 border-radius: 100%; 575 z-index: 1; 534 576 } 535 577 536 #wpadminbar #wp-admin-bar-comments .ab-icon:before { 537 content: '\f101'; 538 top: 3px; 578 #wpadminbar .awaiting-mod, 579 #wpadminbar .update-plugins { 580 display: inline-block; 581 background-color: #d54e21; 582 color: #fff; 583 font-size: 9px; 584 line-height: 17px; 585 font-weight: 600; 586 margin: -2px 0 0 2px; 587 vertical-align: top; 588 -webkit-border-radius: 10px; 589 border-radius: 10px; 590 z-index: 26; 539 591 } 540 592 541 #wpadminbar #wp-admin-bar-comments .count-0 { 542 opacity: .5; 593 #wpadminbar li .awaiting-mod span, 594 #wpadminbar li span.update-plugins span { 595 display: block; 596 padding: 0 6px; 597 font-size: 9px; 598 line-height: 17px; 543 599 } 544 600 601 #wpadminbar li span.count-0 { 602 display: none; 603 } 604 545 605 /** 546 606 * New Content 547 607 */ … … 551 611 } 552 612 553 613 /** 614 * Customize 615 */ 616 #wpadminbar #wp-admin-bar-customize .ab-icon { 617 margin-right: 6px; 618 } 619 620 #wpadminbar #wp-admin-bar-customize .ab-icon:before { 621 content: '\f180'; 622 top: 2px; 623 } 624 625 /** 554 626 * Updates 555 627 */ 556 628 #wpadminbar #wp-admin-bar-updates .ab-icon:before { … … 797 869 } 798 870 799 871 #wpadminbar .ab-icon { 800 font: 40px/1dashicons !important;872 font: 20px/40px dashicons !important; 801 873 margin: 0; 802 874 padding: 0; 803 875 width: 52px; … … 846 918 display: none; 847 919 } 848 920 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 921 #wpadminbar .ab-icon, 868 922 #wpadminbar .ab-item:before { 869 923 padding: 0; … … 872 926 /* My Sites and "Site Title" menu */ 873 927 #wpadminbar #wp-admin-bar-my-sites > .ab-item, 874 928 #wpadminbar #wp-admin-bar-site-name > .ab-item, 929 #wpadminbar #wp-admin-bar-visit-site > .ab-item, 875 930 #wpadminbar #wp-admin-bar-edit > .ab-item, 931 #wpadminbar #wp-admin-bar-view > .ab-item, 876 932 #wpadminbar #wp-admin-bar-my-account > .ab-item { 877 933 text-indent: 100%; 878 934 white-space: nowrap; … … 890 946 margin-right: 0; 891 947 } 892 948 949 #wpadminbar #wp-admin-bar-visit-site > .ab-item:before, 893 950 #wpadminbar #wp-admin-bar-edit > .ab-item:before, 951 #wpadminbar #wp-admin-bar-view > .ab-item:before, 894 952 #wpadminbar #wp-admin-bar-my-sites > .ab-item:before, 895 953 #wpadminbar #wp-admin-bar-site-name > .ab-item:before, 954 #wpadminbar #wp-admin-bar-customize > .ab-item:before, 896 955 #wpadminbar #wp-admin-bar-my-account > .ab-item:before { 897 956 display: block; 898 957 text-indent: 0; 899 font: normal 32px/1'dashicons';958 font: normal 20px/32px 'dashicons'; 900 959 speak: none; 901 960 top: 7px; 902 961 width: 52px; … … 937 996 top: 3px; 938 997 } 939 998 940 /* C omments*/941 #wpadminbar #wp-admin-bar-c omments.ab-icon {999 /* Customize */ 1000 #wpadminbar #wp-admin-bar-customize .ab-icon { 942 1001 margin: 0; 943 1002 } 944 1003 945 #wpadminbar #wp-admin-bar-c omments.ab-icon:before {1004 #wpadminbar #wp-admin-bar-customize .ab-icon:before { 946 1005 display: block; 947 font-size: 34px;948 1006 height: 46px; 949 1007 line-height: 47px; 950 1008 top: 0; … … 1002 1060 } 1003 1061 1004 1062 #wpadminbar li#wp-admin-bar-menu-toggle, 1005 #wpadminbar li#wp-admin-bar-wp-logo,1006 1063 #wpadminbar li#wp-admin-bar-my-sites, 1064 #wpadminbar li#wp-admin-bar-visit-site, 1007 1065 #wpadminbar li#wp-admin-bar-updates, 1008 #wpadminbar li#wp-admin-bar-site-name,1009 1066 #wpadminbar li#wp-admin-bar-new-content, 1010 1067 #wpadminbar li#wp-admin-bar-edit, 1011 #wpadminbar li#wp-admin-bar-comments, 1068 #wpadminbar li#wp-admin-bar-view, 1069 #wpadminbar li#wp-admin-bar-customize, 1012 1070 #wpadminbar li#wp-admin-bar-my-account { 1013 1071 display: block; 1014 1072 }