diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 2442dcfd30..c82978aa98 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -368,7 +368,7 @@ div.dashboard-widget-submit input:hover, color: #EAF2FA !important; } -#side-info-column #category-tabs .ui-tabs-selected a { +#side-sortables #category-tabs .ui-tabs-selected a { color: #333; } diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 93a2598ab6..9a394207bb 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -368,7 +368,7 @@ div.dashboard-widget-submit input:hover, color: #EAF2FA !important; } -#side-info-column #category-tabs .ui-tabs-selected a { +#side-sortables #category-tabs .ui-tabs-selected a { color: #333; } diff --git a/wp-admin/css/dashboard.css b/wp-admin/css/dashboard.css index 119121a5fe..49d338bb45 100644 --- a/wp-admin/css/dashboard.css +++ b/wp-admin/css/dashboard.css @@ -56,18 +56,6 @@ form .textarea-wrap { min-width: 0; } -#dashboard-widgets-wrap .has-sidebar { - margin-right: -51%; -} - -#dashboard-widgets-wrap .inner-sidebar { - width: 49%; -} - -#dashboard-widgets-wrap .has-sidebar .has-sidebar-content { - margin-right: 51%; -} - div.postbox div.inside { margin: 10px; position: relative; diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index 2207ee350c..12b09c49c9 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -116,19 +116,20 @@ table { .inner-sidebar { float: right; clear: right; + display: none; +} + +.inner-sidebar #side-sortables { width: 280px; - position: relative; + min-height: 300px; } -.has-sidebar { - float: left; - clear: left; - width: 100%; - margin-right: -340px; +.has-right-sidebar .inner-sidebar { + display: block; } -.has-sidebar .has-sidebar-content { - margin-right: 305px; +.has-right-sidebar #post-body { + margin-right: 300px; } /* 2 columns main area */ diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index 2c1081931a..6fc2cd3bf7 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -22,8 +22,9 @@ input.button-highlighted { margin-bottom: -1px; } -* html #side-info-column { - height: auto; +* html .inner-sidebar #side-sortables, +* html .postbox-container .meta-box-sortables { + height: 300px; } * html #wpbody-content #screen-options-link-wrap { @@ -38,16 +39,6 @@ input.button-highlighted { text-align: center; } -/* -* html body.minwidth { - _width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%"); -} - -* html #wpbody { - _width: expression(document.documentElement.clientWidth > 982 ? "980px" : "99.9%"); -} -*/ - * html #adminmenu { margin-left: -80px; } @@ -62,6 +53,10 @@ input.button-highlighted { margin: 0; } +* html #footer { + margin: 0; +} + #wpcontent.folded #adminmenu li.menu-top { display: block; } @@ -347,3 +342,9 @@ table.ie-fixed { display: inline-block; padding: 2px 5px; } + +* html .stuffbox, +* html .stuffbox input, +* html .stuffbox textarea { + border: 1px solid #DFDFDF; +} diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 90ef6012ce..50b5f4ca99 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -582,7 +582,7 @@ else -
+
@@ -591,8 +591,7 @@ else
-
-
+
@@ -613,9 +612,9 @@ endif; ?> post_content); ?> -
- - + + + +
  echo ''; } ?> - -
- +
@@ -653,7 +651,6 @@ do_action('dbx_post_sidebar'); ?> -

diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index b32d53b7d7..c374994c13 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -69,7 +69,7 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
-comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete'); ?> +comment_ID&_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ){return true;}return false;\">" . __('Delete') . "\n"; ?>
@@ -81,9 +81,7 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
-
-
- +

@@ -138,7 +136,6 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
-