Admin-bar.css refresh, add back IE compat. "return false" so clicking on the search box doesn't scropp the page to the top, props ocean90, fixes #19153, fixes #19151

git-svn-id: http://svn.automattic.com/wordpress/trunk@19160 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-11-04 19:46:43 +00:00
parent 339fe6065d
commit 057ceb34de
3 changed files with 37 additions and 37 deletions

View File

@ -621,7 +621,7 @@ function wp_admin_bar_search_menu( $wp_admin_bar ) {
$form = '<div id="adminbarsearch-wrap">'; $form = '<div id="adminbarsearch-wrap">';
$form .= '<form action="' . home_url() . '" method="get" id="adminbarsearch">'; $form .= '<form action="' . home_url() . '" method="get" id="adminbarsearch">';
$form .= '<input class="adminbar-input" name="s" id="adminbar-search"'; $form .= '<input class="adminbar-input" name="s" id="adminbar-search"';
$form .= 'type="text" value="" maxlength="150" placeholder="' . esc_attr__( 'Search' ) . '" />'; $form .= 'type="text" value="" maxlength="150" placeholder="' . esc_attr__( 'Search' ) . '" onclick="return false;" />';
$form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>'; $form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';
$form .= '</form>'; $form .= '</form>';
$form .= '</div>'; $form .= '</div>';

File diff suppressed because one or more lines are too long

View File

@ -73,13 +73,16 @@
#wpadminbar .quicklinks > ul > li { #wpadminbar .quicklinks > ul > li {
border-right: 1px solid #555; border-right: 1px solid #555;
} }
#wpadminbar .quicklinks > ul > li > a { #wpadminbar .quicklinks > ul > li > a {
border-right: 1px solid #333; border-right: 1px solid #333;
} }
#wpadminbar .quicklinks > ul > li.opposite { #wpadminbar .quicklinks > ul > li.opposite {
border-left: 1px solid #333; border-left: 1px solid #333;
border-right: 0; border-right: 0;
} }
#wpadminbar .quicklinks > ul > li.opposite > a { #wpadminbar .quicklinks > ul > li.opposite > a {
border-left: 1px solid #555; border-left: 1px solid #555;
border-right: 0; border-right: 0;
@ -116,6 +119,7 @@
border-style: solid; border-style: solid;
border-color: #dfdfdf; border-color: #dfdfdf;
} }
#wpadminbar .quicklinks .opposite.menupop ul { #wpadminbar .quicklinks .opposite.menupop ul {
right: 0; right: 0;
margin: 0 -1px 0 0; margin: 0 -1px 0 0;
@ -173,8 +177,13 @@
} }
#wpadminbar .ab-top-menu > li:hover { #wpadminbar .ab-top-menu > li:hover {
/* @todo: add other gradients */ background: #3a3a3a; /* Fallback */
background-image: -ms-linear-gradient(bottom, #3a3a3a, #222); /* IE10 */
background-image: -moz-linear-gradient(bottom, #3a3a3a, #222); /* Firefox */
background-image: -o-linear-gradient(bottom, #3a3a3a, #222); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#3a3a3a), to(#222)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #3a3a3a, #222); /* new Webkit */ background-image: -webkit-linear-gradient(bottom, #3a3a3a, #222); /* new Webkit */
background-image: linear-gradient(bottom, #3a3a3a, #222); /* proposed W3C Markup */
} }
#wpadminbar.nojs .ab-top-menu > li.menupop:hover, #wpadminbar.nojs .ab-top-menu > li.menupop:hover,
@ -190,7 +199,6 @@
text-shadow: none; text-shadow: none;
} }
#wpadminbar .quicklinks .menupop li:hover, #wpadminbar .quicklinks .menupop li:hover,
#wpadminbar .quicklinks .menupop li.hover { #wpadminbar .quicklinks .menupop li.hover {
background-color: #eaf2fa; background-color: #eaf2fa;
@ -240,12 +248,10 @@
right: auto; right: auto;
margin: 0; margin: 0;
border: 0; border: 0;
background: #eee;
-moz-box-shadow: none; -moz-box-shadow: none;
-webkit-box-shadow: none; -webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
background: #eee;
} }
#wpadminbar .quicklinks .menupop li.secondary > ul > li:hover, #wpadminbar .quicklinks .menupop li.secondary > ul > li:hover,
@ -261,8 +267,6 @@
padding: 2px 5px; padding: 2px 5px;
font-size: 10px; font-size: 10px;
font-weight: bold; font-weight: bold;
-moz-border-radius: 10px;
-khtml-border-radius: 10px;
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
border-radius: 10px; border-radius: 10px;
} }
@ -276,13 +280,19 @@
float: right; float: right;
} }
/**
* My Account
*/
#wp-admin-bar-my-account > ul { #wp-admin-bar-my-account > ul {
min-width: 270px; min-width: 270px;
} }
#wpadminbar #wp-admin-bar-my-account .user-info-item { #wpadminbar #wp-admin-bar-my-account .user-info-item {
margin-left: 88px; margin-left: 88px;
margin-right: 16px; margin-right: 16px;
} }
#wpadminbar #wp-admin-bar-my-account .user-info-item > a { #wpadminbar #wp-admin-bar-my-account .user-info-item > a {
padding-left: 8px; padding-left: 8px;
} }
@ -293,22 +303,27 @@
height: auto; height: auto;
background: none; background: none;
} }
#wp-admin-bar-my-account .user-info .avatar { #wp-admin-bar-my-account .user-info .avatar {
position: absolute; position: absolute;
left: -72px; left: -72px;
top: 4px; top: 4px;
} }
#wpadminbar #wp-admin-bar-my-account .user-info a { #wpadminbar #wp-admin-bar-my-account .user-info a {
height: auto; height: auto;
} }
#wpadminbar #wp-admin-bar-my-account .user-info span { #wpadminbar #wp-admin-bar-my-account .user-info span {
background: none; background: none;
padding: 0; padding: 0;
height: 18px; height: 18px;
} }
#wpadminbar #wp-admin-bar-my-account .user-info .display-name { #wpadminbar #wp-admin-bar-my-account .user-info .display-name {
color: #333; color: #333;
} }
#wpadminbar #wp-admin-bar-my-account .user-info .username { #wpadminbar #wp-admin-bar-my-account .user-info .username {
color: #999; color: #999;
font-size: 11px; font-size: 11px;
@ -332,6 +347,9 @@
padding: 0; padding: 0;
} }
/**
* Search
*/
#wpadminbar #wp-admin-bar-search { #wpadminbar #wp-admin-bar-search {
border-right: 0; border-right: 0;
} }
@ -353,7 +371,6 @@
margin: 0; margin: 0;
} }
#wpadminbar #adminbarsearch .adminbar-input { #wpadminbar #adminbarsearch .adminbar-input {
height: 23px; height: 23px;
width: 140px; width: 140px;
@ -373,8 +390,6 @@
background-position: 4px 2px; background-position: 4px 2px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-khtml-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
-moz-box-shadow: none; -moz-box-shadow: none;
@ -409,36 +424,18 @@
#wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder { #wpadminbar #adminbarsearch .adminbar-input::-webkit-input-placeholder {
color: #ddd; color: #ddd;
} }
#wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder { #wpadminbar #adminbarsearch .adminbar-input:-moz-placeholder {
color: #ddd; color: #ddd;
} }
#wpadminbar #adminbarsearch .adminbar-button { #wpadminbar #adminbarsearch .adminbar-button {
display: none; display: none;
} }
#wpadminbar #adminbarsearch .adminbar-button:active {
background: #a0a0a0;
background:-moz-linear-gradient(bottom, #a0a0a0, #c1c1c1);
background:-webkit-gradient(linear, left bottom, left top, from(#a0a0a0), to(#c1c1c1));
-moz-box-shadow: inset 1px 1px 1px #9b9b9b;
-webkit-box-shadow: inset 1px 1px 1px #9b9b9b;
box-shadow: inset 1px 1px 1px #9b9b9b;
}
#wpadminbar #adminbarsearch .adminbar-button:hover {
color: #000;
}
#wpadminbar #adminbarsearch .adminbar-button::-moz-focus-inner {
border: none;
}
/** /**
* WP Logo item * WP Logo item
*/ */
#wpadminbar .wp-admin-bar-logo > a { #wpadminbar .wp-admin-bar-logo > a {
padding-left: 24px; padding-left: 24px;
background: url(../images/wp-logo-white.png) no-repeat 13px 6px; background: url(../images/wp-logo-white.png) no-repeat 13px 6px;
@ -467,6 +464,7 @@
background: #999; background: #999;
height: 10px; height: 10px;
width: 14px; width: 14px;
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
border-radius: 10px; border-radius: 10px;
} }
@ -485,16 +483,18 @@
border-left: 4px solid #999; border-left: 4px solid #999;
border-bottom: 4px solid transparent; border-bottom: 4px solid transparent;
} }
#wpadminbar a:hover .ab-comments-icon-arrow { #wpadminbar a:hover .ab-comments-icon-arrow {
border-left-color: #bbb; border-left-color: #bbb;
} }
#wpadminbar #ab-awaiting-mod { #wpadminbar #ab-awaiting-mod {
margin-left: 4px; margin-left: 4px;
} }
#wpadminbar span.count-0 {
display: none; #wpadminbar span.count-0 {
} display: none;
}
/** /**