Ticket #32678: 32678.4.diff
File 32678.4.diff, 25.3 KB (added by , 10 years ago) |
---|
-
src/wp-admin/css/admin-menu.css
901 901 } 902 902 903 903 #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before { 904 content: '\f 228';904 content: '\f120'; 905 905 display: inline-block; 906 906 float: left; 907 font: normal 40px/45px 'Dashicons';907 font: normal 20px/45px 'Dashicons'; 908 908 vertical-align: middle; 909 909 outline: none; 910 910 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( 310 'parent' => 'site-name', 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 $icon = '<span class="ab-icon dashicons-dashboard"></span>'; 256 $wp_admin_bar->add_menu( array( 311 257 'id' => 'dashboard', 312 'title' => __( 'Dashboard' ),258 'title' => $icon . '<span class="ab-label">' . __( 'Dashboard' ) . '</span>', 313 259 'href' => admin_url(), 314 260 ) ); 315 261 316 // Add the a ppearancesubmenu items.317 wp_admin_bar_a ppearance_menu( $wp_admin_bar );262 // Add the admin submenu items. 263 wp_admin_bar_admin_menu( $wp_admin_bar ); 318 264 } 319 265 } 320 266 … … 629 575 } 630 576 631 577 /** 632 * Add edit comments link with awaiting moderation count bubble.578 * Add "Customize" menu. 633 579 * 634 * @since 3.1.0580 * @since 4.3.0 635 581 * 636 582 * @param WP_Admin_Bar $wp_admin_bar 637 583 */ 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 ) ); 584 function wp_admin_bar_customize_menu( $wp_admin_bar ) { 585 if ( current_user_can( 'customize' ) ) { 586 $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; 587 $customize_url = add_query_arg( 'url', urlencode( $current_url ), wp_customize_url() ); 588 $title = '<span class="ab-icon"></span><span class="ab-label">' . __( 'Customize' ) . '</span>'; 589 $wp_admin_bar->add_menu( array( 590 'id' => 'customize', 591 'title' => $title, 592 'href' => $customize_url, 593 'meta' => array( 594 'class' => 'hide-if-no-customize', 595 ), 596 ) ); 597 add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' ); 598 } 655 599 } 656 600 657 601 /** 658 * Add a ppearancesubmenu items to the "Site Name" menu.602 * Add admin submenu items to the "Site Name" menu. 659 603 * 660 * @since 3.1.0604 * @since 4.3.0 661 605 * 662 606 * @param WP_Admin_Bar $wp_admin_bar 663 607 */ 664 function wp_admin_bar_a ppearance_menu( $wp_admin_bar ) {665 $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'a ppearance' ) );608 function wp_admin_bar_admin_menu( $wp_admin_bar ) { 609 $wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'admin' ) ); 666 610 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());611 // Post types. 612 $cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' ); 669 613 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 ) ); 614 if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->edit_posts ) ) { 615 $menu_icon = '<span class="ab-icon dashicons-admin-post"></span>'; 616 $actions[ 'edit.php' ] = array( $cpts['post']->labels->name, 'edit-posts', $menu_icon ); 617 } 680 618 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 } 619 if ( isset( $cpts['attachment'] ) && current_user_can( 'edit_posts' ) ) { 620 $menu_icon = '<span class="ab-icon dashicons-admin-media"></span>'; 621 $actions[ 'upload.php' ] = array( $cpts['attachment']->labels->name, 'edit-media', $menu_icon ); 692 622 } 693 623 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' ); 624 if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->edit_posts ) ) { 625 $menu_icon = '<span class="ab-icon dashicons-admin-page"></span>'; 626 $actions[ 'edit.php?post_type=page' ] = array( $cpts['page']->labels->name, 'edit-pages', $menu_icon ); 705 627 } 706 628 707 if ( ! current_user_can( 'edit_theme_options' ) ) { 708 return; 629 unset( $cpts['post'], $cpts['page'], $cpts['attachment'] ); 630 631 // Add any additional custom post types. 632 foreach ( $cpts as $cpt ) { 633 if ( ! current_user_can( $cpt->cap->edit_posts ) ) { 634 continue; 635 } 636 if ( is_string( $cpt->menu_icon ) ) { 637 // Special handling for data:image/svg+xml and Dashicons. 638 if ( 0 === strpos( $cpt->menu_icon, 'dashicons-' ) ) { 639 $menu_icon = '<span class="ab-icon ' . $cpt->menu_icon . '"></span>'; 640 } elseif ( 0 === strpos( $cpt->menu_icon, 'data:image/svg+xml;base64,' ) ) { 641 $menu_icon = '<span class="ab-icon"><img src="' . $cpt->menu_icon . '"></span>'; 642 } else { 643 $menu_icon = '<span class="ab-icon"><img src="' . esc_url( $cpt->menu_icon ) . '"></span>'; 644 } 645 } else { 646 $menu_icon = '<span class="ab-icon dashicons-admin-post"></span>'; 647 } 648 $key = 'edit.php?post_type=' . $cpt->name; 649 $actions[ $key ] = array( $cpt->labels->menu_name, 'edit-' . $cpt->name, $menu_icon ); 709 650 } 710 651 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 ) ); 652 if ( $actions ) { 653 foreach ( $actions as $link => $action ) { 654 list( $title, $id, $menu_icon ) = $action; 721 655 722 if ( current_user_can( 'customize' ) ) {723 656 $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 ), 657 'parent' => 'admin', 658 'id' => $id, 659 'title' => $menu_icon . '<span class="ab-label">' . $title . '</span>', 660 'href' => admin_url( $link ) 731 661 ) ); 732 662 } 733 663 } 734 664 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') ) ); 665 // Comments 666 if ( current_user_can( 'edit_posts' ) ) { 667 $awaiting_mod = wp_count_comments(); 668 $awaiting_mod = $awaiting_mod->moderated; 669 $icon = '<span class="ab-icon dashicons-admin-comments"></span>'; 670 $wp_admin_bar->add_menu( array( 671 'parent' => 'admin', 672 'id' => 'comments', 673 '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>', 674 'href' => admin_url( 'edit-comments.php' ), 675 ) ); 676 } 737 677 738 if ( current_theme_supports( 'custom-background' ) ) { 678 // Appearance. 679 if ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) { 680 $icon = '<span class="ab-icon dashicons-admin-appearance"></span>'; 739 681 $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 ), 682 'parent' => 'admin', 683 'id' => 'themes', 684 'title' => $icon . '<span class="ab-label">' . __( 'Appearance' ) . '</span>', // @todo should we just say themes here since there isn't a submenu? 685 'href' => admin_url( 'themes.php' ) 747 686 ) ); 687 } 748 688 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 ) ); 689 // Plugins. 690 if ( current_user_can( 'activate_plugins' ) ) { 691 if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) { 692 $update_data = wp_get_update_data(); 693 $count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>"; 694 } else { 695 $count = ''; 759 696 } 697 $icon = '<span class="ab-icon dashicons-admin-plugins"></span>'; 698 $wp_admin_bar->add_menu( array( 699 'parent' => 'admin', 700 'id' => 'plugins', 701 'title' => $icon . '<span class="ab-label">' . sprintf( __( 'Plugins %s' ), $count ) . '</span>', 702 'href' => admin_url( 'plugins.php' ), 703 ) ); 760 704 } 761 705 762 if ( current_theme_supports( 'custom-header' ) ) { 706 // Users. 707 if ( current_user_can( 'list_users' ) ) { 708 $icon = '<span class="ab-icon dashicons-admin-users"></span>'; 763 709 $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 ), 710 'parent' => 'admin', 711 'id' => 'edit-users', 712 'title' => $icon . '<span class="ab-label">' . __( 'Users' ) . '</span>', 713 'href' => admin_url( 'users.php' ), 771 714 ) ); 715 } 772 716 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 } 717 // Users. 718 if ( current_user_can( 'edit_posts' ) ) { 719 $icon = '<span class="ab-icon dashicons-admin-tools"></span>'; 720 $wp_admin_bar->add_menu( array( 721 'parent' => 'admin', 722 'id' => 'tools', 723 'title' => $icon . '<span class="ab-label">' . __( 'Tools' ) . '</span>', 724 'href' => admin_url( 'tools.php' ) 725 ) ); 784 726 } 785 727 728 // Settings. 729 if ( current_user_can( 'manage_options' ) ) { 730 $icon = '<span class="ab-icon dashicons-admin-settings"></span>'; 731 $wp_admin_bar->add_menu( array( 732 'parent' => 'admin', 733 'id' => 'settings', 734 'title' => $icon . '<span class="ab-label">' . __( 'Settings' ) . '</span>', 735 'href' => admin_url( 'options.php' ) 736 ) ); 737 } 786 738 } 787 739 788 740 /** … … 854 806 'class' => 'ab-top-secondary', 855 807 ), 856 808 ) ); 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 809 } 866 810 867 811 /** -
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 518 #wpadminbar #wp-admin-bar-dashboard { 519 display: none; 520 } 527 521 522 /** 523 * Admin Menu 524 */ 525 #wpadminbar #wp-admin-bar-admin.ab-submenu { 526 padding: 0; 527 } 528 528 529 #wp-admin-bar-site-name .ab-sub-wrapper { 530 width: 160px; 531 } 532 533 #wp-admin-bar-site-name ul .ab-item { 534 font-size: 18px; 535 } 536 537 #wpadminbar #wp-admin-bar-site-name ul > li > .ab-item { 538 font-size: 14px; 539 line-height: 18px; 540 padding: 0; 541 min-height: 34px; 542 } 543 544 #wpadminbar #wp-admin-bar-site-name ul > li> .ab-item .ab-label { 545 height: auto; 546 display: inline-block; 547 font-size: 14px; 548 line-height: 14px; 549 padding: 10px 0; 550 } 551 552 #wpadminbar > #wp-toolbar #wp-admin-bar-site-name ul > li > .ab-item .ab-icon { 553 padding: 0; 554 width: 34px; 555 height: 36px; 556 text-align: center; 557 margin-right: 0; 558 } 559 560 #wpadminbar > #wp-toolbar #wp-admin-bar-site-name ul > li > .ab-item .ab-icon:before { 561 padding: 7px 0; 562 display: inline-block; 563 } 564 565 529 566 /** 530 567 * Comments 531 568 */ 532 #wpadminbar #wp-admin-bar-comments .ab-icon { 533 margin-right: 6px; 569 #wp-admin-bar-site-name.notification-pending:before { 570 content: ""; 571 width: 6px; 572 height: 6px; 573 background: #d54e21; 574 position: absolute; 575 top: 6px; 576 left: 23px; 577 border-radius: 100%; 578 z-index: 1; 534 579 } 535 580 536 #wpadminbar #wp-admin-bar-comments .ab-icon:before { 537 content: '\f101'; 538 top: 3px; 581 #wpadminbar .awaiting-mod, 582 #wpadminbar .update-plugins { 583 display: inline-block; 584 background-color: #d54e21; 585 color: #fff; 586 font-size: 9px; 587 line-height: 17px; 588 font-weight: 600; 589 margin: -2px 0 0 2px; 590 vertical-align: top; 591 -webkit-border-radius: 10px; 592 border-radius: 10px; 593 z-index: 26; 539 594 } 540 595 541 #wpadminbar #wp-admin-bar-comments .count-0 { 542 opacity: .5; 596 #wpadminbar li .awaiting-mod span, 597 #wpadminbar li span.update-plugins span { 598 display: block; 599 padding: 0 6px; 600 font-size: 9px; 601 line-height: 17px; 543 602 } 544 603 604 #wpadminbar li span.count-0 { 605 display: none; 606 } 607 545 608 /** 546 609 * New Content 547 610 */ … … 551 614 } 552 615 553 616 /** 617 * Customize 618 */ 619 #wpadminbar #wp-admin-bar-customize .ab-icon { 620 margin-right: 6px; 621 } 622 623 #wpadminbar #wp-admin-bar-customize .ab-icon:before { 624 content: '\f180'; 625 top: 2px; 626 } 627 628 /** 554 629 * Updates 555 630 */ 556 631 #wpadminbar #wp-admin-bar-updates .ab-icon:before { … … 797 872 } 798 873 799 874 #wpadminbar .ab-icon { 800 font: 40px/1dashicons !important;875 font: 20px/40px dashicons !important; 801 876 margin: 0; 802 877 padding: 0; 803 878 width: 52px; … … 807 882 808 883 #wpadminbar .ab-icon:before { 809 884 text-align: center; 885 padding: 0; 810 886 } 811 887 812 888 #wpadminbar .ab-submenu { … … 846 922 display: none; 847 923 } 848 924 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 925 #wpadminbar .ab-icon, 868 926 #wpadminbar .ab-item:before { 869 927 padding: 0; … … 872 930 /* My Sites and "Site Title" menu */ 873 931 #wpadminbar #wp-admin-bar-my-sites > .ab-item, 874 932 #wpadminbar #wp-admin-bar-site-name > .ab-item, 933 #wpadminbar #wp-admin-bar-visit-site > .ab-item, 875 934 #wpadminbar #wp-admin-bar-edit > .ab-item, 935 #wpadminbar #wp-admin-bar-view > .ab-item, 876 936 #wpadminbar #wp-admin-bar-my-account > .ab-item { 877 937 text-indent: 100%; 878 938 white-space: nowrap; … … 890 950 margin-right: 0; 891 951 } 892 952 953 #wpadminbar #wp-admin-bar-visit-site > .ab-item:before, 893 954 #wpadminbar #wp-admin-bar-edit > .ab-item:before, 955 #wpadminbar #wp-admin-bar-view > .ab-item:before, 894 956 #wpadminbar #wp-admin-bar-my-sites > .ab-item:before, 895 957 #wpadminbar #wp-admin-bar-site-name > .ab-item:before, 958 #wpadminbar #wp-admin-bar-customize > .ab-item:before, 896 959 #wpadminbar #wp-admin-bar-my-account > .ab-item:before { 897 960 display: block; 898 961 text-indent: 0; 899 font: normal 32px/1'dashicons';962 font: normal 20px/32px 'dashicons'; 900 963 speak: none; 901 964 top: 7px; 902 965 width: 52px; … … 905 968 -moz-osx-font-smoothing: grayscale; 906 969 } 907 970 971 #wpadminbar > #wp-toolbar #wp-admin-bar-site-name ul > li > .ab-item .ab-icon:before { 972 padding: 0; 973 } 974 975 #wpadminbar #wp-admin-bar-dashboard { 976 display: block; 977 } 978 979 #wpadminbar #wp-admin-bar-dashboard .ab-icon:before { 980 top: 4px; 981 } 982 908 983 #wpadminbar #wp-admin-bar-appearance { 909 984 margin-top: 0; 910 985 } … … 937 1012 top: 3px; 938 1013 } 939 1014 940 /* C omments*/941 #wpadminbar #wp-admin-bar-c omments.ab-icon {1015 /* Customize */ 1016 #wpadminbar #wp-admin-bar-customize .ab-icon { 942 1017 margin: 0; 943 1018 } 944 1019 945 #wpadminbar #wp-admin-bar-c omments.ab-icon:before {1020 #wpadminbar #wp-admin-bar-customize .ab-icon:before { 946 1021 display: block; 947 font-size: 34px;948 1022 height: 46px; 949 1023 line-height: 47px; 950 1024 top: 0; … … 1001 1075 display: none; 1002 1076 } 1003 1077 1078 #wpadminbar li#wp-admin-bar-site-name, 1004 1079 #wpadminbar li#wp-admin-bar-menu-toggle, 1005 #wpadminbar li#wp-admin-bar-wp-logo,1006 1080 #wpadminbar li#wp-admin-bar-my-sites, 1081 #wpadminbar li#wp-admin-bar-visit-site, 1007 1082 #wpadminbar li#wp-admin-bar-updates, 1008 #wpadminbar li#wp-admin-bar-site-name,1009 1083 #wpadminbar li#wp-admin-bar-new-content, 1010 1084 #wpadminbar li#wp-admin-bar-edit, 1011 #wpadminbar li#wp-admin-bar-comments, 1085 #wpadminbar li#wp-admin-bar-view, 1086 #wpadminbar li#wp-admin-bar-customize, 1012 1087 #wpadminbar li#wp-admin-bar-my-account { 1013 1088 display: block; 1014 1089 }