diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css index c699ad8b46..eb7e02ca0c 100644 --- a/src/wp-admin/css/common.css +++ b/src/wp-admin/css/common.css @@ -855,7 +855,6 @@ span.required, #media-items a.delete-permanently:hover, #nav-menu-footer .menu-delete:hover { color: #f00; - text-decoration: none; border: none; } @@ -875,10 +874,8 @@ span.required, } #delete-action { - line-height: 28px; - vertical-align: middle; - text-align: left; float: left; + line-height: 28px; } #publishing-action { diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css index ac76492173..afb4195d06 100644 --- a/src/wp-admin/css/edit.css +++ b/src/wp-admin/css/edit.css @@ -129,23 +129,10 @@ input#link_url { float: left; } -.submitbox .submitdelete { - text-decoration: none; - padding: 1px 2px; -} - body.post-new-php .submitbox .submitdelete { display: none; } -/* @todo: do we really need this? word on the street is we don't and this -stray rule may actually be compensated for elsewhere. */ -#normal-sortables .submitbox .submitdelete:hover { - color: #000; - background-color: #f00; - border-bottom-color: #f00; -} - .submitbox .submit a:hover { text-decoration: underline; } @@ -644,6 +631,7 @@ span.wp-media-buttons-icon:before { margin-top: 3px; } +#linksubmitdiv .inside, /* Old Link Manager back-compat. */ #poststuff #submitdiv .inside { margin: 0; padding: 0; diff --git a/src/wp-admin/css/nav-menus.css b/src/wp-admin/css/nav-menus.css index 2e4ee7cbae..17ec1ce915 100644 --- a/src/wp-admin/css/nav-menus.css +++ b/src/wp-admin/css/nav-menus.css @@ -139,12 +139,15 @@ ul.add-menu-item-tabs li { } /* Menu Container */ + +/* @todo: responsive view. */ #menu-management-liquid { float: left; min-width: 100%; margin-top: 3px; } +/* @todo: responsive view. */ #menu-management { position: relative; margin-right: 20px; @@ -284,19 +287,6 @@ ul.add-menu-item-tabs li { padding: 0; } -.nav-menus-php .meta-sep, -.nav-menus-php .submitdelete, -.nav-menus-php .submitcancel { - display: block; - float: left; - margin: 6px 0; - line-height: 15px; -} - -.meta-sep { - padding: 0 2px; -} - /* @todo: is this actually used? */ #cancel-save { text-decoration: underline; @@ -480,6 +470,7 @@ ul.add-menu-item-tabs li { font-weight: 600; line-height: 20px; display: block; + /* @todo: responsive view. */ margin-right: 13em; } @@ -671,7 +662,7 @@ body.menu-max-depth-11 { min-width: 1280px !important; } .link-to-original { display: block; - margin: 0 0 10px; + margin: 0 0 15px; padding: 3px 5px 5px; border: 1px solid #ddd; color: #72777c; @@ -704,6 +695,7 @@ body.menu-max-depth-11 { min-width: 1280px !important; } .menu-item-actions { padding-top: 15px; + padding-bottom: 7px; } #cancel-save { @@ -713,7 +705,8 @@ body.menu-max-depth-11 { min-width: 1280px !important; } /* Major/minor publishing actions (classes) */ .nav-menus-php .major-publishing-actions { clear: both; - padding: 7px 0 6px; + padding: 10px 0; + line-height: 28px; } .nav-menus-php .major-publishing-actions .publishing-action { @@ -725,21 +718,10 @@ body.menu-max-depth-11 { min-width: 1280px !important; } display: none; } +/* Same as the Publish Meta Box #delete-action */ .nav-menus-php .delete-action { float: left; - margin-top: 2px; -} - -.nav-menus-php .submitbox .submitcancel { - border-bottom: 1px solid #0073aa; - padding: 1px 2px; - color: #0073aa; - text-decoration: none; -} - -.nav-menus-php .submitbox .submitcancel:hover { - background: #0073aa; - color: #fff; + line-height: 28px; } .nav-menus-php .major-publishing-actions .form-invalid { @@ -825,14 +807,9 @@ body.menu-max-depth-11 { min-width: 1280px !important; } margin-top: 4px; } - .nav-menus-php .major-publishing-actions .publishing-action { - margin-top: 6px; - } - .nav-menus-php .delete-action { font-size: 14px; - line-height: 50px; - margin-top: 12px; + line-height: 30px; } .menu-item-bar .menu-item-handle, diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php index 9fac3e934c..2ae7957f72 100644 --- a/src/wp-admin/edit-form-comment.php +++ b/src/wp-admin/edit-form-comment.php @@ -162,7 +162,7 @@ endif; ?> comment_ID&_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . ( !EMPTY_TRASH_DAYS ? __('Delete Permanently') : __('Move to Trash') ) . "\n"; ?>
- +
diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php index ea91db46e8..2d12faf46a 100644 --- a/src/wp-admin/includes/meta-boxes.php +++ b/src/wp-admin/includes/meta-boxes.php @@ -252,14 +252,14 @@ if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 if ( $can_publish ) : if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?> - + - + - + @@ -334,7 +334,7 @@ function attachment_submit_meta_box( $post ) {
- +
@@ -909,9 +909,9 @@ if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('m
link_id) ) { ?> - + - +
diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php index 72de2a92c9..4c383e8dc4 100644 --- a/src/wp-admin/nav-menus.php +++ b/src/wp-admin/nav-menus.php @@ -759,7 +759,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); />
- 'save_menu_header' ) ); ?> + 'save_menu_header' ) ); ?>
@@ -836,7 +836,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
- 'save_menu_footer' ) ); ?> + 'save_menu_footer' ) ); ?>