Thorough CSS reset of the admin bar to avoid theme conflicts. props ocean90, JohnONolan, filosofo, duck_. fixes #15851.
git-svn-id: https://develop.svn.wordpress.org/trunk@17064 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
752808cbd3
commit
9aaa805cfb
|
@ -204,7 +204,7 @@ function wp_admin_bar_comments_menu() {
|
||||||
$awaiting_mod = wp_count_comments();
|
$awaiting_mod = wp_count_comments();
|
||||||
$awaiting_mod = $awaiting_mod->moderated;
|
$awaiting_mod = $awaiting_mod->moderated;
|
||||||
|
|
||||||
$awaiting_mod = $awaiting_mod ? "<span id='ab-awaiting-mod'><span class='pending-count'>" . number_format_i18n( $awaiting_mod ) . "</span></span>" : '';
|
$awaiting_mod = $awaiting_mod ? "<span id='ab-awaiting-mod' class='pending-count'>" . number_format_i18n( $awaiting_mod ) . "</span>" : '';
|
||||||
$wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), $awaiting_mod ), 'href' => admin_url('edit-comments.php') ) );
|
$wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), $awaiting_mod ), 'href' => admin_url('edit-comments.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 .quicklinks ul{text-align:right;}#wpadminbar .quicklinks ul li{float:right;}#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 .quicklinks li.ab-my-account-with-avatar a img{margin:-2px -5px 0 23px;}#wpadminbar .quicklinks li.ab-my-account-with-avatar ul{left:auto;right:30px;}#wpadminbar .quicklinks .menupop li:hover>ul,#wpadminbar .quicklinks .menupop li.hover>ul{margin-right:100%;margin-left:0;}#wpadminbar .quicklinks .menupop a>span{background:url(../images/admin-bar-sprite-rtl.png?d=11122010) left -58px no-repeat;padding-right:0;padding-left:.8em;}#wpadminbar .quicklinks .menupop ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=11122010) left -29px no-repeat;padding-right:0;padding-left:1.5em;}#wpadminbar .quicklinks a{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar .quicklinks .menupop li a img.blavatar{margin-right:0;margin-left:8px;}#wpadminbar .quicklinks li.ab-my-account>a{background:url(../images/admin-bar-sprite-rtl.png?d=11122010) top right no-repeat;}#wpadminbar .quicklinks li.ab-my-account>a{border-right:none;border-left:1px solid #686868;}#wpadminbar #adminbarsearch{float:left;}#wpadminbar #adminbarsearch .adminbar-input{float:right;font-family:Tahoma,Arial,Helvetica,sans-serif;margin-right:0;margin-left:3px;-moz-box-shadow:inset 2px -2px 1px #cdcdcd;-webkit-box-shadow:inset -2px 2px 1px #cdcdcd;box-shadow:inset 2px -2px 1px #cdcdcd;}#wpadminbar #adminbarsearch .adminbar-button{float:right;font-family:Tahoma,Arial,Helvetica,sans-serif;}
|
#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 .quicklinks ul{text-align:right;}#wpadminbar .quicklinks ul li{float:right;}#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 .quicklinks li.ab-my-account-with-avatar a img{margin:-2px -5px 0 23px;}#wpadminbar .quicklinks li.ab-my-account-with-avatar ul{left:auto;right:30px;}#wpadminbar .quicklinks .menupop li:hover>ul,#wpadminbar .quicklinks .menupop li.hover>ul{margin-right:100%;margin-left:0;}#wpadminbar .quicklinks .menupop a>span{background:url(../images/admin-bar-sprite-rtl.png?d=11122010) left -58px no-repeat;padding-right:0;padding-left:.8em;}#wpadminbar .quicklinks .menupop ul li a>span{background:url(../images/admin-bar-sprite-rtl.png?d=11122010) left -29px no-repeat;padding-right:0;padding-left:1.5em;}#wpadminbar .quicklinks a{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar .quicklinks .menupop li a img.blavatar{margin-right:0;margin-left:8px;}#wpadminbar .quicklinks li.ab-my-account-with-avatar>a{background:url(../images/admin-bar-sprite-rtl.png?d=11122010) top right no-repeat;}#wpadminbar .quicklinks li.ab-my-account>a,#wpadminbar .quicklinks li.ab-my-account-with-avatar>a{border-right:none;border-left:1px solid #686868;}#wpadminbar #adminbarsearch{float:left;}#wpadminbar #adminbarsearch .adminbar-input{float:right;font-family:Tahoma,Arial,Helvetica,sans-serif;margin-right:0;margin-left:3px;-moz-box-shadow:inset 2px -2px 1px #cdcdcd;-webkit-box-shadow:inset -2px 2px 1px #cdcdcd;box-shadow:inset 2px -2px 1px #cdcdcd;}#wpadminbar #adminbarsearch .adminbar-button{float:right;font-family:Tahoma,Arial,Helvetica,sans-serif;}
|
|
@ -65,11 +65,12 @@
|
||||||
margin-left: 8px;
|
margin-left: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#wpadminbar .quicklinks li.ab-my-account > a {
|
#wpadminbar .quicklinks li.ab-my-account-with-avatar > a {
|
||||||
background: url(../images/admin-bar-sprite-rtl.png?d=11122010) top right no-repeat;
|
background: url(../images/admin-bar-sprite-rtl.png?d=11122010) top right no-repeat;
|
||||||
}
|
}
|
||||||
|
|
||||||
#wpadminbar .quicklinks li.ab-my-account > a {
|
#wpadminbar .quicklinks li.ab-my-account > a,
|
||||||
|
#wpadminbar .quicklinks li.ab-my-account-with-avatar > a {
|
||||||
border-right: none;
|
border-right: none;
|
||||||
border-left: 1px solid #686868;
|
border-left: 1px solid #686868;
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,13 +1,37 @@
|
||||||
|
#wpadminbar * {
|
||||||
|
height: auto;
|
||||||
|
width: auto;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
position: static;
|
||||||
|
text-transform: none;
|
||||||
|
letter-spacing: normal;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#wpadminbar :before,
|
||||||
|
#wpadminbar :after {
|
||||||
|
content: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
#wpadminbar a,
|
||||||
|
#wpadminbar a:hover,
|
||||||
|
#wpadminbar a img,
|
||||||
|
#wpadminbar a img:hover {
|
||||||
|
outline: none;
|
||||||
|
border: none;
|
||||||
|
text-decoration: none;
|
||||||
|
background: none;
|
||||||
|
}
|
||||||
|
|
||||||
#wpadminbar {
|
#wpadminbar {
|
||||||
direction: ltr;
|
direction: ltr;
|
||||||
background: #666;
|
background: #666;
|
||||||
background: -moz-linear-gradient(bottom, #666, #7f7f7f);
|
background: -moz-linear-gradient(bottom, #666, #7f7f7f);
|
||||||
background: -webkit-gradient(linear, left bottom, left top, from(#666), to(#7f7f7f));
|
background: -webkit-gradient(linear, left bottom, left top, from(#666), to(#7f7f7f));
|
||||||
color: #ddd;
|
color: #ddd;
|
||||||
font: 12px Arial, Helvetica, sans-serif;
|
font: normal 12px/28px Arial, Helvetica, sans-serif;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
@ -16,13 +40,6 @@
|
||||||
min-width: 960px;
|
min-width: 960px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#wpadminbar a,
|
|
||||||
#wpadminbar a:hover {
|
|
||||||
outline: none;
|
|
||||||
border: none;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#wpadminbar ul,
|
#wpadminbar ul,
|
||||||
#wpadminbar ul li {
|
#wpadminbar ul li {
|
||||||
background: none;
|
background: none;
|
||||||
|
@ -59,10 +76,12 @@
|
||||||
height: 28px;
|
height: 28px;
|
||||||
text-shadow: #555 0px -1px 0px;
|
text-shadow: #555 0px -1px 0px;
|
||||||
display: block;
|
display: block;
|
||||||
font: 13px Arial, Helvetica, sans-serif;
|
font: normal 13px/28px Arial, Helvetica, sans-serif;
|
||||||
font-weight: normal;
|
|
||||||
letter-spacing: normal;
|
|
||||||
padding: 0 0.85em;
|
padding: 0 0.85em;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#wpadminbar .quicklinks a > span {
|
||||||
line-height: 28px;
|
line-height: 28px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,7 +105,6 @@
|
||||||
#wpadminbar .quicklinks .menupop ul li a {
|
#wpadminbar .quicklinks .menupop ul li a {
|
||||||
color: #555;
|
color: #555;
|
||||||
text-shadow: none;
|
text-shadow: none;
|
||||||
font-weight: normal;
|
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
width: 160px;
|
width: 160px;
|
||||||
|
@ -121,6 +139,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
#wpadminbar .quicklinks .menupop a > span {
|
#wpadminbar .quicklinks .menupop a > span {
|
||||||
|
display: inline;
|
||||||
background: url(../images/admin-bar-sprite.png?d=11122010) right -58px no-repeat;
|
background: url(../images/admin-bar-sprite.png?d=11122010) right -58px no-repeat;
|
||||||
padding-right: .8em;
|
padding-right: .8em;
|
||||||
}
|
}
|
||||||
|
@ -151,6 +170,9 @@
|
||||||
background: #fff;
|
background: #fff;
|
||||||
color: #000;
|
color: #000;
|
||||||
}
|
}
|
||||||
|
#wpadminbar .quicklinks li.ab-my-account > a {
|
||||||
|
border-left: none;
|
||||||
|
}
|
||||||
|
|
||||||
#wpadminbar .quicklinks li.ab-my-account-with-avatar > a {
|
#wpadminbar .quicklinks li.ab-my-account-with-avatar > a {
|
||||||
border-left: none;
|
border-left: none;
|
||||||
|
@ -164,6 +186,7 @@
|
||||||
margin: -2px 23px 0 -5px;
|
margin: -2px 23px 0 -5px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
background: #eee;
|
background: #eee;
|
||||||
|
float: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
#wpadminbar .quicklinks li.ab-my-account-with-avatar ul {
|
#wpadminbar .quicklinks li.ab-my-account-with-avatar ul {
|
||||||
|
@ -172,7 +195,8 @@
|
||||||
|
|
||||||
#wpadminbar .quicklinks .menupop li a img.blavatar {
|
#wpadminbar .quicklinks .menupop li a img.blavatar {
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
margin-right: 8px;
|
margin: 0 8px 0 0;
|
||||||
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#wpadminbar #adminbarsearch {
|
#wpadminbar #adminbarsearch {
|
||||||
|
@ -184,6 +208,7 @@
|
||||||
|
|
||||||
#wpadminbar #adminbarsearch .adminbar-input {
|
#wpadminbar #adminbarsearch .adminbar-input {
|
||||||
width: 140px;
|
width: 140px;
|
||||||
|
height: auto;
|
||||||
float: left;
|
float: left;
|
||||||
font: 12px Arial, Helvetica, sans-serif;
|
font: 12px Arial, Helvetica, sans-serif;
|
||||||
color: #555;
|
color: #555;
|
||||||
|
@ -191,7 +216,7 @@
|
||||||
border: 1px solid #626262;
|
border: 1px solid #626262;
|
||||||
padding: 2px 3px;
|
padding: 2px 3px;
|
||||||
margin: 0 3px 0 0;
|
margin: 0 3px 0 0;
|
||||||
background-color: #ddd;
|
background: #ddd;
|
||||||
-moz-box-shadow: inset 2px 2px 1px #cdcdcd;
|
-moz-box-shadow: inset 2px 2px 1px #cdcdcd;
|
||||||
-webkit-box-shadow: inset 2px 2px 1px #cdcdcd;
|
-webkit-box-shadow: inset 2px 2px 1px #cdcdcd;
|
||||||
box-shadow: inset 2px 2px 1px #cdcdcd;
|
box-shadow: inset 2px 2px 1px #cdcdcd;
|
||||||
|
@ -222,6 +247,8 @@
|
||||||
border: 1px solid #626262;
|
border: 1px solid #626262;
|
||||||
padding: 2px 13px;
|
padding: 2px 13px;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
width: auto;
|
||||||
|
height: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
#wpadminbar #adminbarsearch .adminbar-button:active {
|
#wpadminbar #adminbarsearch .adminbar-button:active {
|
||||||
|
@ -254,9 +281,6 @@
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
* html #wpadminbar,
|
* html #wpadminbar .menupop a span {
|
||||||
* html #wpadminbar .menupop a span,
|
|
||||||
* html #wpadminbar .quicklinks li,
|
|
||||||
* html #wpadminbar .quicklinks li:hover {
|
|
||||||
background-image: none;
|
background-image: none;
|
||||||
}
|
}
|
||||||
|
|
|
@ -516,7 +516,7 @@ function wp_default_styles( &$styles ) {
|
||||||
$styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
|
$styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
|
||||||
$styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
|
$styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
|
||||||
$styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100907' );
|
$styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100907' );
|
||||||
$styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101216' );
|
$styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101219' );
|
||||||
$styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20101119' );
|
$styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20101119' );
|
||||||
$styles->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/css/wplink$suffix.css", array(), '20101214' );
|
$styles->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/css/wplink$suffix.css", array(), '20101214' );
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue