Remove redundant userinfo styling, props ocean90 and SergeyBiryukov, see #18197

git-svn-id: http://svn.automattic.com/wordpress/trunk@18730 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-09-20 03:37:17 +00:00
parent 2f59ff622a
commit 456753acce
15 changed files with 12 additions and 306 deletions

File diff suppressed because one or more lines are too long

View File

@ -782,60 +782,6 @@ table.widefat span.spam a,
color: #174f69;
}
#user_info {
color: #777;
}
#user_info:hover,
#user_info.active {
color: #185069;
}
#user_info.active {
background-color: #f7fcfe; /* Fallback */
background-image: -ms-linear-gradient(bottom, #f7fcfe, #f9f9f9); /* IE10 */
background-image: -moz-linear-gradient(bottom, #f7fcfe, #f9f9f9); /* Firefox */
background-image: -o-linear-gradient(bottom, #f7fcfe, #f9f9f9); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#f7fcfe), to(#f9f9f9)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #f7fcfe, #f9f9f9); /* new Webkit */
background-image: linear-gradient(bottom, #f7fcfe, #f9f9f9); /* proposed W3C Markup */
border-color: #d0dfe9 #d0dfe9 #d0dfe9;
}
#user_info_arrow {
background: transparent url(../images/arrows-vs.png) no-repeat 6px 5px;
}
#user_info:hover #user_info_arrow,
#user_info.active #user_info_arrow {
background: transparent url(../images/arrows-dark-vs.png) no-repeat 6px 5px;
}
#user_info_links {
-moz-box-shadow: 0 3px 2px -2px rgba( 0, 0, 0, 0.2 );
-webkit-box-shadow: 0 3px 2px -2px rgba( 0, 0, 0, 0.2 );
box-shadow: 0 3px 2px -2px rgba( 0, 0, 0, 0.2 );
}
#user_info_links ul {
background: #f7fcfe;
border-color: #d0dfe9 #d0dfe9 #d0dfe9;
-moz-box-shadow: inset 0 1px 0 #f9f9f9;
-webkit-box-shadow: inset 0 1px 0 #f9f9f9;
box-shadow: inset 0 1px 0 #f9f9f9;
}
#user_info_links li:hover {
background-color: #ECF8FE;
}
#user_info_links li:hover a,
#user_info_links li a:hover {
text-decoration: none;
}
#user_info a:link,
#user_info a:visited,
#footer a:link,
#footer a:visited {
text-decoration: none;
@ -2175,15 +2121,6 @@ div.widgets-sortables,
background-image: url(../images/bubble_bg-rtl.gif);
}
.rtl #user_info_arrow {
background: transparent url(../images/arrows-vs.png) no-repeat 0 5px;
}
.rtl #user_info:hover #user_info_arrow,
.rtl #user_info.active #user_info_arrow {
background: transparent url(../images/arrows-dark-vs.png) no-repeat 0 5px;
}
/* Menu */
.rtl #adminmenushadow,
.rtl #adminmenuback {

File diff suppressed because one or more lines are too long

View File

@ -785,60 +785,6 @@ table.widefat span.spam a,
color: #464646;
}
#user_info {
color: #555;
}
#user_info:hover,
#user_info.active {
color: #222;
}
#user_info.active {
background-color: #f1f1f1; /* Fallback */
background-image: -ms-linear-gradient(bottom, #e9e9e9, #f9f9f9); /* IE10 */
background-image: -moz-linear-gradient(bottom, #e9e9e9, #f9f9f9); /* Firefox */
background-image: -o-linear-gradient(bottom, #e9e9e9, #f9f9f9); /* Opera */
background-image: -webkit-gradient(linear, left bottom, left top, from(#e9e9e9), to(#f9f9f9)); /* old Webkit */
background-image: -webkit-linear-gradient(bottom, #e9e9e9, #f9f9f9); /* new Webkit */
background-image: linear-gradient(bottom, #e9e9e9, #f9f9f9); /* proposed W3C Markup */
border-color: #aaa #aaa #dfdfdf;
}
#user_info_arrow {
background: transparent url(../images/arrows.png) no-repeat 6px 5px;
}
#user_info:hover #user_info_arrow,
#user_info.active #user_info_arrow {
background: transparent url(../images/arrows-dark.png) no-repeat 6px 5px;
}
#user_info_links {
-moz-box-shadow: 0 5px 6px 0 rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 5px 6px 0 rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 6px 0 rgba(0, 0, 0, 0.2);
}
#user_info_links ul {
background: #f1f1f1;
border-color: #ccc #aaa #aaa;
-moz-box-shadow: inset 0 1px 0 #f9f9f9;
-webkit-box-shadow: inset 0 1px 0 #f9f9f9;
box-shadow: inset 0 1px 0 #f9f9f9;
}
#user_info_links li:hover {
background-color: #dfdfdf;
}
#user_info_links li:hover a,
#user_info_links li a:hover {
text-decoration: none;
}
#user_info a:link,
#user_info a:visited,
#footer a:link,
#footer a:visited {
text-decoration: none;
@ -1794,15 +1740,6 @@ div.widgets-sortables,
background-image: url(../images/bubble_bg-rtl.gif);
}
.rtl #user_info_arrow {
background: transparent url(../images/arrows.png) no-repeat 0 5px;
}
.rtl #user_info:hover #user_info_arrow,
.rtl #user_info.active #user_info_arrow {
background: transparent url(../images/arrows-dark.png) no-repeat 0 5px;
}
/* Menu */
.rtl #adminmenushadow,
.rtl #adminmenuback {

View File

@ -1 +1 @@
html{direction:ltr;}body{direction:rtl;}* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle{background:url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -109px;}* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle{background:url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -206px;}* html #adminmenu{margin-left:0;margin-right:-80px;}* html div.folded #adminmenu{margin-left:0;margin-right:-22px;}#wpcontent #adminmenu .wp-submenu li.wp-submenu-head{padding:3px 10px 4px 4px;}.inline-edit-row fieldset label span.title{float:right;}.inline-edit-row fieldset label span.input-text-wrap{margin-right:0;}p.search-box{float:left;}* html #poststuff h2{margin-right:0;}#bh{margin:7px 10px 0 0;float:left;}#user_info+div#favorite-actions{right:auto;left:15px;}#wphead-info{float:left;}div#dashboard-widgets{padding-right:0;padding-left:1px;}.tagchecklist span a{margin:4px -9px 0 0;}.widefat th input{margin:0 5px 0 0;}#TB_window{width:670px;position:absolute;top:50%;left:50%;margin-right:335px!important;}#dashboard_plugins{direction:ltr;}#dashboard_plugins h3.hndle{direction:rtl;}#dashboard_incoming_links ul li,#dashboard_secondary ul li,#dashboard_primary ul li,p.row-actions{width:100%;}#favorite-inside{position:absolute;right:0;}#post-status-info{height:25px;}#screen-meta{position:static;}p.submit{height:22px;}.inner-sidebar{position:static;}form#widgets-filter{position:static;}* html .meta-box-sortables .postbox .handlediv{background:transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;}.menu-max-depth-0 #menu-management{width:460px;}.menu-max-depth-1 #menu-management{width:490px;}.menu-max-depth-2 #menu-management{width:520px;}.menu-max-depth-3 #menu-management{width:550px;}.menu-max-depth-4 #menu-management{width:580px;}.menu-max-depth-5 #menu-management{width:610px;}.menu-max-depth-6 #menu-management{width:640px;}.menu-max-depth-7 #menu-management{width:670px;}.menu-max-depth-8 #menu-management{width:700px;}.menu-max-depth-9 #menu-management{width:730px;}.menu-max-depth-10 #menu-management{width:760px;}.menu-max-depth-11 #menu-management{width:790px;}.menu-item-depth-0{margin-left:0;}.menu-item-depth-1{margin-left:-30px;}.menu-item-depth-2{margin-left:-60px;}.menu-item-depth-3{margin-left:-90px;}.menu-item-depth-4{margin-left:-120px;}.menu-item-depth-5{margin-left:-150px;}.menu-item-depth-6{margin-left:-180px;}.menu-item-depth-7{margin-left:-210px;}.menu-item-depth-8{margin-left:-240px;}.menu-item-depth-9{margin-left:-270px;}.menu-item-depth-10{margin-left:-300px;}.menu-item-depth-11{margin-left:-330px;}#menu-to-edit li dl{padding:0!important;margin:0!important;}.ui-sortable-helper .menu-item-transport{margin-top:13px;}.ui-sortable-helper .menu-item-transport .menu-item-transport{margin-top:0;}.sortable-placeholder{margin-top:0!important;margin-left:0!important;margin-bottom:13px!important;padding:0!important;}.auto-add-pages{clear:both;float:none;}#nav-menus-frame .open-label span{float:none;display:inline-block;}#nav-menus-frame .delete-action{float:none;}
html{direction:ltr;}body{direction:rtl;}* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle{background:url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -109px;}* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle{background:url(../images/menu-bits-rtl.gif?ver=20100531) no-repeat scroll right -206px;}* html #adminmenu{margin-left:0;margin-right:-80px;}* html div.folded #adminmenu{margin-left:0;margin-right:-22px;}#wpcontent #adminmenu .wp-submenu li.wp-submenu-head{padding:3px 10px 4px 4px;}.inline-edit-row fieldset label span.title{float:right;}.inline-edit-row fieldset label span.input-text-wrap{margin-right:0;}p.search-box{float:left;}* html #poststuff h2{margin-right:0;}#bh{margin:7px 10px 0 0;float:left;}div#dashboard-widgets{padding-right:0;padding-left:1px;}.tagchecklist span a{margin:4px -9px 0 0;}.widefat th input{margin:0 5px 0 0;}#TB_window{width:670px;position:absolute;top:50%;left:50%;margin-right:335px!important;}#dashboard_plugins{direction:ltr;}#dashboard_plugins h3.hndle{direction:rtl;}#dashboard_incoming_links ul li,#dashboard_secondary ul li,#dashboard_primary ul li,p.row-actions{width:100%;}#favorite-inside{position:absolute;right:0;}#post-status-info{height:25px;}#screen-meta{position:static;}p.submit{height:22px;}.inner-sidebar{position:static;}form#widgets-filter{position:static;}* html .meta-box-sortables .postbox .handlediv{background:transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;}.menu-max-depth-0 #menu-management{width:460px;}.menu-max-depth-1 #menu-management{width:490px;}.menu-max-depth-2 #menu-management{width:520px;}.menu-max-depth-3 #menu-management{width:550px;}.menu-max-depth-4 #menu-management{width:580px;}.menu-max-depth-5 #menu-management{width:610px;}.menu-max-depth-6 #menu-management{width:640px;}.menu-max-depth-7 #menu-management{width:670px;}.menu-max-depth-8 #menu-management{width:700px;}.menu-max-depth-9 #menu-management{width:730px;}.menu-max-depth-10 #menu-management{width:760px;}.menu-max-depth-11 #menu-management{width:790px;}.menu-item-depth-0{margin-left:0;}.menu-item-depth-1{margin-left:-30px;}.menu-item-depth-2{margin-left:-60px;}.menu-item-depth-3{margin-left:-90px;}.menu-item-depth-4{margin-left:-120px;}.menu-item-depth-5{margin-left:-150px;}.menu-item-depth-6{margin-left:-180px;}.menu-item-depth-7{margin-left:-210px;}.menu-item-depth-8{margin-left:-240px;}.menu-item-depth-9{margin-left:-270px;}.menu-item-depth-10{margin-left:-300px;}.menu-item-depth-11{margin-left:-330px;}#menu-to-edit li dl{padding:0!important;margin:0!important;}.ui-sortable-helper .menu-item-transport{margin-top:13px;}.ui-sortable-helper .menu-item-transport .menu-item-transport{margin-top:0;}.sortable-placeholder{margin-top:0!important;margin-left:0!important;margin-bottom:13px!important;padding:0!important;}.auto-add-pages{clear:both;float:none;}#nav-menus-frame .open-label span{float:none;display:inline-block;}#nav-menus-frame .delete-action{float:none;}

