Fix inconsistent css handling of .wide-screen, see #18198
git-svn-id: https://develop.svn.wordpress.org/trunk@18743 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
92054191a1
commit
ecb902c53d
@ -93,9 +93,12 @@ if ( $is_iphone ) { ?>
|
||||
</head>
|
||||
<body class="wp-admin no-js <?php echo apply_filters( 'admin_body_class', '' ) . " $admin_body_class"; ?>">
|
||||
<script type="text/javascript">
|
||||
document.body.className = document.body.className.replace(/no-js/, 'js');
|
||||
if ( document.body.clientWidth > 1300 )
|
||||
(function(){
|
||||
var bc = document.body.className, w = bc.match(/folded/) ? 1217 : 1330;
|
||||
document.body.className = bc.replace(/no-js/, 'js');
|
||||
if ( document.body.clientWidth > w )
|
||||
document.body.className += ' wide-window';
|
||||
})();
|
||||
</script>
|
||||
|
||||
<div id="wpwrap">
|
||||
|
File diff suppressed because one or more lines are too long
@ -130,18 +130,16 @@ TABLE OF CONTENTS:
|
||||
display: block;
|
||||
}
|
||||
|
||||
.inner-sidebar #side-sortables {
|
||||
min-height: 300px;
|
||||
.wide-window .inner-sidebar #side-sortables {
|
||||
margin-right: 870px;
|
||||
min-width: 280px;
|
||||
max-width: 480px;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.wide-window .inner-sidebar #side-sortables {
|
||||
margin-right: 870px;
|
||||
}
|
||||
|
||||
.inner-sidebar #side-sortables,
|
||||
.columns-2 .inner-sidebar #side-sortables {
|
||||
min-height: 300px;
|
||||
width: 280px;
|
||||
padding: 0;
|
||||
}
|
||||
|
@ -406,7 +406,7 @@ 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(), '20110921' );
|
||||
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110921a' );
|
||||
|
||||
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110919' );
|
||||
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
||||
|
Loading…
Reference in New Issue
Block a user