diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 382d533038..493b6f8220 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -290,7 +290,6 @@ td.help { } .post-com-count { - background-image: url(../images/bubble_bg.gif); color: #fff; } @@ -1941,10 +1940,6 @@ div.widgets-sortables, border-left-color: #99d; } -.rtl .post-com-count { - background-image: url(../images/bubble_bg-rtl.gif); -} - .rtl #screen-meta-links a.show-settings { background-position: left 3px; } diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 245315eed7..f84f38fb26 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -286,7 +286,6 @@ td.help { } .post-com-count { - background-image: url(../images/bubble_bg.gif); color: #fff; } @@ -1820,10 +1819,6 @@ div.widgets-sortables, border-left-color: #99d; } -.rtl .post-com-count { - background-image: url(../images/bubble_bg-rtl.gif); -} - .rtl #screen-meta-links a.show-settings { background-position: left 3px; } diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css index 36ccddb3a9..e8c435081f 100644 --- a/wp-admin/css/wp-admin-rtl.css +++ b/wp-admin/css/wp-admin-rtl.css @@ -519,6 +519,11 @@ form.upgrade .hint { font-family: Tahoma, Arial, sans-serif; } +.post-com-count { + background-image: url('../images/bubble_bg-rtl.gif'); + background-repeat: no-repeat; +} + .column-response .post-com-count { float: right; margin-right: 0; @@ -1573,18 +1578,6 @@ table .column-rating { margin-left: 0; } -/** - * HiDPI Displays - */ -@media only screen and (-webkit-min-device-pixel-ratio: 1.5) { - - .wp-full-overlay .collapse-sidebar-arrow { - background-image: url('../images/arrows-2x.png'); - background-size: 15px 123px; - } - -} - /*------------------------------------------------------------------------------ 27.0 - Customize Loader ------------------------------------------------------------------------------*/ @@ -2143,10 +2136,10 @@ body.login { /* Star ratings */ div.star-holder { - background: url('../images/stars-rtl.png?ver=20120506.png') repeat-x bottom right; + background: url('../images/stars-rtl.png') repeat-x bottom right; } div.star-holder .star-rating { - background: url('../images/stars-rtl.png?ver=20120506.png') repeat-x top right; + background: url('../images/stars-rtl.png') repeat-x top right; float: right; } @@ -2374,6 +2367,36 @@ div.sidebar-name h3 { direction: ltr; } +/** + * HiDPI Displays + */ +@media only screen and (-webkit-min-device-pixel-ratio: 1.5) { + .post-com-count { + background-image: url('../images/bubble_bg-rtl-2x.gif'); + background-size: 18px 100px; + } + + #content-resize-handle, #post-body .wp_themeSkin .mceStatusbar a.mceResize { + background: transparent url('../images/resize-rtl-2x.gif') no-repeat scroll right bottom; + background-size: 11px 11px; + } + + .wp-full-overlay .collapse-sidebar-arrow { + background-image: url('../images/arrows-2x.png'); + background-size: 15px 123px; + } + + div.star-holder { + background: url('../images/stars-rtl-2x.png') repeat-x bottom right; + background-size: 21px 37px; + } + + div.star-holder .star-rating { + background: url('../images/stars-rtl-2x.png') repeat-x top right; + background-size: 21px 37px; + } +} + /* =Localized CSS -------------------------------------------------------------- */ diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index ad9bd64fb2..1a4dd2fed0 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -1825,6 +1825,7 @@ form.upgrade .hint { } .post-com-count { + background-image: url('../images/bubble_bg.gif'); height: 1.3em; line-height: 1.1em; display: block; @@ -1869,6 +1870,12 @@ strong .post-com-count { padding: 4px 8px; } +th .comment-grey-bubble { + background-image: url('../images/comment-grey-bubble.png'); + background-repeat: no-repeat; + height: 12px; + width: 12px; +} /*------------------------------------------------------------------------------ 8.0 - Layout Blocks @@ -7388,11 +7395,11 @@ div.star-holder { position: relative; height: 17px; width: 100px; - background: url('../images/stars.png?ver=20120307') repeat-x bottom left; + background: url('../images/stars.png') repeat-x bottom left; } div.star-holder .star-rating { - background: url('../images/stars.png?ver=20120307') repeat-x top left; + background: url('../images/stars.png') repeat-x top left; height: 17px; float: left; } @@ -8417,6 +8424,37 @@ a.widget-control-edit { background-image: url('../images/arrows-dark-2x.png'); background-size: 15px 123px; } + + .post-com-count { + background-image: url('../images/bubble_bg-2x.gif'); + background-size: 18px 100px; + } + + th .comment-grey-bubble { + background-image: url('../images/comment-grey-bubble-2x.png'); + background-size: 12px 12px; + } + + .sorting-indicator { + background-image: url('../images/sort-2x.gif'); + background-size: 14px 4px; + } + + #content-resize-handle, + #post-body .wp_themeSkin .mceStatusbar a.mceResize { + background: transparent url('../images/resize-2x.gif') no-repeat scroll right bottom; + background-size: 11px 11px; + } + + div.star-holder { + background: url('../images/stars-2x.png') repeat-x bottom left; + background-size: 21px 37px; + } + + div.star-holder .star-rating { + background: url('../images/stars-2x.png') repeat-x top left; + background-size: 21px 37px; + } } /* =Localized CSS diff --git a/wp-admin/images/bubble_bg-2x.gif b/wp-admin/images/bubble_bg-2x.gif new file mode 100644 index 0000000000..ae29abb12b Binary files /dev/null and b/wp-admin/images/bubble_bg-2x.gif differ diff --git a/wp-admin/images/bubble_bg-rtl-2x.gif b/wp-admin/images/bubble_bg-rtl-2x.gif new file mode 100644 index 0000000000..38747a0897 Binary files /dev/null and b/wp-admin/images/bubble_bg-rtl-2x.gif differ diff --git a/wp-admin/images/comment-grey-bubble-2x.png b/wp-admin/images/comment-grey-bubble-2x.png new file mode 100644 index 0000000000..fafc74dd61 Binary files /dev/null and b/wp-admin/images/comment-grey-bubble-2x.png differ diff --git a/wp-admin/images/resize-2x.gif b/wp-admin/images/resize-2x.gif new file mode 100644 index 0000000000..9682579077 Binary files /dev/null and b/wp-admin/images/resize-2x.gif differ diff --git a/wp-admin/images/resize-rtl-2x.gif b/wp-admin/images/resize-rtl-2x.gif new file mode 100644 index 0000000000..1ca2a631b7 Binary files /dev/null and b/wp-admin/images/resize-rtl-2x.gif differ diff --git a/wp-admin/images/sort-2x.gif b/wp-admin/images/sort-2x.gif new file mode 100644 index 0000000000..14bdf9d6c9 Binary files /dev/null and b/wp-admin/images/sort-2x.gif differ diff --git a/wp-admin/images/stars-2x.png b/wp-admin/images/stars-2x.png new file mode 100644 index 0000000000..a4e06f2696 Binary files /dev/null and b/wp-admin/images/stars-2x.png differ diff --git a/wp-admin/images/stars-rtl-2x.png b/wp-admin/images/stars-rtl-2x.png new file mode 100644 index 0000000000..af6ad77a23 Binary files /dev/null and b/wp-admin/images/stars-rtl-2x.png differ diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php index 9d4b8c6f88..28f9557a37 100644 --- a/wp-admin/includes/class-wp-media-list-table.php +++ b/wp-admin/includes/class-wp-media-list-table.php @@ -156,7 +156,7 @@ class WP_Media_List_Table extends WP_List_Table { if ( !$this->detached ) { $posts_columns['parent'] = _x( 'Attached to', 'column name' ); if ( post_type_supports( 'attachment', 'comments' ) ) - $posts_columns['comments'] = '' . esc_attr__( 'Comments' ) . ''; + $posts_columns['comments'] = '
'; } /* translators: column name */ $posts_columns['date'] = _x( 'Date', 'column name' ); diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index 5ee7617b55..c772fa63c9 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-posts-list-table.php @@ -280,7 +280,7 @@ class WP_Posts_List_Table extends WP_List_Table { $post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all'; if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) ) - $posts_columns['comments'] = '' . esc_attr__( 'Comments' ) . ''; + $posts_columns['comments'] = '
'; $posts_columns['date'] = __( 'Date' ); diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index d7ba49d3c6..e92ba25b23 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -341,12 +341,10 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { ), ) ); - $blue_wp_logo_url = includes_url('images/wpmini-blue.png'); - foreach ( (array) $wp_admin_bar->user->blogs as $blog ) { switch_to_blog( $blog->userblog_id ); - $blavatar = '' . esc_attr__( 'Blavatar' ) . ''; + $blavatar = '
'; $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname; $menu_id = 'blog-' . $blog->userblog_id; diff --git a/wp-includes/css/admin-bar-rtl.css b/wp-includes/css/admin-bar-rtl.css index 328bfcf324..25b15bcdba 100644 --- a/wp-includes/css/admin-bar-rtl.css +++ b/wp-includes/css/admin-bar-rtl.css @@ -130,11 +130,22 @@ /* * My Sites */ -#wpadminbar .quicklinks li img.blavatar { +#wpadminbar .quicklinks li .blavatar { + background: url('../images/wpmini-blue.png') no-repeat; + height: 16px; + width: 16px; + display: inline-block; margin-right: 0px; margin-left: 4px; } +@media only screen and (-webkit-min-device-pixel-ratio: 1.5) { + #wpadminbar .quicklinks li .blavatar { + background: url('../images/wpmini-blue-2x.png') no-repeat; + background-size: 16px 16px; + } +} + /* * Search */ diff --git a/wp-includes/css/admin-bar.css b/wp-includes/css/admin-bar.css index c54d1db34f..7cd43f6bd2 100644 --- a/wp-includes/css/admin-bar.css +++ b/wp-includes/css/admin-bar.css @@ -393,12 +393,23 @@ /* * My Sites */ -#wpadminbar .quicklinks li img.blavatar { +#wpadminbar .quicklinks li .blavatar { + background: url('../images/wpmini-blue.png') no-repeat; + height: 16px; + width: 16px; + display: inline-block; vertical-align: middle; margin: -3px 4px 0 0; padding: 0; } +@media only screen and (-webkit-min-device-pixel-ratio: 1.5) { + #wpadminbar .quicklinks li .blavatar { + background: url('../images/wpmini-blue-2x.png') no-repeat; + background-size: 16px 16px; + } +} + /** * Search */ diff --git a/wp-includes/css/editor.css b/wp-includes/css/editor.css index ba9579ed43..a7773bf9e3 100644 --- a/wp-includes/css/editor.css +++ b/wp-includes/css/editor.css @@ -2072,5 +2072,26 @@ RTL background-image: url('../../wp-admin/images/media-button-2x.png'); background-size: 16px 16px; } + + .wp_themeSkin .mceListBox .mceOpen, + .wp_themeSkin .mceListBoxHover .mceOpen, + .wp_themeSkin .mceListBoxSelected .mceOpen, + .wp_themeSkin table.mceListBoxEnabled .mceOpen { + background-image: url('../images/down_arrow-2x.gif'); + background-size: 10px 20px; + } + + .wp_themeSkin .mceSplitButtonEnabled a.mceOpen, + .wp_themeSkin .mceSplitButtonSelected a.mceOpen, + .wp_themeSkin .mceSplitButtonActive a.mceOpen, + .wp_themeSkin .mceSplitButtonEnabled:hover a.mceOpen { + background-image: url('../images/down_arrow-2x.gif'); + background-size: 10px 20px; + } + + #wp-link .toggle-arrow { + background: transparent url('../images/toggle-arrow-2x.png') top left no-repeat; + background-size: 19px 69px; + } } diff --git a/wp-includes/css/wp-pointer.css b/wp-includes/css/wp-pointer.css index af566c844a..3f775c1a71 100644 --- a/wp-includes/css/wp-pointer.css +++ b/wp-includes/css/wp-pointer.css @@ -200,4 +200,9 @@ background-image: url('../images/icon-pointer-flag-2x.png'); background-size: 36px auto; } + + .wp-pointer-arrow { + background: url('../images/arrow-pointer-blue-2x.png') 0 0 no-repeat; + background-size: 30px 60px; + } } diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php index 5942f5bfd4..3f85892832 100644 --- a/wp-includes/default-widgets.php +++ b/wp-includes/default-widgets.php @@ -778,7 +778,9 @@ class WP_Widget_RSS extends WP_Widget { $title = apply_filters('widget_title', $title, $instance, $this->id_base); $url = esc_url(strip_tags($url)); - $icon = includes_url('images/rss.png'); + // Didn't want to have to add additional theme CSS for retina version of rss.png + // Forcing 2x here looks fine on non-retina devices + $icon = includes_url('images/rss-2x.png'); if ( $title ) $title = "RSS $title"; diff --git a/wp-includes/images/arrow-pointer-blue-2x.png b/wp-includes/images/arrow-pointer-blue-2x.png new file mode 100644 index 0000000000..0d571482fd Binary files /dev/null and b/wp-includes/images/arrow-pointer-blue-2x.png differ diff --git a/wp-includes/images/down_arrow-2x.gif b/wp-includes/images/down_arrow-2x.gif new file mode 100644 index 0000000000..940bfe5bf0 Binary files /dev/null and b/wp-includes/images/down_arrow-2x.gif differ diff --git a/wp-includes/images/rss-2x.png b/wp-includes/images/rss-2x.png new file mode 100644 index 0000000000..7b525cf131 Binary files /dev/null and b/wp-includes/images/rss-2x.png differ diff --git a/wp-includes/images/toggle-arrow-2x.png b/wp-includes/images/toggle-arrow-2x.png new file mode 100644 index 0000000000..a282075b06 Binary files /dev/null and b/wp-includes/images/toggle-arrow-2x.png differ diff --git a/wp-includes/images/wpmini-blue-2x.png b/wp-includes/images/wpmini-blue-2x.png new file mode 100644 index 0000000000..3bfb20a06d Binary files /dev/null and b/wp-includes/images/wpmini-blue-2x.png differ