diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 3f266e0fa0..26f20f692c 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -148,7 +148,7 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #101010; } -.alternate { +.alternate, .alt { background-color: #f9f9f9; } @@ -205,7 +205,7 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #d54e21; } -.howto, .nonessential, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { +.howto, .nonessential, #edit-slug-box, .form-input-tip, .rss-widget span.rss-date, .subsubsub { color: #999; } diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index a52c912267..92f7770841 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -148,7 +148,7 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #101010; } -.alternate { +.alternate, .alt { background-color: #f9f9f9; } @@ -205,7 +205,7 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #d54e21; } -.howto, .nonessential, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { +.howto, .nonessential, #edit-slug-box, .form-input-tip, .rss-widget span.rss-date, .subsubsub { color: #999; } diff --git a/wp-admin/css/dashboard.css b/wp-admin/css/dashboard.css index 4410fdf3db..7060ef5d6a 100644 --- a/wp-admin/css/dashboard.css +++ b/wp-admin/css/dashboard.css @@ -38,13 +38,6 @@ form .textarea-wrap textarea { box-sizing: border-box; } -form p.field-tip { - font-size: .9em; - font-style: italic; - margin: 0; - padding: 0; -} - #dashboard-widgets .postbox form .submit { float: none; margin: .5em 0 0; @@ -77,12 +70,12 @@ div.postbox div.inside { position: relative; } -.view-all { - position: absolute; - top: 0; - right: 0; - padding: 0; - margin: 0; +#dashboard-widgets a { + text-decoration: none; +} + +#dashboard-widgets h3 a { + text-decoration: underline; } #dashboard-widgets h4 { @@ -130,10 +123,6 @@ div.postbox div.inside { border-top: none; } -#dashboard_right_now a { - text-decoration: none; -} - #dashboard_right_now .b, #dashboard_right_now .b a { color: #2583ad; } @@ -199,17 +188,46 @@ div.postbox div.inside { /* Recent Comments */ +#dashboard_recent_comments h3 { + margin-bottom: 0; +} + #the-comment-list { position: relative; } #the-comment-list .comment-item { - padding: 5px 5px 5px 47px; + padding: 1em 10px 1em 70px; + border-top: 1px solid; +} + +#the-comment-list .comment-item, #the-comment-list #replyrow { + margin: 0 -10px; +} + +#the-comment-list .comment-item:first-child { + border-top: none; } #the-comment-list .comment-item .avatar { position: absolute; - left: 5px; + left: 0; +} + +#the-comment-list .comment-item h4 { + line-height: 1.4; + margin-top: -.2em; + font-weight: normal; + color: #999; +} + +#the-comment-list .comment-item h4 cite, #the-comment-list .comment-item h4 strong { + font-style: normal; + color: #333; +} + +#the-comment-list .comment-item p.comment-author { + margin: 0.2em 0; } #the-comment-list .comment-item blockquote, #the-comment-list .comment-item blockquote p { @@ -227,18 +245,73 @@ div.postbox div.inside { padding: 0; } +#the-comment-list .approve a { + color: green; +} + +#the-comment-list .unapprove a { + color: orange; +} + +#the-comment-list .delete a { + color: red; +} + /* QuickPress */ -#quick-press #add-media-button { - margin: .5em 0; -} - -#quick-press #content-label { - margin-top: 1em; -} - -#quick-press .textarea-wrap { +#dashboard_quick_press h4 { + float: left; + width: 5em; clear: both; + font-weight: normal; + font-style: italic; + font-family: Georgia, serif; + text-align: right; +} + +#dashboard_quick_press h4 label { + margin-right: 10px; +} + +#dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap { + margin: 0 0 1em 5em; +} + +#dashboard_quick_press #media-buttons { + margin: 0 0 .5em 5em; + padding: 0 0 0 2px; +} + +#dashboard-widgets #dashboard_quick_press form p.submit { + border-top: 1px solid; + padding: 1em 1em 1em 5em; + margin: 0 -10px -10px; +} + +#dashboard-widgets #dashboard_quick_press form p.submit input { + float: left; +} + +#dashboard-widgets #dashboard_quick_press form p.submit #save-post { + margin: 0 1em 0 10px; +} + +#dashboard-widgets #dashboard_quick_press form p.submit .cancel { + padding-left: 0; + padding-right: 0; + border: none; + background-color: transparent; + text-decoration: underline; + color: red; +} + +#dashboard-widgets #dashboard_quick_press form p.submit .cancel:hover { + text-decoration: none; +} + + +#dashboard-widgets #dashboard_quick_press form p.submit #publish { + float: right; } /* Recent Drafts */ @@ -248,6 +321,24 @@ div.postbox div.inside { list-style: none; } +#dashboard_recent_drafts ul li { + margin-bottom: 0.6em; +} + +#dashboard_recent_drafts h4 { + font-weight: normal; +} + +#dashboard_recent_drafts h4 abbr { + font-family: Georgia, serif; + color: #999; +} + +#dashboard_recent_drafts p { + margin: 0; + padding: 0; +} + /* Feeds */ .rss-widget ul { @@ -256,9 +347,8 @@ div.postbox div.inside { list-style: none; } -.rss-widget a.rsswidget, .rss-widget span.rss-date { - font-size: 14px; + font-family: Georgia, serif; } .rss-widget cite { diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 5568dab502..e032a2c832 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -28,7 +28,7 @@ function wp_dashboard_setup() { wp_add_dashboard_widget( 'dashboard_right_now', __( 'Right Now' ), 'wp_dashboard_right_now' ); // Recent Comments Widget - wp_add_dashboard_widget( 'dashboard_recent_comments', __( 'Recent Comments' ), 'wp_dashboard_recent_comments' ); + wp_add_dashboard_widget( 'dashboard_recent_comments', sprintf( __( 'Recent Comments View all' ), 'edit-comments.php' ), 'wp_dashboard_recent_comments' ); // Incoming Links Widget if ( !isset( $widget_options['dashboard_incoming_links'] ) || !isset( $widget_options['dashboard_incoming_links']['home'] ) || $widget_options['dashboard_incoming_links']['home'] != get_option('home') ) { @@ -51,7 +51,7 @@ function wp_dashboard_setup() { wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press' ); // Recent Drafts - wp_add_dashboard_widget( 'dashboard_recent_drafts', __( 'Recent Drafts' ), 'wp_dashboard_recent_drafts' ); + wp_add_dashboard_widget( 'dashboard_recent_drafts', sprintf( __( 'Recent Drafts View all' ), 'edit.php?post_status=draft' ), 'wp_dashboard_recent_drafts' ); // Primary feed (Dev Blog) Widget @@ -311,11 +311,11 @@ function wp_dashboard_quick_press() { -
__( 'Today' ), $yesterday => __( 'Yesterday' ) ); - - $comment_date = gmdate( get_option( 'date_format' ), strtotime( $comment->comment_date ) + get_option( 'gmt_offset' ) ); - if ( $comment_date != $date ) { - $date = $comment_date; - echo '
' . ( isset( $wordy_dates[$date] ) ? $wordy_dates[$date] : $date ) . ":
\n"; - } - } - $comment_post_url = get_edit_post_link( $comment->comment_post_ID ); $comment_post_title = get_the_title( $comment->comment_post_ID ); $comment_post_link = "$comment_post_title"; @@ -444,10 +428,10 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { $actions['approve'] = "" . __( 'Approve' ) . ''; $actions['unapprove'] = "" . __( 'Unapprove' ) . ''; $actions['edit'] = "". __('Edit') . ''; - $actions['spam'] = "" . __( 'Spam' ) . ''; - $actions['delete'] = "" . __('Delete') . ''; $actions['quickedit'] = '' . __('Quick Edit') . ''; $actions['reply'] = '' . __('Reply') . ''; + $actions['spam'] = "" . __( 'Spam' ) . ''; + $actions['delete'] = "" . __('Delete') . ''; $actions = apply_filters( 'comment_row_actions', $actions, $comment ); @@ -458,10 +442,8 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { ( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; // Reply and quickedit need a hide-if-no-js span - if ( 'reply' == $action ) + if ( 'reply' == $action || 'quickedit' == $action ) $action .= ' hide-if-no-js'; - elseif ( 'quickedit' == $action ) - $action .= ' hide-if-no-js hide-if-js'; // hah $actions_string .= "$sep$link"; } @@ -472,8 +454,8 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {' . get_comment_author_link() . '', $comment_post_link, ' ' . __( '[Awaiting Moderation]' ) . '' ); ?>
- ' . get_comment_author() . '', $comment_post_link, "$type" ); ?> +$type", $comment_post_link ); ?>
+ diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 53e299fad9..a36575a2bb 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -1655,18 +1655,18 @@ table.form-table td .updated { /*font-weight: bold;*/ } -#poststuff #media-buttons { +#media-buttons { cursor: default; padding: 8px 8px 0; } -#poststuff #media-buttons a { +#media-buttons a { cursor: pointer; padding: 0 0 5px 10px; vertical-align: middle; } -#poststuff #media-buttons img { +#media-buttons img { vertical-align: middle; } diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 8edc7acdee..e93b69e905 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -328,7 +328,7 @@ function wp_default_styles( &$styles ) { $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie' ); - $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081103' ); + $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081105' ); $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); $styles->add( 'ie', '/wp-admin/css/ie.css' ); @@ -341,7 +341,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'global', '/wp-admin/css/global.css', array(), '20081030' ); $styles->add( 'media', '/wp-admin/css/media.css', array(), '20080709' ); $styles->add( 'widgets', '/wp-admin/css/widgets.css' ); - $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081030' ); + $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081105' ); $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' ); $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' ); $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20080922' );