golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Admin bar IE7, iPad and rtl refresh, see #81197 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-11-21 02:03:02 +00:00
parent 3287ef6d9c
commit eb5dbde246
6 changed files with 60 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/misc.php
View File

@ -587,7 +587,7 @@ foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
function _ipad_meta() {
if ( strpos($_SERVER['HTTP_USER_AGENT'], 'iPad') !== false ) { ?>
<meta name="viewport" id="ipad-viewportmeta" content="width=750, initial-scale=1, maximum-scale=1">
<meta name="viewport" id="ipad-viewportmeta" content="width=device-width, initial-scale=1">
<?php
}
}

14
wp-includes/class-wp-admin-bar.php
View File

@ -112,11 +112,23 @@ class WP_Admin_Bar {
}
public function render() {
global $is_IE, $is_iphone;
$back_compat_parents = array(
'appearance' => 'site-name',
);
// have to do this here since admin bar shows on the front end too
$class = 'nojq nojs';
if ( $is_IE ) {
if ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') )
$class .= ' ie7';
elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 8') )
$class .= ' ie8';
} elseif ( $is_iphone ) {
$class .= ' mobile';
}
// Link nodes to parents.
foreach ( $this->nodes as $node ) {
@ -142,7 +154,7 @@ class WP_Admin_Bar {
}
?>
<div id="wpadminbar" class="nojq nojs">
<div id="wpadminbar" class="<?php echo $class; ?>">
<div class="quicklinks">
<ul class="ab-top-menu"><?php

2
wp-includes/css/admin-bar-rtl.css
View File

@ -1 +1 @@
#wpadminbar *{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar{direction:rtl;font-family:Tahoma,Arial,Helvetica,sans-serif;left:auto;right:0;}#wpadminbar .quicklinks{border-left:0;border-right:1px solid transparent;}#wpadminbar .quicklinks ul{text-align:right;}#wpadminbar li{float:right;}#wpadminbar .quicklinks>ul>li{border-right:0;border-left:1px solid #555;}#wpadminbar .quicklinks>ul>li>a,#wpadminbar .quicklinks>ul>li>.ab-empty-item{border-right:0;border-left:1px solid #333;}#wpadminbar .quicklinks .ab-top-secondary>li{border-left:0;border-right:1px solid #333;float:left;}#wpadminbar .quicklinks .ab-top-secondary>li>a,#wpadminbar .quicklinks .ab-top-secondary>li>.ab-empty-item{border-right:1px solid #555;border-left:0;}#wpadminbar .menupop .ab-sub-wrapper,#wpadminbar .shortlink-input{margin:0 -1px 0 0;}#wpadminbar .ab-top-secondary .menupop .ab-sub-wrapper{right:auto;left:0;margin:0 0 0 -1px;}#wpadminbar .menupop li:hover>.ab-sub-wrapper,#wpadminbar .menupop li.hover>.ab-sub-wrapper{margin-left:0;margin-right:100%;}#wpadminbar .ab-top-secondary .menupop li:hover>.ab-sub-wrapper,#wpadminbar .ab-top-secondary .menupop li.hover>.ab-sub-wrapper{margin-left:inherit;margin-right:0;left:100%;right:inherit;}#wpadminbar .menupop .menupop>.ab-item{background-position:5% -46px;padding-left:2em;padding-right:1em;}#wpadminbar .ab-top-secondary .menupop .menupop>.ab-item{background-position:95% -20px;padding-left:1em;padding-right:2em;}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary{right:0;left:auto;}#wpadminbar .ab-top-secondary{float:left;right:auto;left:0;}#wpadminbar ul li:last-child,#wpadminbar ul li:last-child .ab-item{border-left:0;}#wpadminbar #wp-admin-bar-my-account.with-avatar .user-info-item{margin-right:88px;margin-left:16px;}#wpadminbar #wp-admin-bar-my-account .user-info-item>a{padding-left:0;padding-right:8px;}#wp-admin-bar-my-account .user-info .avatar{left:auto;right:-72px;}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{margin-left:0;margin-right:2px;}#wpadminbar .quicklinks li img.blavatar{margin-right:0;margin-left:4px;}#wpadminbar #adminbarsearch{float:left;}#wpadminbar #adminbarsearch .adminbar-input{float:right;font-family:Tahoma,Arial,Helvetica,sans-serif;padding:0 24px 0 3px;margin:0 0 0 3px;background-position:98% 2px;}#wpadminbar .ab-comments-icon{float:right;}#wpadminbar .ab-comments-icon-body{margin:3px -2px 0 4px;}#wpadminbar a .ab-comments-icon-arrow{left:auto;right:1px;border-left:0;border-right:4px solid #999;}#wpadminbar #ab-awaiting-mod{margin-left:0;margin-right:4px;}#wpadminbar a:hover .ab-comments-icon-arrow{border-right-color:#bbb;}* html #wpadminbar .quicklinks ul li a{float:right;}
#wpadminbar *{font-family:Tahoma,Arial,Helvetica,sans-serif;}#wpadminbar{direction:rtl;font-family:Tahoma,Arial,Helvetica,sans-serif;left:auto;right:0;}#wpadminbar .quicklinks{border-left:0;border-right:1px solid transparent;}#wpadminbar .quicklinks ul{text-align:right;}#wpadminbar li{float:right;}#wpadminbar .quicklinks>ul>li{border-right:0;border-left:1px solid #555;}#wpadminbar .quicklinks>ul>li>a,#wpadminbar .quicklinks>ul>li>.ab-empty-item{border-right:0;border-left:1px solid #333;}#wpadminbar .quicklinks .ab-top-secondary>li{border-left:0;border-right:1px solid #333;float:left;}#wpadminbar .quicklinks .ab-top-secondary>li>a,#wpadminbar .quicklinks .ab-top-secondary>li>.ab-empty-item{border-right:1px solid #555;border-left:0;}#wpadminbar .menupop .ab-sub-wrapper,#wpadminbar .shortlink-input{margin:0 -1px 0 0;}#wpadminbar.ie7 .menupop .ab-sub-wrapper,#wpadminbar.ie7 .shortlink-input{left:auto;right:0;}#wpadminbar .ab-top-secondary .menupop .ab-sub-wrapper{right:auto;left:0;margin:0 0 0 -1px;}#wpadminbar .menupop li:hover>.ab-sub-wrapper,#wpadminbar .menupop li.hover>.ab-sub-wrapper{margin-left:0;margin-right:100%;}#wpadminbar .ab-top-secondary .menupop li:hover>.ab-sub-wrapper,#wpadminbar .ab-top-secondary .menupop li.hover>.ab-sub-wrapper{margin-left:inherit;margin-right:0;left:100%;right:inherit;}#wpadminbar .menupop .menupop>.ab-item{background-position:5% -46px;padding-left:2em;padding-right:1em;}#wpadminbar .ab-top-secondary .menupop .menupop>.ab-item{background-position:95% -20px;padding-left:1em;padding-right:2em;}#wpadminbar .quicklinks .menupop ul.ab-sub-secondary{right:0;left:auto;}#wpadminbar .ab-top-secondary{float:left;right:auto;left:0;}#wpadminbar ul li:last-child,#wpadminbar ul li:last-child .ab-item{border-left:0;}#wpadminbar #wp-admin-bar-my-account.with-avatar .user-info-item{margin-right:88px;margin-left:16px;}#wpadminbar #wp-admin-bar-my-account .user-info-item>a{padding-left:0;padding-right:8px;}#wp-admin-bar-my-account .user-info .avatar{left:auto;right:-72px;}#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar>a img{margin-left:-1px;margin-right:4px;}#wpadminbar .quicklinks li img.blavatar{margin-right:0;margin-left:4px;}#wpadminbar #adminbarsearch{float:left;}#wpadminbar #adminbarsearch .adminbar-input{float:right;font-family:Tahoma,Arial,Helvetica,sans-serif;padding:0 24px 0 3px;margin:0 0 0 3px;background-position:99% 1px;}#wpadminbar .ab-comments-icon{float:right;}#wpadminbar.ie7 .ab-comments-icon{float:left;left:12px;}#wpadminbar .ab-comments-icon-body{margin-right:-2px;}#wpadminbar a .ab-comments-icon-arrow{left:auto;right:1px;border-left:0;border-right:4px solid #999;}#wpadminbar #ab-awaiting-mod{margin-left:0;margin-right:4px;}#wpadminbar.ie7 #ab-awaiting-mod{margin-right:0;}#wpadminbar.ie7 #wp-admin-bar-comments>a{min-width:25px;}#wpadminbar a:hover .ab-comments-icon-arrow{border-right-color:#bbb;}#wpadminbar .menupop .ab-sub-wrapper,#wpadminbar .shortlink-input{right:0;}#wpadminbar .quicklinks .menupop ul li a{position:relative;}* html #wpadminbar .quicklinks ul li a{float:right;}

35
wp-includes/css/admin-bar-rtl.dev.css
View File

@ -50,6 +50,12 @@
margin: 0 -1px 0 0;
}
#wpadminbar.ie7 .menupop .ab-sub-wrapper,
#wpadminbar.ie7 .shortlink-input {
left: auto;
right: 0;
}
#wpadminbar .ab-top-secondary .menupop .ab-sub-wrapper {
right: auto;
left: 0;
@ -117,8 +123,8 @@
}
#wpadminbar .quicklinks li#wp-admin-bar-my-account.with-avatar > a img {
margin-left: 0;
margin-right: 2px
margin-left: -1px;
margin-right: 4px
}
/*
@ -141,7 +147,7 @@
font-family: Tahoma, Arial, Helvetica, sans-serif;
padding: 0 24px 0 3px;
margin: 0 0 0 3px;
background-position: 98% 2px;
background-position: 99% 1px;
}
/**
@ -151,8 +157,13 @@
float: right;
}
#wpadminbar.ie7 .ab-comments-icon {
float: left;
left: 12px;
}
#wpadminbar .ab-comments-icon-body {
margin: 3px -2px 0 4px;
margin-right: -2px;
}
#wpadminbar a .ab-comments-icon-arrow {
@ -168,10 +179,26 @@
margin-right: 4px;
}
#wpadminbar.ie7 #ab-awaiting-mod {
margin-right: 0;
}
#wpadminbar.ie7 #wp-admin-bar-comments > a {
min-width: 25px;
}
#wpadminbar a:hover .ab-comments-icon-arrow {
border-right-color: #bbb;
}
#wpadminbar .menupop .ab-sub-wrapper,
#wpadminbar .shortlink-input {
right: 0;
}
#wpadminbar .quicklinks .menupop ul li a {
position: relative;
}
/**
* IE 6-targeted rules

2
wp-includes/css/admin-bar.css
View File

File diff suppressed because one or more lines are too long

27
wp-includes/css/admin-bar.dev.css
View File

@ -37,7 +37,6 @@
left: 0;
width: 100%;
z-index: 99999;
min-width: 960px;
background-color: #464646; /* Fallback */
background-image: -ms-linear-gradient(bottom, #373737, #464646 5px); /* IE10 */
@ -103,7 +102,7 @@
#wpadminbar .shortlink-input {
height: 28px;
display: block;
padding: 0 1em;
padding: 0 12px;
margin: 0;
}
@ -123,8 +122,15 @@
border-color: #dfdfdf;
}
#wpadminbar.ie7 .menupop .ab-sub-wrapper,
#wpadminbar.ie7 .shortlink-input {
top: 28px;
left: 0;
}
#wpadminbar .ab-top-secondary .menupop .ab-sub-wrapper {
right: 0;
left: auto;
margin: 0 -1px 0 0;
}
@ -275,10 +281,6 @@
#wpadminbar .ab-top-secondary {
float: right;
position: fixed;
right: 0;
top: 0;
background-color: #464646; /* Fallback */
background-image: -ms-linear-gradient(bottom, #373737, #464646 5px); /* IE10 */
background-image: -moz-linear-gradient(bottom, #373737, #464646 5px); /* Firefox */
@ -365,7 +367,7 @@
background: #eee;
line-height: 24px;
vertical-align: middle;
margin: -2px 0 0 6px;
margin: -3px 0 0 6px;
float: none;
}
@ -391,7 +393,6 @@
}
#wpadminbar #adminbarsearch {
float: right;
height: 24px;
padding: 2px 4px;
margin: 0;
@ -399,11 +400,11 @@
#wpadminbar #adminbarsearch .adminbar-input {
height: 23px;
line-height: 23px;
width: 140px;
float: left;
font: 13px sans-serif;
border: none;
padding: 0 3px 0 24px;
padding: 0 3px 0 23px;
margin: 0 3px 0 0;
color: #ccc;
@ -411,7 +412,7 @@
background-color: rgba( 255, 255, 255, 0 );
background-image: url(../images/admin-bar-sprite.png?d=11182010);
background-position: 4px 0px;
background-position: 3px 1px;
background-repeat: no-repeat;
-webkit-border-radius: 3px;
@ -482,16 +483,14 @@
*/
#wpadminbar .ab-comments-icon {
position: relative;
padding-top: 5px;
padding-top: 8px;
float: left;
}
#wpadminbar .ab-comments-icon-body {
margin-top: 3px;
background: #999;
height: 10px;
width: 14px;
-webkit-border-radius: 10px;
border-radius: 10px;
}