Combine few styles for column containers, props olleicua, see #18314

git-svn-id: https://develop.svn.wordpress.org/trunk@18903 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2011-10-06 14:37:55 +00:00
parent 390650f410
commit fcecbaa30c
3 changed files with 9 additions and 11 deletions

File diff suppressed because one or more lines are too long

View File

@ -163,26 +163,24 @@ TABLE OF CONTENTS:
/* 2 columns main area */ /* 2 columns main area */
#col-container {
#col-container,
#col-left,
#col-right {
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
#col-left { #col-left {
padding: 0; width: 35%;
margin: 0;
overflow: hidden;
width: 39%;
} }
#col-right { #col-right {
float: right; float: right;
clear: right; clear: right;
overflow: hidden; width: 65%;
padding: 0;
margin: 0;
width: 59%;
} }
.col-wrap { .col-wrap {

View File

@ -431,7 +431,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(), '20111005c' ); $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111006' );
$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' );