View File

@ -38,13 +38,6 @@ p.search-box {
margin: 7px 10px 0 0;
float: left;
}
#user_info + div#favorite-actions {
right: auto;
left: 15px;
}
#wphead-info {
float: left;
}
/* without this dashboard widgets appear in one column for some screen widths */
div#dashboard-widgets {
padding-right: 0;

File diff suppressed because one or more lines are too long

View File

@ -225,10 +225,6 @@ ul#adminmenu {
visibility: visible;
}
#wphead-info {
float: right;
}
#titlediv #title {
width: 98%;
}

File diff suppressed because one or more lines are too long

View File

@ -306,34 +306,6 @@ form.upgrade .hint {
/*------------------------------------------------------------------------------
6.0 - Admin Header
------------------------------------------------------------------------------*/
#wphead-info {
margin: 0 15px 0 0;
}
#user_info {
float: left;
padding: 0 6px 0 2px;
}
#user_info.active {
margin-right: 0;
margin-left: -1px;
}
#user_info .hide-if-no-js p {
margin: 0 0 0 20px;
}
#user_info_arrow {
right: auto;
left: 3px;
}
#user_info_links_wrap {
right: auto;
left: 0;
}
#wphead {
height: 32px;
margin-left: 15px;

File diff suppressed because one or more lines are too long

View File

@ -1328,116 +1328,6 @@ form.upgrade .hint {
/*------------------------------------------------------------------------------
6.0 - Admin Header
------------------------------------------------------------------------------*/
#wphead-info {
margin: 0 0 0 15px;
}
#user_info {
float: right;
font-size: 12px;
line-height: 26px;
height: 25px;
position: relative;
z-index: 49;
border-style: solid;
border-width: 0;
margin-top: 3px;
padding: 0 2px 0 6px;
}
#user_info.active {
border-width: 1px;
margin-right: -1px;
margin-top: 2px;
-webkit-border-top-right-radius: 3px;
-webkit-border-top-left-radius: 3px;
border-top-right-radius: 3px;
border-top-left-radius: 3px;
}
#user_info p {
margin: 0;
padding: 0;
line-height: 25px;
cursor: pointer;
}
#user_info .hide-if-no-js p {
margin: 0 20px 0 0;
text-align: right;
}
#user_info:hover .hide-if-no-js p {
text-decoration: underline;
}
#user_info.active .hide-if-no-js p {
text-decoration: none;
}
#user_info_arrow {
height: 22px;
width: 22px;
position: absolute;
right: 3px;
top: 0;
cursor: pointer;
}
#user_info_links_wrap {
min-width: 100px;
width: 100%;
top: 25px;
right: 0;
padding: 0;
text-shadow: rgba(255,255,255,0.7) 0 1px 0;
}
#user_info_links {
position: absolute;
left: -1px;
right: -1px;
overflow: hidden;
margin-bottom: 0;
}
#user_info.active #user_info_links ul {
margin-top: 0;
margin-bottom: 0;
-moz-transition: margin-top 200ms;
-webkit-transition: margin-top 200ms;
-o-transition: margin-top 200ms;
transition: margin-top 200ms;
}
#user_info_links ul {
border-width: 1px;
border-style: solid;
margin-top: -1000px;
-moz-transition: margin-top 500ms ease-in;
-webkit-transition: margin-top 500ms ease-in;
-o-transition: margin-top 500ms ease-in;
transition: margin-top 500ms ease-in;
}
#user_info_links,
#user_info_links ul,
#user_info_links li:last-child {
-webkit-border-bottom-right-radius: 3px;
-webkit-border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
}
#user_info_links li {
display: block;
margin: 0;
}
#user_info_links a {
display: block;
padding: 6px 8px;
}
#wphead {
height: 32px;
margin-right: 20px;

View File

@ -240,7 +240,7 @@ screenMeta = {
$(document).ready( function() {
var lastClicked = false, checks, first, last, checked, dropdown,
var lastClicked = false, checks, first, last, checked,
pageInput = $('input.current-page'), currentPage = pageInput.val();
// Move .updated and .error alert boxes. Don't move boxes designed to be inline.
@ -250,25 +250,6 @@ $(document).ready( function() {
// Init screen meta
screenMeta.init();
// User info dropdown.
// @todo: Removed in 3.3; remove me!
dropdown = {
doc: $(document),
element: $('#user_info'),
open: function() {
if ( ! dropdown.element.hasClass('active') ) {
dropdown.element.addClass('active');
dropdown.doc.one( 'click', dropdown.close );
return false;
}
},
close: function() {
dropdown.element.removeClass('active');
}
};
dropdown.element.click( dropdown.open );
// check all checkboxes
$('tbody').children().children('.check-column').find(':checkbox').click( function(e) {
if ( 'undefined' == e.shiftKey ) { return true; }

File diff suppressed because one or more lines are too long

View File

@ -61,7 +61,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20110915b', 1 );
$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20110919', 1 );
$scripts->add_script_data( 'common', 'commonL10n', array(
'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete.")
) );
@ -406,13 +406,13 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110919a' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110919b' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110902' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110919' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
// all colors stylesheets need to have the same query strings (cache manifest compat)
$colors_version = '20110916';
$colors_version = '20110919';
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
$styles->add( 'colors', true, array('wp-admin'), $colors_version );