WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistent css handling of .wide-screen, see #18198 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-09-21 21:44:44 +00:00
parent 2fb95a133d
commit 1cdd3d5154
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/admin-header.php
View File

@ -93,9 +93,12 @@ if ( $is_iphone ) { ?>
</head> </head>
<body class="wp-admin no-js <?php echo apply_filters( 'admin_body_class', '' ) . " $admin_body_class"; ?>"> <body class="wp-admin no-js <?php echo apply_filters( 'admin_body_class', '' ) . " $admin_body_class"; ?>">
<script type="text/javascript"> <script type="text/javascript">
document.body.className = document.body.className.replace(/no-js/, 'js'); (function(){
if ( document.body.clientWidth > 1300 ) 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'; document.body.className += ' wide-window';
})();
</script> </script>
<div id="wpwrap"> <div id="wpwrap">

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

File diff suppressed because one or more lines are too long

10
wp-admin/css/wp-admin.dev.css
View File

@ -130,18 +130,16 @@ TABLE OF CONTENTS:
display: block; display: block;
} }
.inner-sidebar #side-sortables { .wide-window .inner-sidebar #side-sortables {
min-height: 300px; margin-right: 870px;
min-width: 280px; min-width: 280px;
max-width: 480px; max-width: 480px;
width: auto; width: auto;
} }
.wide-window .inner-sidebar #side-sortables { .inner-sidebar #side-sortables,
margin-right: 870px;
}
.columns-2 .inner-sidebar #side-sortables { .columns-2 .inner-sidebar #side-sortables {
min-height: 300px;
width: 280px; width: 280px;
padding: 0; padding: 0;
} }

2
wp-includes/script-loader.php
View File

@ -406,7 +406,7 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr // Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' ); $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( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110919' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );