diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index 3afbd2f6f6..6827ecdb9d 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -438,8 +438,7 @@ ol.ol-decimal > li { .widefat .num, .column-comments, .column-links, -.column-posts, -.column-parent { +.column-posts { text-align: center; } diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index 6c59c93ad4..2194f2a5af 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -393,3 +393,7 @@ table.ie-fixed { position: relative; } +* html .media-item .pinkynail { + height: 32px; + width: 40px; +} diff --git a/wp-admin/css/media-rtl.css b/wp-admin/css/media-rtl.css index 5aeab26fa5..396b776569 100644 --- a/wp-admin/css/media-rtl.css +++ b/wp-admin/css/media-rtl.css @@ -47,9 +47,7 @@ button.dismiss { border-right-style: none; border-left-style: solid; } -.media-item .pinkynail { - float: right; -} + .describe-toggle-on, .describe-toggle-off { float: left; diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css index f3ccaf0813..cff8e502f8 100644 --- a/wp-admin/css/media.css +++ b/wp-admin/css/media.css @@ -29,15 +29,6 @@ form { text-align: right; } -.media-upload-form label, -.media-upload-form legend { - display: block; - font-weight: bold; - font-size: 13px; - margin-bottom: 0.5em; - margin: 0 0 0.5em 0; -} - th { position: relative; } @@ -62,11 +53,7 @@ th { } /* specific to the image upload form */ -.align .field label { - display: inline; - padding: 0 0 0 28px; - margin: 0 1em 0 0; -} + .image-align-none-label { background: url(../images/align-none.png) no-repeat center left; @@ -94,16 +81,6 @@ tr.image-size div.image-size-item { margin: 0; } -tr.image-size label { - display: inline; - margin: 0 0 0 1em; -} - -.pinkynail { - max-width: 40px; - max-height: 40px; -} - #library-form .progress, #gallery-form .progress, #flash-upload-ui, @@ -118,13 +95,6 @@ tr.image-size label { max-height: 128px; } -.media-item .pinkynail { - float: left; - margin: 2px; - height: 32px; - max-width: 40px; -} - thead.media-item-info tr { background-color: transparent; } diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index c46400be16..f98f9b0c8c 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -785,9 +785,9 @@ p.pagenav { } td.media-icon { - vertical-align: middle; text-align: center; width: 80px; + padding-top: 8px; } td.media-icon img { @@ -2833,7 +2833,6 @@ table .inline-edit-row fieldset ul.cat-hover { clear: both; cursor: default; padding: 5px; - width: 100%; } #wpbody-content .describe .media-item-info tr { @@ -2849,10 +2848,31 @@ table .inline-edit-row fieldset ul.cat-hover { max-width: 128px; } -#wpbody-content .media-upload-form label { - display: block; - font-size: 13px; +.media-upload-form td label { + margin-right: 6px; + margin-left: 2px; +} + +.media-upload-form .align .field label { + display: inline; + padding: 0 0 0 22px; + margin: 0 1em 0 0; + font-weight: bold; +} + +.media-upload-form tr.image-size label { + margin: 0 0 0 3px; + font-weight: bold; +} + +.media-upload-form th.label label { + font-weight: bold; margin: 0.5em; + font-size: 13px; +} + +.media-upload-form th.label label span { + padding: 0 5px; } abbr.required { @@ -2870,7 +2890,8 @@ abbr.required { padding: 0 0 0 5px; } -.describe-toggle-on, .describe-toggle-off { +.describe-toggle-on, +.describe-toggle-off { display: block; line-height: 36px; float: right; @@ -2902,10 +2923,9 @@ abbr.required { .media-item .pinkynail { float: left; - height: 32px; margin: 2px; max-width: 40px; - max-height: 40px; + max-height: 32px; } .media-item .startopen, @@ -2962,6 +2982,9 @@ button.dismiss { padding: 1px 4px 2px; } +.upload-php .fixed .column-parent { + width: 25%; +} /* find posts */ .find-box { diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 62256dfef7..d0ea4e1506 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -423,10 +423,10 @@ function wp_default_styles( &$styles ) { // all colors stylesheets need to have the same query strings (cache manifest compat) $colors_version = '20090610'; - $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090610' ); + $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090612' ); $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); - $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090514' ); + $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090612' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' ); // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string. @@ -438,8 +438,8 @@ function wp_default_styles( &$styles ) { $styles->add( 'colors-classic', '/wp-admin/css/colors-classic.css', array(), $colors_version); $styles->add_data( 'colors-classic', 'rtl', true ); - $styles->add( 'global', '/wp-admin/css/global.css', array(), '20090514' ); - $styles->add( 'media', '/wp-admin/css/media.css', array(), '20090516' ); + $styles->add( 'global', '/wp-admin/css/global.css', array(), '20090612' ); + $styles->add( 'media', '/wp-admin/css/media.css', array(), '20090612' ); $styles->add( 'widgets', '/wp-admin/css/widgets.css', array(), '20090603' ); $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20090514' ); $styles->add( 'install', '/wp-admin/css/install.css', array(), '20090514' );