diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index 052052cbd..070285ccf 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -1218,7 +1218,7 @@ case 'find_posts': if ( ! $posts ) exit( __('No posts found.') ); - $html = ''; + $html = '

'.__('Title').''.__('Time').''.__('Status').'
'; foreach ( $posts as $post ) { switch ( $post->post_status ) { diff --git a/wp-admin/categories.php b/wp-admin/categories.php index 66805f64b..d44ca684f 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -143,7 +143,7 @@ endif; ?> diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index ed1be7902..d5c793ce0 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -106,9 +106,9 @@ textarea.disabled { color: #fff; } -.metabox-holder .postbox h3, -#poststuff .postbox h3, -#poststuff .stuffbox h3 { +.widget .widget-top, +.postbox h3, +.stuffbox h3 { background: #dfdfdf url("../images/blue-grad.png") repeat-x left top; text-shadow: #fff 0 1px 0; } @@ -123,11 +123,6 @@ textarea.disabled { color: #666; } -select { - background-color: #fff; - border-color: #8CBDD5; -} - strong .post-com-count span { background-color: #21759b; } @@ -195,12 +190,6 @@ strong .post-com-count span { border-color: #c00 !important; } -.form-table input, -.form-table textarea, -.search-input, -.screen-per-page, -.form-field input, -.form-field textarea, .submit { border-color: #8CBDD5; } @@ -614,15 +603,11 @@ input.readonly, textarea.readonly { background-color: #fff; } -.metabox-holder .postbox, -#poststuff .postbox, +.widget, +.postbox, #titlediv, #poststuff .postarea, -#poststuff .stuffbox, -.postbox input[type="text"], -.postbox textarea, -.stuffbox input[type="text"], -.stuffbox textarea { +.stuffbox { border-color: #BBD8E7; } @@ -635,6 +620,7 @@ input.readonly, textarea.readonly { color: #093E56; } +.widget .widget-top, .ui-sortable .postbox h3:hover { color: #000; } @@ -980,7 +966,7 @@ abbr.required, #timestampdiv input, #namediv input, #poststuff .inside .the-tagcloud { - border-color: #ddd; + border-color: #8CBDD5; } /* menu */ @@ -1577,3 +1563,13 @@ div.widgets-holder-wrap { color: #d54e21; } +textarea, +input, +select { + border-color: #8CBDD5; +} + +* html input, +* html .widget { + border-color: #8CBDD5; +} diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 4ca9a38ef..3e5700d08 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -123,11 +123,6 @@ textarea.disabled { color: #666; } -select { - background-color: #fff; - border-color: #ddd; -} - strong .post-com-count span { background-color: #21759b; } @@ -195,12 +190,6 @@ strong .post-com-count span { border-color: #c00 !important; } -.form-table input, -.form-table textarea, -.search-input, -.screen-per-page, -.form-field input, -.form-field textarea, .submit { border-color: #DFDFDF; } @@ -618,11 +607,7 @@ input.readonly, textarea.readonly { .postbox, #titlediv, #poststuff .postarea, -#poststuff .stuffbox, -.postbox input[type="text"], -.postbox textarea, -.stuffbox input[type="text"], -.stuffbox textarea { +.stuffbox { border-color: #dfdfdf; } @@ -631,7 +616,6 @@ input.readonly, textarea.readonly { background-color: #FFF; } -.widget .widget-top, .ui-sortable .postbox h3 { color: #464646; } @@ -1579,3 +1563,13 @@ div.widgets-holder-wrap { color: #d54e21; } +textarea, +input, +select { + border-color: #DFDFDF; +} + +* html input, +* html .widget { + border-color: #dfdfdf; +} diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index bb3179840..82f45656e 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -204,7 +204,7 @@ textarea { input[type="checkbox"], input[type="radio"] { - vertical-align: text-top; + vertical-align: middle; } /* styles for use by people extending the WordPress interface */ @@ -214,8 +214,22 @@ body { } body, -td { - font: 13px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; +td, +textarea, +input, +select { + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + font-size: 13px; +} + +body, +textarea { + line-height: 1.4em; +} + +input, +select { + line-height: 1em; } p { @@ -246,7 +260,6 @@ dt { textarea, input, select { - font: 13px/19px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; margin: 1px; padding: 3px; } @@ -356,38 +369,10 @@ h6 { } .widefat td { - padding: 7px 7px 5px; + padding: 3px 7px; vertical-align: top; } -.widefat thead tr th:first { - -moz-border-radius-topleft: 4px; - -webkit-border-top-left-radius: 4px; - -khtml-border-top-left-radius: 4px; - border-top-left-radius: 4px; -} - -.widefat thead tr th:last { - -moz-border-radius-topright: 4px; - -webkit-border-top-right-radius: 4px; - -khtml-border-top-right-radius: 4px; - border-top-right-radius: 4px; -} - -.widefat tfoot tr th:first { - -moz-border-radius-bottomleft: 4px; - -webkit-border-bottom-left-radius: 4px; - -khtml-border-bottom-left-radius: 4px; - border-bottom-left-radius: 4px; -} - -.widefat tfoot tr th:last { - -moz-border-radius-bottomright: 4px; - -webkit-border-bottom-right-radius: 4px; - -khtml-border-bottom-right-radius: 4px; - border-bottom-right-radius: 4px; -} - .widefat td p, .widefat td ol, .widefat td ul { diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index 3e85af3d1..3827b0e13 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -356,10 +356,6 @@ table.ie-fixed { background: url("../images/menu-bits.gif") no-repeat scroll 0 -110px; } -* html .widget { - border-color: #dfdfdf; -} - * html div.widget-liquid-left { width: 99%; } @@ -371,3 +367,8 @@ table.ie-fixed { * html .widgets-sortables { height: 50px; } + +* html a#content_resize { + right: -2px; +} + diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index ee536a510..c9686e9db 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -177,7 +177,7 @@ unset($status_links); diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 1309c5961..c510e18d4 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -613,7 +613,7 @@ endif; ?> post_content); ?> -

'.__('Title').''.__('Time').''.__('Status').'
+
  diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php index 4878fc556..c8e3c62dc 100644 --- a/wp-admin/edit-link-categories.php +++ b/wp-admin/edit-link-categories.php @@ -74,7 +74,7 @@ endif; ?>
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index 004922e68..e89e85638 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -457,7 +457,7 @@ endif; ?>
post_content); ?> - +
  diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index 96c9e9e73..0cb8c44c5 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -170,7 +170,7 @@ endif; diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index c474f0648..71cab9d5c 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -159,7 +159,7 @@ endif; ?>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 5f7caed66..ee567a529 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -165,7 +165,7 @@ endif; diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 1a9067681..8aa1552b6 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -1705,7 +1705,7 @@ function media_upload_library_form($errors) { diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 9897631bb..ed87f15bd 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -162,7 +162,7 @@ function install_search_form(){ - + - +
@@ -3135,8 +3135,8 @@ function find_posts_div($found_action = '') {
- - + +
> - + ]*?>/g,"")}if(c){a("#find-posts-response").html(c)}}};a(document).ready(function(){a("#find-posts-submit").click(function(b){if(""==a("#find-posts-response").html()){b.preventDefault()}});a("#doaction, #doaction2").click(function(b){a('select[name^="action"]').each(function(){if(a(this).val()=="attach"){b.preventDefault();findPosts.open()}})})})})(jQuery); \ No newline at end of file +var findPosts;(function(a){findPosts={open:function(d,c){var b=document.documentElement.scrollTop||a(document).scrollTop();if(d&&c){a("#affected").attr("name",d).val(c)}a("#find-posts").show().draggable({handle:"#find-posts-head"}).css({top:b+50+"px",left:"50%",marginLeft:"-250px"});a("#find-posts-input").focus().keyup(function(f){if(f.which==27){findPosts.close()}});return false},close:function(){a("#find-posts-response").html("");a("#find-posts").draggable("destroy").hide()},send:function(){var b={ps:a("#find-posts-input").val(),action:"find_posts",_ajax_nonce:a("#_ajax_nonce").val()};if(a("#find-posts-pages:checked").val()){b.pages=1}else{b.posts=1}a.ajax({type:"POST",url:ajaxurl,data:b,success:function(c){findPosts.show(c)},error:function(c){findPosts.error(c)}})},show:function(b){if(typeof(b)=="string"){this.error({responseText:b});return}var c=wpAjax.parseAjaxResponse(b);if(c.errors){this.error({responseText:wpAjax.broken})}c=c.responses[0];a("#find-posts-response").html(c.data)},error:function(b){var c=b.statusText;if(b.responseText){c=b.responseText.replace(/<.[^<>]*?>/g,"")}if(c){a("#find-posts-response").html(c)}}};a(document).ready(function(){a("#find-posts-submit").click(function(b){if(""==a("#find-posts-response").html()){b.preventDefault()}});a("#doaction, #doaction2").click(function(b){a('select[name^="action"]').each(function(){if(a(this).val()=="attach"){b.preventDefault();findPosts.open()}})})})})(jQuery); \ No newline at end of file diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index 632c3803c..f480c4be1 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -89,7 +89,7 @@ if ( isset($_GET['deleted']) ) {
diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 39677543c..2431117e0 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -10,7 +10,6 @@ require_once('admin.php'); wp_enqueue_script( 'wp-ajax-response' ); wp_enqueue_script( 'jquery-ui-draggable' ); -wp_enqueue_script( 'jquery-ui-resizable' ); if (!current_user_can('upload_files')) wp_die(__('You do not have permission to upload files.')); @@ -211,7 +210,7 @@ unset($type_links);
diff --git a/wp-admin/users.php b/wp-admin/users.php index 4af739236..f10b853c5 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -291,7 +291,7 @@ unset($role_links);
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index d9daa5c35..d17e230d6 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -1,5 +1,33 @@ -p, ul, ol, blockquote { font-size: 12px; } +textarea, +input, +select { + border-width: 1px; + border-style: solid; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; +} + +input[type="checkbox"], +input[type="radio"], +input[type="image"] { + border: 0 none; +} + +p, +ul, +ol, +blockquote, +input, +select { + font-size: 12px; +} + +select option { + padding: 2px; +} .plugins .name, #pass-strength-result.strong, @@ -307,7 +335,6 @@ form p.submit a.cancel:hover { .button-secondary, .button-highlighted, #postcustomstuff .submit input { - font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; text-decoration: none; font-size: 11px !important; line-height: 16px; @@ -352,12 +379,9 @@ a.button-secondary { } #wpcontent select { - font: 11px/20px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; padding: 2px; - border-width: 1px; - border-style: solid; height: 2em; - vertical-align: top; + font-size: 11px; } #wpcontent option { @@ -462,15 +486,9 @@ textarea.all-options, input.all-options { margin: 3px 1px 4px; line-height: 18px; display: inline-block; - border-width: 1px; - border-style: solid; min-width: 26px; padding: 2px 4px; font-size: 12px; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; } #ed_reply_toolbar input { @@ -1412,7 +1430,6 @@ table.form-table td .updated { } #post-status-info { - line-height: 2; border-width: 0 1px 1px; border-style: none solid solid; width: 100%; @@ -1440,15 +1457,12 @@ table.form-table td .updated { #post-body .wp_themeSkin .mceStatusbar a.mceResize { display: block; - float: right; background: transparent url(images/resize.gif) no-repeat scroll right bottom; width: 12px; - height: 12px; cursor: se-resize; margin: 0 2px; position: relative; - right: 0; - top: 29px; + top: 22px; } @@ -1945,13 +1959,6 @@ p.search-box { margin: -5px 0 0; } -.search-input, -.screen-per-page { - border-width: 1px; - border-style: solid; - padding: 2px; -} - .screen-per-page { width: 3em; } @@ -2614,7 +2621,7 @@ ul.cat-checklist { border-width: 1px; overflow-y: scroll; padding: 0 5px; - margin: 0 0 5px; + margin: 0; } #bulk-titles { @@ -2773,10 +2780,10 @@ abbr.required { /* find posts */ .find-box { - width: 400px; - height: 250px; + width: 500px; + height: 300px; overflow: hidden; - padding: 33px 5px 50px; + padding: 33px 5px 40px; position: absolute; z-index: 1000; } @@ -2814,20 +2821,25 @@ abbr.required { } #find-posts-response .found-radio { - padding: 8px 0 0 8px; + padding: 5px 0 0 8px; width: 15px; } .find-box-buttons { - bottom: 12px; - left: 12px; - position: absolute; + width: 480px; + margin: 8px; } .find-box-search label { padding-right: 6px; } +.find-box #resize-se { + position: absolute; + right: 1px; + bottom: 1px; +} + /* favorite-actions */ #favorite-actions { float: right; @@ -2956,6 +2968,7 @@ table.fixed { .fixed .column-comments { width: 4em; + padding-top: 8px; } .fixed .column-slug { @@ -2981,10 +2994,6 @@ table.fixed { overflow: hidden; } -.widefat th { - text-shadow: rgba(255,255,255,0.8) 0 1px 0; -} - .icon32 { float: left; height: 36px; diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 1e7445de2..7fb04de66 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -381,7 +381,7 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '20090102' ); $scripts->add_data( 'hoverIntent', 'group', 1 ); - $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery-ui-draggable', 'jquery-ui-resizable' ), '20090113' ); + $scripts->add( 'media', "/wp-admin/js/media$suffix.js", array( 'jquery-ui-draggable' ), '20090415' ); $scripts->add_data( 'media', 'group', 1 ); $scripts->add( 'codepress', '/wp-includes/js/codepress/codepress.js', false, '0.9.6' ); @@ -418,19 +418,19 @@ function wp_default_styles( &$styles ) { $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' ); - $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090411' ); + $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090415' ); $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); - $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090411' ); + $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090415' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' ); - $styles->add( 'colors', true, array(), '20090411' ); // Register "meta" stylesheet for admin colors + $styles->add( 'colors', true, array(), '20090415' ); // Register "meta" stylesheet for admin colors $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081210'); // for login.php. Is there a better way? $styles->add_data( 'colors-fresh', 'rtl', true ); $styles->add( 'colors-classic', '/wp-admin/css/colors-classic.css', array(), '20081210'); $styles->add_data( 'colors-classic', 'rtl', true ); - $styles->add( 'global', '/wp-admin/css/global.css', array(), '20090411' ); + $styles->add( 'global', '/wp-admin/css/global.css', array(), '20090415' ); $styles->add( 'media', '/wp-admin/css/media.css', array(), '20090325' ); $styles->add( 'widgets', '/wp-admin/css/widgets.css', array(), '20090411' ); $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20090305' );