Ticket #21019: 21019.3.diff

File 21019.3.diff, 16.9 KB (added by lessbloat, 6 months ago)
Line 
1Index: wp-includes/admin-bar.php
2===================================================================
3--- wp-includes/admin-bar.php   (revision 22417)
4+++ wp-includes/admin-bar.php   (working copy)
5@@ -341,12 +341,10 @@
6                ),
7        ) );
8 
9-       $blue_wp_logo_url = includes_url('images/wpmini-blue.png');
10-
11        foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
12                switch_to_blog( $blog->userblog_id );
13 
14-               $blavatar = '<img src="' . esc_url($blue_wp_logo_url) . '" alt="' . esc_attr__( 'Blavatar' ) . '" width="16" height="16" class="blavatar"/>';
15+               $blavatar = '<div title="' . esc_attr__( 'Blavatar' ) . '" class="blavatar"></div>';
16 
17                $blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
18                $menu_id  = 'blog-' . $blog->userblog_id;
19Index: wp-includes/default-widgets.php
20===================================================================
21--- wp-includes/default-widgets.php     (revision 22417)
22+++ wp-includes/default-widgets.php     (working copy)
23@@ -778,7 +778,9 @@
24 
25                $title = apply_filters('widget_title', $title, $instance, $this->id_base);
26                $url = esc_url(strip_tags($url));
27-               $icon = includes_url('images/rss.png');
28+               // Didn't want to have to add additional theme CSS for retina version of rss.png
29+               // Forcing 2x here looks fine on non-retina devices
30+               $icon = includes_url('images/rss-2x.png');
31                if ( $title )
32                        $title = "<a class='rsswidget' href='$url' title='" . esc_attr__( 'Syndicate this content' ) ."'><img style='border:0' width='14' height='14' src='$icon' alt='RSS' /></a> <a class='rsswidget' href='$link' title='$desc'>$title</a>";
33 
34Index: wp-includes/images/rss-2x.png
35===================================================================
36Cannot display: file marked as a binary type.
37svn:mime-type = application/octet-stream
38
39Property changes on: wp-includes/images/rss-2x.png
40___________________________________________________________________
41Added: svn:mime-type
42   + application/octet-stream
43
44Index: wp-includes/images/toggle-arrow-2x.png
45===================================================================
46Cannot display: file marked as a binary type.
47svn:mime-type = application/octet-stream
48
49Property changes on: wp-includes/images/toggle-arrow-2x.png
50___________________________________________________________________
51Added: svn:mime-type
52   + application/octet-stream
53
54Index: wp-includes/images/wpmini-blue-2x.png
55===================================================================
56Cannot display: file marked as a binary type.
57svn:mime-type = application/octet-stream
58
59Property changes on: wp-includes/images/wpmini-blue-2x.png
60___________________________________________________________________
61Added: svn:mime-type
62   + application/octet-stream
63
64Index: wp-includes/images/arrow-pointer-blue-2x.png
65===================================================================
66Cannot display: file marked as a binary type.
67svn:mime-type = application/octet-stream
68
69Property changes on: wp-includes/images/arrow-pointer-blue-2x.png
70___________________________________________________________________
71Added: svn:mime-type
72   + application/octet-stream
73
74Index: wp-includes/images/down_arrow-2x.gif
75===================================================================
76Cannot display: file marked as a binary type.
77svn:mime-type = application/octet-stream
78
79Property changes on: wp-includes/images/down_arrow-2x.gif
80___________________________________________________________________
81Added: svn:mime-type
82   + application/octet-stream
83
84Index: wp-includes/css/admin-bar-rtl.css
85===================================================================
86--- wp-includes/css/admin-bar-rtl.css   (revision 22417)
87+++ wp-includes/css/admin-bar-rtl.css   (working copy)
88@@ -127,14 +127,27 @@
89        margin-right: 4px
90 }
91 
92+
93+
94 /*
95  * My Sites
96  */
97-#wpadminbar .quicklinks li img.blavatar {
98+#wpadminbar .quicklinks li .blavatar {
99+       background: url(../images/wpmini-blue.png) no-repeat;
100+       height: 16px;
101+       width: 16px;
102+       display: inline-block;
103        margin-right: 0px;
104        margin-left: 4px;
105 }
106 
107+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
108+       #wpadminbar .quicklinks li .blavatar {
109+               background: url(../images/wpmini-blue-2x.png) no-repeat;
110+               background-size: 16px 16px;
111+       }
112+}
113+
114 /*
115  * Search
116  */
117Index: wp-includes/css/admin-bar.css
118===================================================================
119--- wp-includes/css/admin-bar.css       (revision 22417)
120+++ wp-includes/css/admin-bar.css       (working copy)
121@@ -393,12 +393,23 @@
122 /*
123  * My Sites
124  */
125-#wpadminbar .quicklinks li img.blavatar {
126+#wpadminbar .quicklinks li .blavatar {
127+       background: url(../images/wpmini-blue.png) no-repeat;
128+       height: 16px;
129+       width: 16px;
130+       display: inline-block;
131        vertical-align: middle;
132        margin: -3px 4px 0 0;
133        padding: 0;
134 }
135 
136+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
137+       #wpadminbar .quicklinks li .blavatar {
138+               background: url(../images/wpmini-blue-2x.png) no-repeat;
139+               background-size: 16px 16px;
140+       }
141+}
142+
143 /**
144  * Search
145  */
146Index: wp-includes/css/wp-pointer.css
147===================================================================
148--- wp-includes/css/wp-pointer.css      (revision 22417)
149+++ wp-includes/css/wp-pointer.css      (working copy)
150@@ -94,6 +94,13 @@
151        background:url('../images/arrow-pointer-blue.png') 0 0 no-repeat;
152 }
153 
154+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
155+       .wp-pointer-arrow {
156+               background: url('../images/arrow-pointer-blue-2x.png') 0 0 no-repeat;
157+               background-size: 30px 60px;
158+       }
159+}
160+
161 .wp-pointer-arrow-inner {
162        z-index: 20;
163 }
164Index: wp-includes/css/editor.css
165===================================================================
166--- wp-includes/css/editor.css  (revision 22417)
167+++ wp-includes/css/editor.css  (working copy)
168@@ -265,6 +265,16 @@
169        background-repeat: no-repeat;
170 }
171 
172+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
173+       .wp_themeSkin .mceListBox .mceOpen,
174+       .wp_themeSkin .mceListBoxHover .mceOpen,
175+       .wp_themeSkin .mceListBoxSelected .mceOpen,
176+       .wp_themeSkin table.mceListBoxEnabled .mceOpen {
177+               background-image: url("../images/down_arrow-2x.gif");
178+               background-size: 10px 20px;
179+       }
180+}
181+
182 .wp_themeSkin .mceListBoxDisabled .mceText {
183        color: gray;
184 }
185@@ -924,6 +934,16 @@
186        border-left: 0;
187 }
188 
189+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
190+       .wp_themeSkin .mceSplitButtonEnabled a.mceOpen,
191+       .wp_themeSkin .mceSplitButtonSelected a.mceOpen,
192+       .wp_themeSkin .mceSplitButtonActive a.mceOpen,
193+       .wp_themeSkin .mceSplitButtonEnabled:hover a.mceOpen {
194+               background-image: url("../images/down_arrow-2x.gif");
195+               background-size: 10px 20px;
196+       }
197+}
198+
199 .wp_themeSkin .mceSplitButtonActive td {
200        -webkit-border-radius: 3px;
201        border-radius: 3px;
202@@ -1213,6 +1233,13 @@
203        line-height: 23px;
204 }
205 
206+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
207+       #wp-link .toggle-arrow {
208+               background: transparent url( '../images/toggle-arrow-2x.png' ) top left no-repeat;
209+               background-size: 19px 69px;
210+       }
211+}
212+
213 #wp-link .toggle-arrow-active {
214        background-position: center left;
215 }
216Index: wp-admin/includes/class-wp-posts-list-table.php
217===================================================================
218--- wp-admin/includes/class-wp-posts-list-table.php     (revision 22417)
219+++ wp-admin/includes/class-wp-posts-list-table.php     (working copy)
220@@ -280,7 +280,7 @@
221 
222                $post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
223                if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
224-                       $posts_columns['comments'] = '<span class="vers"><img alt="' . esc_attr__( 'Comments' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></span>';
225+                       $posts_columns['comments'] = '<span class="vers"><div title="' . esc_attr__( 'Comments' ) . '" class="comment-grey-bubble"></div></span>';
226 
227                $posts_columns['date'] = __( 'Date' );
228 
229Index: wp-admin/includes/class-wp-media-list-table.php
230===================================================================
231--- wp-admin/includes/class-wp-media-list-table.php     (revision 22417)
232+++ wp-admin/includes/class-wp-media-list-table.php     (working copy)
233@@ -156,7 +156,7 @@
234                if ( !$this->detached ) {
235                        $posts_columns['parent'] = _x( 'Attached to', 'column name' );
236                        if ( post_type_supports( 'attachment', 'comments' ) )
237-                               $posts_columns['comments'] = '<span class="vers"><img alt="' . esc_attr__( 'Comments' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></span>';
238+                               $posts_columns['comments'] = '<span class="vers"><div title="' . esc_attr__( 'Comments' ) . '" class="comment-grey-bubble"></div></span>';
239                }
240                /* translators: column name */
241                $posts_columns['date'] = _x( 'Date', 'column name' );
242Index: wp-admin/images/resize-rtl-2x.gif
243===================================================================
244Cannot display: file marked as a binary type.
245svn:mime-type = application/octet-stream
246
247Property changes on: wp-admin/images/resize-rtl-2x.gif
248___________________________________________________________________
249Added: svn:mime-type
250   + application/octet-stream
251
252Index: wp-admin/images/resize-2x.gif
253===================================================================
254Cannot display: file marked as a binary type.
255svn:mime-type = application/octet-stream
256
257Property changes on: wp-admin/images/resize-2x.gif
258___________________________________________________________________
259Added: svn:mime-type
260   + application/octet-stream
261
262Index: wp-admin/images/comment-grey-bubble-2x.png
263===================================================================
264Cannot display: file marked as a binary type.
265svn:mime-type = application/octet-stream
266
267Property changes on: wp-admin/images/comment-grey-bubble-2x.png
268___________________________________________________________________
269Added: svn:mime-type
270   + application/octet-stream
271
272Index: wp-admin/images/sort-2x.gif
273===================================================================
274Cannot display: file marked as a binary type.
275svn:mime-type = application/octet-stream
276
277Property changes on: wp-admin/images/sort-2x.gif
278___________________________________________________________________
279Added: svn:mime-type
280   + application/octet-stream
281
282Index: wp-admin/images/stars-rtl-2x.png
283===================================================================
284Cannot display: file marked as a binary type.
285svn:mime-type = application/octet-stream
286
287Property changes on: wp-admin/images/stars-rtl-2x.png
288___________________________________________________________________
289Added: svn:mime-type
290   + application/octet-stream
291
292Index: wp-admin/images/stars-2x.png
293===================================================================
294Cannot display: file marked as a binary type.
295svn:mime-type = application/octet-stream
296
297Property changes on: wp-admin/images/stars-2x.png
298___________________________________________________________________
299Added: svn:mime-type
300   + application/octet-stream
301
302Index: wp-admin/images/bubble_bg-rtl-2x.gif
303===================================================================
304Cannot display: file marked as a binary type.
305svn:mime-type = application/octet-stream
306
307Property changes on: wp-admin/images/bubble_bg-rtl-2x.gif
308___________________________________________________________________
309Added: svn:mime-type
310   + application/octet-stream
311
312Index: wp-admin/images/bubble_bg-2x.gif
313===================================================================
314Cannot display: file marked as a binary type.
315svn:mime-type = application/octet-stream
316
317Property changes on: wp-admin/images/bubble_bg-2x.gif
318___________________________________________________________________
319Added: svn:mime-type
320   + application/octet-stream
321
322Index: wp-admin/css/colors-fresh.css
323===================================================================
324--- wp-admin/css/colors-fresh.css       (revision 22417)
325+++ wp-admin/css/colors-fresh.css       (working copy)
326@@ -286,7 +286,6 @@
327 }
328 
329 .post-com-count {
330-       background-image: url(../images/bubble_bg.gif);
331        color: #fff;
332 }
333 
334@@ -1820,10 +1819,6 @@
335        border-left-color: #99d;
336 }
337 
338-.rtl .post-com-count {
339-       background-image: url(../images/bubble_bg-rtl.gif);
340-}
341-
342 .rtl #screen-meta-links a.show-settings {
343        background-position: left 3px;
344 }
345Index: wp-admin/css/wp-admin-rtl.css
346===================================================================
347--- wp-admin/css/wp-admin-rtl.css       (revision 22417)
348+++ wp-admin/css/wp-admin-rtl.css       (working copy)
349@@ -519,6 +519,18 @@
350        font-family: Tahoma, Arial, sans-serif;
351 }
352 
353+.post-com-count {
354+       background-image: url(../images/bubble_bg-rtl.gif);
355+       background-repeat: no-repeat;
356+}
357+
358+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
359+       .post-com-count {
360+               background-image: url(../images/bubble_bg-rtl-2x.gif);
361+               background-size: 18px 100px;
362+       }
363+}
364+
365 .column-response .post-com-count {
366        float: right;
367        margin-right: 0;
368@@ -858,6 +870,13 @@
369        cursor: sw-resize;
370 }
371 
372+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
373+       #content-resize-handle, #post-body .wp_themeSkin .mceStatusbar a.mceResize {
374+               background: transparent url(../images/resize-rtl-2x.gif) no-repeat scroll right bottom;
375+               background-size: 11px 11px;
376+       }
377+}
378+
379 .curtime #timestamp {
380        background-position: right top;
381        padding-left: 0;
382@@ -2143,13 +2162,24 @@
383 
384 /* Star ratings */
385 div.star-holder {
386-       background: url('../images/stars-rtl.png?ver=20120506.png') repeat-x bottom right;
387+       background: url('../images/stars-rtl.png') repeat-x bottom right;
388 }
389 div.star-holder .star-rating {
390-       background: url('../images/stars-rtl.png?ver=20120506.png') repeat-x top right;
391+       background: url('../images/stars-rtl.png') repeat-x top right;
392        float: right;
393 }
394 
395+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
396+       div.star-holder {
397+               background: url('../images/stars-rtl-2x.png') repeat-x bottom right;
398+               background-size: 21px 37px;
399+       }
400+       div.star-holder .star-rating {
401+               background: url('../images/stars-rtl-2x.png') repeat-x top right;
402+               background-size: 21px 37px;
403+       }
404+}
405+
406 #plugin-information ul#sidemenu {
407        left: auto;
408        right: 0;
409Index: wp-admin/css/wp-admin.css
410===================================================================
411--- wp-admin/css/wp-admin.css   (revision 22417)
412+++ wp-admin/css/wp-admin.css   (working copy)
413@@ -1821,6 +1821,7 @@
414 }
415 
416 .post-com-count {
417+       background-image: url(../images/bubble_bg.gif);
418        height: 1.3em;
419        line-height: 1.1em;
420        display: block;
421@@ -1831,6 +1832,13 @@
422        background-repeat: no-repeat;
423 }
424 
425+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
426+       .post-com-count {
427+               background-image: url(../images/bubble_bg-2x.gif);
428+               background-size: 18px 100px;
429+       }
430+}
431+
432 .post-com-count span {
433        font-size: 11px;
434        font-weight: bold;
435@@ -1865,7 +1873,20 @@
436        padding: 4px 8px;
437 }
438 
439+th .comment-grey-bubble {
440+       background-image: url(../images/comment-grey-bubble.png);
441+       background-repeat: no-repeat;
442+       height: 12px;
443+       width: 12px;
444+}
445 
446+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
447+       th .comment-grey-bubble {
448+               background-image: url(../images/comment-grey-bubble-2x.png);
449+               background-size: 12px 12px;
450+       }
451+}
452+
453 /*------------------------------------------------------------------------------
454   8.0 - Layout Blocks
455 ------------------------------------------------------------------------------*/
456@@ -2556,6 +2577,13 @@
457        background-repeat: no-repeat;
458 }
459 
460+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
461+       .sorting-indicator {
462+               background-image: url(../images/sort-2x.gif);
463+               background-size: 14px 4px;
464+       }
465+}
466+
467 .fixed .column-comments .sorting-indicator {
468        margin-top: 3px;
469 }
470@@ -3311,6 +3339,13 @@
471        height: 19px;
472 }
473 
474+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
475+       #content-resize-handle, #post-body .wp_themeSkin .mceStatusbar a.mceResize {
476+               background: transparent url(../images/resize-2x.gif) no-repeat scroll right bottom;
477+               background-size: 11px 11px;
478+       }
479+}
480+
481 .press-this #content-resize-handle {
482        bottom: 2px;
483 }
484@@ -7384,15 +7419,26 @@
485        position: relative;
486        height: 17px;
487        width: 100px;
488-       background: url('../images/stars.png?ver=20120307') repeat-x bottom left;
489+       background: url('../images/stars.png') repeat-x bottom left;
490 }
491 
492 div.star-holder .star-rating {
493-       background: url('../images/stars.png?ver=20120307') repeat-x top left;
494+       background: url('../images/stars.png') repeat-x top left;
495        height: 17px;
496        float: left;
497 }
498 
499+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
500+       div.star-holder {
501+               background: url('../images/stars-2x.png') repeat-x bottom left;
502+               background-size: 21px 37px;
503+       }
504+       div.star-holder .star-rating {
505+               background: url('../images/stars-2x.png') repeat-x top left;
506+               background-size: 21px 37px;
507+       }
508+}
509+
510 div.action-links {
511        font-weight: normal;
512        margin: 6px 0 0;
513Index: wp-admin/css/colors-classic.css
514===================================================================
515--- wp-admin/css/colors-classic.css     (revision 22417)
516+++ wp-admin/css/colors-classic.css     (working copy)
517@@ -290,7 +290,6 @@
518 }
519 
520 .post-com-count {
521-       background-image: url(../images/bubble_bg.gif);
522        color: #fff;
523 }
524 
525@@ -1941,10 +1940,6 @@
526        border-left-color: #99d;
527 }
528 
529-.rtl .post-com-count {
530-       background-image: url(../images/bubble_bg-rtl.gif);
531-}
532-
533 .rtl #screen-meta-links a.show-settings {
534        background-position: left 3px;
535 }