From 56c1b7c7ff3a7e3e699bea8529a0ede5d3884518 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Fri, 9 Nov 2012 02:06:59 +0000 Subject: [PATCH] Final HiDPI tweaks. Don't use rss-2x.png on a front-end widget. Improve selectors for favicons in the toolbar to avoid breaking existing images. Remove unnecessary RTL styles. FIXES #21019. git-svn-id: http://core.svn.wordpress.org/trunk@22481 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/wp-admin-rtl.css | 1 - wp-includes/admin-bar.php | 2 +- wp-includes/css/admin-bar-rtl.css | 11 ----------- wp-includes/css/admin-bar.css | 13 ++++++++----- wp-includes/default-widgets.php | 4 +--- 5 files changed, 10 insertions(+), 21 deletions(-) diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css index d2fc54216a..f76cc5fa37 100644 --- a/wp-admin/css/wp-admin-rtl.css +++ b/wp-admin/css/wp-admin-rtl.css @@ -521,7 +521,6 @@ form.upgrade .hint { .post-com-count { background-image: url('../images/bubble_bg-rtl.gif'); - background-repeat: no-repeat; } .column-response .post-com-count { diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index e92ba25b23..812d030e45 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -344,7 +344,7 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) { foreach ( (array) $wp_admin_bar->user->blogs as $blog ) { switch_to_blog( $blog->userblog_id ); - $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 25b15bcdba..7096a02a22 100644 --- a/wp-includes/css/admin-bar-rtl.css +++ b/wp-includes/css/admin-bar-rtl.css @@ -131,21 +131,10 @@ * My Sites */ #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 7cd43f6bd2..16db0ea8ab 100644 --- a/wp-includes/css/admin-bar.css +++ b/wp-includes/css/admin-bar.css @@ -394,17 +394,20 @@ * My Sites */ #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; } +#wpadminbar .quicklinks li div.blavatar { + background: url('../images/wpmini-blue.png') no-repeat; + height: 16px; + width: 16px; + display: inline-block; +} + @media only screen and (-webkit-min-device-pixel-ratio: 1.5) { - #wpadminbar .quicklinks li .blavatar { + #wpadminbar .quicklinks li div.blavatar { background: url('../images/wpmini-blue-2x.png') no-repeat; background-size: 16px 16px; } diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php index 3f85892832..5942f5bfd4 100644 --- a/wp-includes/default-widgets.php +++ b/wp-includes/default-widgets.php @@ -778,9 +778,7 @@ class WP_Widget_RSS extends WP_Widget { $title = apply_filters('widget_title', $title, $instance, $this->id_base); $url = esc_url(strip_tags($url)); - // 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'); + $icon = includes_url('images/rss.png'); if ( $title ) $title = "RSS $title";