mirror of
https://github.com/WordPress/WordPress.git
synced 2024-06-25 22:35:02 +02:00
Admin bar fixes. Props ocean90. see #14772
git-svn-id: http://svn.automattic.com/wordpress/trunk@16310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
parent
5cef2ca0a6
commit
a071a3a1df
|
|
@ -110,7 +110,7 @@ function wp_admin_bar_my_account_menu() {
|
|||
function wp_admin_bar_my_sites_menu() {
|
||||
global $wpdb, $wp_admin_bar;
|
||||
|
||||
/* Add the 'My Dashboards' menu if the user has more than one site. */
|
||||
/* Add the 'My Sites' menu if the user has more than one site. */
|
||||
if ( count( $wp_admin_bar->user->blogs ) <= 1 )
|
||||
return;
|
||||
|
||||
|
|
@ -124,13 +124,13 @@ function wp_admin_bar_my_sites_menu() {
|
|||
$blavatar = '<img src="' . esc_url($default) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" />';
|
||||
|
||||
$marker = '';
|
||||
if ( strlen($blog->blogname) > 35 )
|
||||
if ( strlen($blog->blogname) > 15 )
|
||||
$marker = '...';
|
||||
|
||||
if ( empty( $blog->blogname ) )
|
||||
$blogname = $blog->domain;
|
||||
else
|
||||
$blogname = substr( $blog->blogname, 0, 35 ) . $marker;
|
||||
$blogname = substr( $blog->blogname, 0, 15 ) . $marker;
|
||||
|
||||
if ( ! isset( $blog->visible ) || $blog->visible === true ) {
|
||||
$wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => get_admin_url($blog->userblog_id), ) );
|
||||
|
|
@ -220,14 +220,13 @@ function wp_admin_bar_comments_menu() {
|
|||
$awaiting_mod = wp_count_comments();
|
||||
$awaiting_mod = $awaiting_mod->moderated;
|
||||
|
||||
// @todo styling for awaiting mod count. Don't show count if zero?
|
||||
$wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), "<span id='awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'href' => admin_url('edit-comments.php') ) );
|
||||
$wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), "<span id='ab-awaiting-mod' class='count-$awaiting_mod'><span class='pending-count'>" . number_format_i18n($awaiting_mod) . "</span></span>" ), 'href' => admin_url('edit-comments.php') ) );
|
||||
}
|
||||
|
||||
function wp_admin_bar_appearance_menu() {
|
||||
global $wp_admin_bar;
|
||||
|
||||
if ( !current_user_can('switch themes') )
|
||||
if ( !current_user_can('switch_themes') )
|
||||
return;
|
||||
|
||||
$wp_admin_bar->add_menu( array( 'id' => 'appearance', 'title' => __('Appearance'), 'href' => admin_url('themes.php') ) );
|
||||
|
|
@ -276,9 +275,8 @@ function wp_admin_bar_updates_menu() {
|
|||
|
||||
$update_title = !empty($update_title) ? esc_attr(implode(', ', $update_title)) : '';
|
||||
|
||||
$update_title = sprintf( __('Updates %s'), "<span class='update-plugins count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" );
|
||||
$update_title = sprintf( __('Updates %s'), "<span id='ab-updates' class='count-$update_count' title='$update_title'><span class='update-count'>" . number_format_i18n($update_count) . "</span></span>" );
|
||||
|
||||
// @todo styling for awaiting mod count. Don't show count if zero?
|
||||
$wp_admin_bar->add_menu( array( 'id' => 'updates', 'title' => $update_title, 'href' => admin_url('update-core.php') ) );
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
#wpadminbar{background:#666 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x;direction:rtl;font-family:Tahoma,Arial,sans-serif;right:0;left:auto;}#wpadminbar div,#wpadminbar ul,#wpadminbar ul li{min-height:0;}#wpadminbar ul li img{margin-left:8px!important;margin-right:0!important;}#wpadminbar .quicklinks>ul>li>a{border-left:1px solid #686868;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-left:none;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:hover>a{border-right-color:#707070;border-left-color:#686868;}#wpadminbar .avatar{margin:-3px 0 0 5px!important;float:none;}#wpadminbar .menupop li:hover>ul,#wpadminbar .menupop li.hover>ul{margin-left:-100%;}#wpadminbar .menupop a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 100.4% no-repeat;padding-left:.8em;}#wpadminbar .menupop ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 97.2% no-repeat;padding-right:0;padding-left:1.5em;}#wpadminbar .menupop ul{right:0;width:100%;min-width:150px;}#wpadminbar .ab-my-account ul{width:200px;}#wpadminbar .ab-my-blogs ul{width:300px;}#wpadminbar .ab-my-blogs ul ul{width:200px;}#wpadminbar .ab-bloginfo ul{width:200px;}#wpadminbar .ab-subscribe ul{width:150px;}#wpadminbar .menupop ul li{width:auto;}#wpadminbar .quicklinks a{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar li.ab-sadmin{float:left;}#wpadminbar li.ab-sadmin ul{right:auto;left:0;float:left;}#wpadminbar li.ab-sadmin>a{border-right:1px solid #666!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{left:0;right:auto;float:left;text-align:right;}#wpadminbar li.ab-sadmin ul li a{padding-right:1.75em;padding-left:0;}#wpadminbar li.ab-sadmin ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 100% 101.8% no-repeat;padding-right:1.25em!important;padding-left:0!important;margin-right:-1.25em;margin-left:0;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -282px repeat-x;}#wpadminbar li li:hover{background:#888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x!important;}.quicklinks ul{text-align:right;}.quicklinks ul li{float:right;}#adminbarsearch{display:none;}#adminbarsearch label,#adminbarsearch a{float:right;}#wpadminbar li.ab-me>a,#wpadminbar li.ab-blog>a{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 59.8% no-repeat;padding:0 .7em 0 1.15em;}#wpadminbar li.ab-me>a:hover,#wpadminbar li.ab-blog>a:hover{background-position:33% 59.8%;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-right:none!important;padding-right:.7em!important;}#wpadminbar li.ab-my-account>ul,#wpadminbar li.ab-bloginfo>ul{right:-7px;left:auto;}#wpadminbar ul li a strong.count{margin-right:5px;margin-left:0;position:static;}.adminbar-input{background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat!important;float:right!important;font-family:Tahoma,Arial,Helvetica,sans-serif!important;margin-right:3px!important;margin-left:0!important;}button.adminbar-button{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) left -107px no-repeat;float:right;padding:0 0 0 14px;}button.adminbar-button span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) right -69px no-repeat;padding:3px 14px 0 0;font-family:Tahoma,Arial,Helvetica,sans-serif!important;}button.adminbar-button:active{background-position:left -184px!important;}button.adminbar-button:active span{background-position:right -146px!important;}#querylist{direction:ltr;}#wpadminbar #admin-bar-micro ul li:hover>ul,#wpadminbar #admin-bar-micro ul li.hover>ul{left:auto;right:100%;}
|
||||
#wpadminbar{background:#666 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x;direction:rtl;font-family:Tahoma,Arial,sans-serif;right:0;left:auto;}#wpadminbar div,#wpadminbar ul,#wpadminbar ul li{min-height:0;}#wpadminbar ul li img{margin-left:8px!important;margin-right:0!important;}#wpadminbar .quicklinks>ul>li>a{border-left:1px solid #686868;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:last-child>a{border-left:none;border-right:1px solid #808080;}#wpadminbar .quicklinks>ul>li:hover>a{border-right-color:#707070;border-left-color:#686868;}#wpadminbar .avatar{margin:-3px 0 0 5px!important;float:none;}#wpadminbar .menupop li:hover>ul,#wpadminbar .menupop li.hover>ul{margin-right:100%;margin-top:-28px;}#wpadminbar .menupop a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 100.4% no-repeat;padding-left:.8em;}#wpadminbar .menupop ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 97.2% no-repeat;padding-right:0;padding-left:1.5em;}#wpadminbar .menupop ul li{width:auto;}#wpadminbar .quicklinks a{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar li.ab-sadmin{float:left;}#wpadminbar li.ab-sadmin ul{right:auto;left:0;float:left;}#wpadminbar li.ab-sadmin>a{border-right:1px solid #666!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul a{border-right:none!important;border-left:none!important;}#wpadminbar li.ab-sadmin ul li{left:0;right:auto;float:left;text-align:right;}#wpadminbar li.ab-sadmin ul li a{padding-right:1.75em;padding-left:0;}#wpadminbar li.ab-sadmin ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 100% 101.8% no-repeat;padding-right:1.25em!important;padding-left:0!important;margin-right:-1.25em;margin-left:0;}#wpadminbar li:hover{background:#555 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -282px repeat-x;}#wpadminbar li li:hover{background:#888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x!important;}.quicklinks ul{text-align:right;}.quicklinks ul li{float:right;}#adminbarsearch{display:none;}#adminbarsearch label,#adminbarsearch a{float:right;}#wpadminbar li.ab-me>a,#wpadminbar li.ab-blog>a{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 59.8% no-repeat;padding:0 .7em 0 1.15em;}#wpadminbar li.ab-blog>a:hover{background-position:33% 59.8%;}#wpadminbar li.ab-my-account a,#wpadminbar li.ab-bloginfo a{border-right:none!important;padding-right:.7em!important;}.adminbar-input{background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat!important;float:right!important;font-family:Tahoma,Arial,Helvetica,sans-serif!important;margin-right:3px!important;margin-left:0!important;}button.adminbar-button{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) left -107px no-repeat;float:right;padding:0 0 0 14px;}button.adminbar-button span{background:url(../images/admin-bar-sprite-rtl.png?d=08102010) right -69px no-repeat;padding:3px 14px 0 0;font-family:Tahoma,Arial,Helvetica,sans-serif!important;}button.adminbar-button:active{background-position:left -184px!important;}button.adminbar-button:active span{background-position:right -146px!important;}#querylist{direction:ltr;}#wpadminbar #admin-bar-micro ul li:hover>ul,#wpadminbar #admin-bar-micro ul li.hover>ul{left:auto;right:100%;}
|
||||
|
|
@ -37,7 +37,8 @@
|
|||
|
||||
#wpadminbar .menupop li:hover > ul,
|
||||
#wpadminbar .menupop li.hover > ul {
|
||||
margin-left:-100%;
|
||||
margin-right:100%;
|
||||
margin-top:-28px;
|
||||
}
|
||||
|
||||
#wpadminbar .menupop a > span {
|
||||
|
|
@ -51,32 +52,6 @@
|
|||
padding-left:1.5em;
|
||||
}
|
||||
|
||||
#wpadminbar .menupop ul {
|
||||
right: 0;
|
||||
width:100%;
|
||||
min-width:150px;
|
||||
}
|
||||
|
||||
#wpadminbar .ab-my-account ul {
|
||||
width:200px;
|
||||
}
|
||||
|
||||
#wpadminbar .ab-my-blogs ul {
|
||||
width:300px;
|
||||
}
|
||||
|
||||
#wpadminbar .ab-my-blogs ul ul {
|
||||
width:200px;
|
||||
}
|
||||
|
||||
#wpadminbar .ab-bloginfo ul {
|
||||
width:200px;
|
||||
}
|
||||
|
||||
#wpadminbar .ab-subscribe ul {
|
||||
width:150px;
|
||||
}
|
||||
|
||||
#wpadminbar .menupop ul li {
|
||||
width:auto;
|
||||
}
|
||||
|
|
@ -157,7 +132,6 @@
|
|||
padding: 0 0.7em 0 1.15em;
|
||||
}
|
||||
|
||||
#wpadminbar li.ab-me > a:hover,
|
||||
#wpadminbar li.ab-blog > a:hover {
|
||||
background-position: 33% 59.8%;
|
||||
}
|
||||
|
|
@ -168,19 +142,6 @@
|
|||
padding-right: 0.7em !important;
|
||||
}
|
||||
|
||||
#wpadminbar li.ab-my-account > ul,
|
||||
#wpadminbar li.ab-bloginfo > ul {
|
||||
right: -7px;
|
||||
left:auto;
|
||||
}
|
||||
|
||||
|
||||
#wpadminbar ul li a strong.count {
|
||||
margin-right: 5px;
|
||||
margin-left: 0;
|
||||
position:static;
|
||||
}
|
||||
|
||||
.adminbar-input {
|
||||
background:#ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat !important;
|
||||
float:right !important;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -72,7 +72,8 @@
|
|||
padding-right:1.5em;
|
||||
line-height: 28px;
|
||||
}
|
||||
#wpadminbar .menupop ul li a span#awaiting-mod {
|
||||
#wpadminbar ul li a span#ab-awaiting-mod,
|
||||
#wpadminbar ul li a span#ab-updates {
|
||||
display: inline;
|
||||
background: #aaa;
|
||||
color: #fff;
|
||||
|
|
@ -83,10 +84,14 @@
|
|||
-webkit-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
#wpadminbar .menupop ul li a:hover span#awaiting-mod {
|
||||
#wpadminbar ul li a:hover span#ab-awaiting-mod,
|
||||
#wpadminbar ul li a:hover span#ab-updates {
|
||||
background: #fff;
|
||||
color: #888;
|
||||
}
|
||||
#wpadminbar ul li a span#ab-awaiting-mod.count-0 {
|
||||
display: none;
|
||||
}
|
||||
#wpadminbar .menupop ul {
|
||||
-moz-box-shadow:0 4px 8px rgba(0,0,0,0.1);
|
||||
-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.1);
|
||||
|
|
@ -101,11 +106,6 @@ html>body #wpadminbar .menupop ul {
|
|||
background:rgba(255,255,255,0.97);
|
||||
border-color:rgba(0,0,0,0.1);
|
||||
}
|
||||
#wpadminbar .menupop.ab-my-account ul,
|
||||
#wpadminbar .menupop.ab-my-dash ul,
|
||||
#wpadminbar .menupop.ab-new-post ul {
|
||||
min-width:140px;
|
||||
}
|
||||
#wpadminbar .menupop li {
|
||||
float:none;
|
||||
margin:0;
|
||||
|
|
@ -245,29 +245,12 @@ html>body #wpadminbar .menupop ul {
|
|||
padding-left: 0.7em !important;
|
||||
margin-top: 0 !important;
|
||||
}
|
||||
#wpadminbar li.ab-my-account > ul, #wpadminbar li.ab-bloginfo > ul {
|
||||
left: -7px;
|
||||
}
|
||||
|
||||
#wpadminbar ul li img {
|
||||
width: 16px !important;
|
||||
height: 16px !important;
|
||||
}
|
||||
|
||||
#wpadminbar ul li a strong.count {
|
||||
text-shadow: none;
|
||||
background: #ddd;
|
||||
color: #555;
|
||||
margin-left: 5px;
|
||||
padding: 1px 6px;
|
||||
top: -1px;
|
||||
position: relative;
|
||||
font-size: 9px;
|
||||
-moz-border-radius: 7px;
|
||||
-webkit-border-radius: 7px;
|
||||
border-radius: 7px;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
#wpadminbar #adminbar-search {
|
||||
line-height:normal !important;
|
||||
width:140px !important;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user