Permalink
Browse files

Consolidated patch for retina support, props taylorde, props empireof…

…light, fixes #21019

git-svn-id: http://core.svn.wordpress.org/trunk@22031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 0b6cf76 commit b28a6c066d6afa3a42eaa954d3be660a5dd8d7b7 Andrew Ozz committed Sep 27, 2012
View
192 wp-admin/css/colors-classic.css
@@ -1571,70 +1571,6 @@ div.wp-menu-image {
background-position: -659px -5px;
}
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
- .icon32.icon-post,
- #icon-edit,
- #icon-post,
- .icon32.icon-dashboard,
- #icon-index,
- .icon32.icon-media,
- #icon-upload,
- .icon32.icon-links,
- #icon-link-manager,
- #icon-link,
- #icon-link-category,
- .icon32.icon-page,
- #icon-edit-pages,
- #icon-page,
- .icon32.icon-comments,
- #icon-edit-comments,
- .icon32.icon-appearance,
- #icon-themes,
- .icon32.icon-plugins,
- #icon-plugins,
- .icon32.icon-users,
- #icon-users,
- #icon-profile,
- #icon-user-edit,
- .icon32.icon-tools,
- #icon-tools,
- #icon-admin,
- .icon32.icon-settings,
- #icon-options-general,
- .icon32.icon-site,
- #icon-ms-admin {
- background-image: url(../images/icons32-vs-2x.png?ver=20120412);
- background-size: 708px 45px;
- }
-
- .icon16.icon-dashboard,
- .menu-icon-dashboard div.wp-menu-image,
- .icon16.icon-post,
- .menu-icon-post div.wp-menu-image,
- .icon16.icon-media,
- .menu-icon-media div.wp-menu-image,
- .icon16.icon-links,
- .menu-icon-links div.wp-menu-image,
- .icon16.icon-page,
- .menu-icon-page div.wp-menu-image,
- .icon16.icon-comments,
- .menu-icon-comments div.wp-menu-image,
- .icon16.icon-appearance,
- .menu-icon-appearance div.wp-menu-image,
- .icon16.icon-plugins,
- .menu-icon-plugins div.wp-menu-image,
- .icon16.icon-users,
- .menu-icon-users div.wp-menu-image,
- .icon16.icon-tools,
- .menu-icon-tools div.wp-menu-image,
- .icon16.icon-settings,
- .menu-icon-settings div.wp-menu-image,
- .icon16.icon-site,
- .menu-icon-site div.wp-menu-image {
- background-image: url('../images/menu-vs-2x.png?ver=20120412');
- background-size: 390px 64px;
- }
-}
/* end screen icons */
/* Diff */
@@ -1902,14 +1838,6 @@ body.press-this ul.category-tabs li.tabs a {
background-position: -60px 0;
}
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
- .view-switch #view-switch-list,
- .view-switch #view-switch-excerpt {
- background-image: url('../images/list-2x.png');
- background-size: 80px 20px;
- }
-}
-
#header-logo {
background: transparent url(../images/wp-logo-vs.png?ver=20101102) no-repeat scroll center center;
}
@@ -2313,3 +2241,123 @@ div.widgets-sortables,
.rtl .sidebar-name:hover .sidebar-name-arrow {
background: transparent url(../images/arrows-dark-vs.png) no-repeat 5px 9px;
}
+
+/**
+ * HiDPI Displays
+ */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+
+ .curtime #timestamp {
+ background-image: url("../images/date-button-2x.gif?ver=20120916");
+ background-size: 16px auto;
+ }
+
+ .tagchecklist span a,
+ #bulk-titles div a,
+ .tagchecklist span a:hover,
+ #bulk-titles div a:hover {
+ background-image: url("../images/xit-2x.gif?ver=20120916");
+ background-size: 20px auto;
+ }
+
+ #screen-meta-links a.show-settings,
+ #screen-meta-links a.show-settings.screen-meta-active,
+ #adminmenu .wp-has-submenu:hover .wp-menu-toggle,
+ #adminmenu .wp-menu-open .wp-menu-toggle,
+ #collapse-button div,
+ .meta-box-sortables .postbox:hover .handlediv,
+ .sidebar-name-arrow,
+ .rtl #adminmenu .wp-has-submenu:hover .wp-menu-toggle,
+ .rtl #adminmenu .wp-menu-open .wp-menu-toggle,
+ .rtl .meta-box-sortables .postbox:hover .handlediv,
+ .rtl .sidebar-name-arrow {
+
+ background-image: url("../images/arrows-vs-2x.png?ver=20120916");
+ background-size: 15px 123px;
+ }
+
+ #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
+ #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle,
+ .sidebar-name:hover .sidebar-name-arrow,
+ .rtl #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
+ .rtl #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle,
+ .rtl .sidebar-name:hover .sidebar-name-arrow {
+ background-image: url("../images/arrows-dark-vs-2x.png?ver=20120916");
+ background-size: 15px 123px;
+ }
+
+ .view-switch #view-switch-list,
+ .view-switch #view-switch-excerpt {
+ background-image: url("../images/list-2x.png?ver=20120916");
+ background-size: 80px 20px;
+ }
+
+ .icon32.icon-post,
+ #icon-edit,
+ #icon-post,
+ .icon32.icon-dashboard,
+ #icon-index,
+ .icon32.icon-media,
+ #icon-upload,
+ .icon32.icon-links,
+ #icon-link-manager,
+ #icon-link,
+ #icon-link-category,
+ .icon32.icon-page,
+ #icon-edit-pages,
+ #icon-page,
+ .icon32.icon-comments,
+ #icon-edit-comments,
+ .icon32.icon-appearance,
+ #icon-themes,
+ .icon32.icon-plugins,
+ #icon-plugins,
+ .icon32.icon-users,
+ #icon-users,
+ #icon-profile,
+ #icon-user-edit,
+ .icon32.icon-tools,
+ #icon-tools,
+ #icon-admin,
+ .icon32.icon-settings,
+ #icon-options-general,
+ .icon32.icon-site,
+ #icon-ms-admin {
+ background-image: url("../images/icons32-vs-2x.png?ver=20120916");
+ background-size: 708px 45px;
+ }
+
+ .icon16.icon-dashboard,
+ .menu-icon-dashboard div.wp-menu-image,
+ .icon16.icon-post,
+ .menu-icon-post div.wp-menu-image,
+ .icon16.icon-media,
+ .menu-icon-media div.wp-menu-image,
+ .icon16.icon-links,
+ .menu-icon-links div.wp-menu-image,
+ .icon16.icon-page,
+ .menu-icon-page div.wp-menu-image,
+ .icon16.icon-comments,
+ .menu-icon-comments div.wp-menu-image,
+ .icon16.icon-appearance,
+ .menu-icon-appearance div.wp-menu-image,
+ .icon16.icon-plugins,
+ .menu-icon-plugins div.wp-menu-image,
+ .icon16.icon-users,
+ .menu-icon-users div.wp-menu-image,
+ .icon16.icon-tools,
+ .menu-icon-tools div.wp-menu-image,
+ .icon16.icon-settings,
+ .menu-icon-settings div.wp-menu-image,
+ .icon16.icon-site,
+ .menu-icon-site div.wp-menu-image {
+ background-image: url("../images/menu-2x.png?ver=20120916"); // @todo needs menu-vs-2x.png
+ background-size: 390px 64px;
+ }
+
+ #header-logo {
+ background-image: url("../images/wp-logo-vs-2x.png?ver=20120916");
+ background-size: 16px auto;
+ }
+
+}
View
191 wp-admin/css/colors-fresh.css
@@ -1531,70 +1531,6 @@ div.wp-menu-image {
background-position: -659px -5px;
}
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
- .icon32.icon-post,
- #icon-edit,
- #icon-post,
- .icon32.icon-dashboard,
- #icon-index,
- .icon32.icon-media,
- #icon-upload,
- .icon32.icon-links,
- #icon-link-manager,
- #icon-link,
- #icon-link-category,
- .icon32.icon-page,
- #icon-edit-pages,
- #icon-page,
- .icon32.icon-comments,
- #icon-edit-comments,
- .icon32.icon-appearance,
- #icon-themes,
- .icon32.icon-plugins,
- #icon-plugins,
- .icon32.icon-users,
- #icon-users,
- #icon-profile,
- #icon-user-edit,
- .icon32.icon-tools,
- #icon-tools,
- #icon-admin,
- .icon32.icon-settings,
- #icon-options-general,
- .icon32.icon-site,
- #icon-ms-admin {
- background-image: url(../images/icons32-2x.png?ver=20120412);
- background-size: 708px 45px;
- }
-
- .icon16.icon-dashboard,
- .menu-icon-dashboard div.wp-menu-image,
- .icon16.icon-post,
- .menu-icon-post div.wp-menu-image,
- .icon16.icon-media,
- .menu-icon-media div.wp-menu-image,
- .icon16.icon-links,
- .menu-icon-links div.wp-menu-image,
- .icon16.icon-page,
- .menu-icon-page div.wp-menu-image,
- .icon16.icon-comments,
- .menu-icon-comments div.wp-menu-image,
- .icon16.icon-appearance,
- .menu-icon-appearance div.wp-menu-image,
- .icon16.icon-plugins,
- .menu-icon-plugins div.wp-menu-image,
- .icon16.icon-users,
- .menu-icon-users div.wp-menu-image,
- .icon16.icon-tools,
- .menu-icon-tools div.wp-menu-image,
- .icon16.icon-settings,
- .menu-icon-settings div.wp-menu-image,
- .icon16.icon-site,
- .menu-icon-site div.wp-menu-image {
- background-image: url('../images/menu-2x.png?ver=20120412');
- background-size: 390px 64px;
- }
-}
/* end screen icons */
/* Diff */
@@ -1798,14 +1734,6 @@ body.press-this ul.category-tabs li.tabs a {
background-position: -60px 0;
}
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
- .view-switch #view-switch-list,
- .view-switch #view-switch-excerpt {
- background-image: url('../images/list-2x.png');
- background-size: 80px 20px;
- }
-}
-
#header-logo {
background: transparent url(../images/wp-logo.png?ver=20110504) no-repeat scroll center center;
}
@@ -2191,3 +2119,122 @@ div.widgets-sortables,
.rtl .sidebar-name:hover .sidebar-name-arrow {
background: transparent url(../images/arrows-dark.png) no-repeat 5px 9px;
}
+
+/**
+ * HiDPI Displays
+ */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+
+ .curtime #timestamp {
+ background-image: url("../images/date-button-2x.gif?ver=20120916");
+ background-size: 16px auto;
+ }
+
+ .tagchecklist span a,
+ #bulk-titles div a,
+ .tagchecklist span a:hover,
+ #bulk-titles div a:hover {
+ background-image: url("../images/xit-2x.gif?ver=20120916");
+ background-size: 20px auto;
+ }
+
+ #screen-meta-links a.show-settings,
+ #screen-meta-links a.show-settings.screen-meta-active,
+ #adminmenu .wp-has-submenu:hover .wp-menu-toggle,
+ #adminmenu .wp-menu-open .wp-menu-toggle,
+ #collapse-button div,
+ .meta-box-sortables .postbox:hover .handlediv,
+ .sidebar-name-arrow,
+ .rtl #adminmenu .wp-has-submenu:hover .wp-menu-toggle,
+ .rtl #adminmenu .wp-menu-open .wp-menu-toggle,
+ .rtl .meta-box-sortables .postbox:hover .handlediv,
+ .rtl .sidebar-name-arrow {
+ background-image: url("../images/arrows-2x.png?ver=20120916");
+ background-size: 15px 123px;
+ }
+
+ #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
+ #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle,
+ .sidebar-name:hover .sidebar-name-arrow,
+ .rtl #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle,
+ .rtl #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle,
+ .rtl .sidebar-name:hover .sidebar-name-arrow {
+ background-image: url("../images/arrows-dark-2x.png?ver=20120916");
+ background-size: 15px 123px;
+ }
+
+ .view-switch #view-switch-list,
+ .view-switch #view-switch-excerpt {
+ background-image: url("../images/list-2x.png?ver=20120916");
+ background-size: 80px 20px;
+ }
+
+ .icon32.icon-post,
+ #icon-edit,
+ #icon-post,
+ .icon32.icon-dashboard,
+ #icon-index,
+ .icon32.icon-media,
+ #icon-upload,
+ .icon32.icon-links,
+ #icon-link-manager,
+ #icon-link,
+ #icon-link-category,
+ .icon32.icon-page,
+ #icon-edit-pages,
+ #icon-page,
+ .icon32.icon-comments,
+ #icon-edit-comments,
+ .icon32.icon-appearance,
+ #icon-themes,
+ .icon32.icon-plugins,
+ #icon-plugins,
+ .icon32.icon-users,
+ #icon-users,
+ #icon-profile,
+ #icon-user-edit,
+ .icon32.icon-tools,
+ #icon-tools,
+ #icon-admin,
+ .icon32.icon-settings,
+ #icon-options-general,
+ .icon32.icon-site,
+ #icon-ms-admin {
+ background-image: url("../images/icons32-2x.png?ver=20120916");
+ background-size: 708px 45px;
+ }
+
+ .icon16.icon-dashboard,
+ .menu-icon-dashboard div.wp-menu-image,
+ .icon16.icon-post,
+ .menu-icon-post div.wp-menu-image,
+ .icon16.icon-media,
+ .menu-icon-media div.wp-menu-image,
+ .icon16.icon-links,
+ .menu-icon-links div.wp-menu-image,
+ .icon16.icon-page,
+ .menu-icon-page div.wp-menu-image,
+ .icon16.icon-comments,
+ .menu-icon-comments div.wp-menu-image,
+ .icon16.icon-appearance,
+ .menu-icon-appearance div.wp-menu-image,
+ .icon16.icon-plugins,
+ .menu-icon-plugins div.wp-menu-image,
+ .icon16.icon-users,
+ .menu-icon-users div.wp-menu-image,
+ .icon16.icon-tools,
+ .menu-icon-tools div.wp-menu-image,
+ .icon16.icon-settings,
+ .menu-icon-settings div.wp-menu-image,
+ .icon16.icon-site,
+ .menu-icon-site div.wp-menu-image {
+ background-image: url("../images/menu-2x.png?ver=20120916");
+ background-size: 390px 64px;
+ }
+
+ #header-logo {
+ background-image: url("../images/wp-logo-2x.png?ver=20120916");
+ background-size: 16px auto;
+ }
+
+}
View
26 wp-admin/css/media.css
@@ -327,3 +327,29 @@ table.not-image tr.not-image {
table.not-image tr.image-only {
display: none;
}
+
+/**
+ * HiDPI Displays
+ */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+
+ .image-align-none-label {
+ background-image: url("../images/align-none-2x.png?ver=20120916");
+ background-size: 21px 15px;
+ }
+
+ .image-align-left-label {
+ background-image: url("../images/align-left-2x.png?ver=20120916");
+ background-size: 22px 15px;
+ }
+
+ .image-align-center-label {
+ background-image: url("../images/align-center-2x.png?ver=20120916");
+ background-size: 21px 15px;
+ }
+
+ .image-align-right-label {
+ background-image: url("../images/align-right-2x.png?ver=20120916");
+ background-size: 22px 15px;
+ }
+}
View
14 wp-admin/css/wp-admin-rtl.css
@@ -1570,7 +1570,7 @@ table .column-rating {
.wp-full-overlay .collapse-sidebar-arrow {
margin-right: 2px;
margin-left: 0;
- background: transparent url('../../wp-admin/images/arrows.png') no-repeat 0 -108px;
+ background: transparent url('../images/arrows.png') no-repeat 0 -108px;
}
.wp-full-overlay.collapsed .collapse-sidebar-arrow {
@@ -1584,6 +1584,18 @@ 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
------------------------------------------------------------------------------*/
View
55 wp-admin/css/wp-admin.css
@@ -2285,15 +2285,28 @@ html.wp-toolbar {
float: none;
width: 100%;
}
+
.welcome-panel .welcome-panel-column li {
display: inline-block;
margin-right: 13px;
}
+
.welcome-panel .welcome-panel-column ul {
margin: 0.4em 0 0;
}
}
+/**
+ * HiDPI Displays
+ */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+
+ .welcome-panel .welcome-panel-close:before {
+ background-image: url('../images/xit-2x.gif');
+ background-size: 20px auto;
+ }
+}
+
/*------------------------------------------------------------------------------
10.0 - List Posts (/Pages/etc)
------------------------------------------------------------------------------*/
@@ -3196,8 +3209,8 @@ td.plugin-title p {
.curtime #timestamp {
background-repeat: no-repeat;
- background-position: left top;
- padding-left: 18px;
+ background-position: left center;
+ padding: 2px 0 1px 20px;
}
#timestampdiv {
@@ -4234,6 +4247,9 @@ span.imgedit-scale-warn {
padding: 2px 10px;
}
+/**
+ * HiDPI Displays
+ */
@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
.imgedit-crop,
.imgedit-rleft,
@@ -5498,6 +5514,18 @@ body.full-overlay-active {
transition-duration: 0.2s;
}
+/**
+ * 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;
+ }
+}
+
+
/*------------------------------------------------------------------------------
24.0 - Customize Loader
------------------------------------------------------------------------------*/
@@ -8208,6 +8236,29 @@ a.widget-control-edit {
}
}
+/**
+ * HiDPI Displays
+ */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+
+ .press-this .tagchecklist span a {
+ background-image: url('../images/xit-2x.gif');
+ background-size: 20px auto;
+ }
+
+ .postbox:hover .handlediv,
+ .stuffbox:hover .handlediv,
+ .widget-top a.widget-action {
+ background-image: url('../images/arrows-2x.png');
+ background-size: 15px 123px;
+ }
+
+ .widget-top a.widget-action:hover {
+ background-image: url('../images/arrows-dark-2x.png');
+ background-size: 15px 123px;
+ }
+}
+
/* =Localized CSS
-------------------------------------------------------------- */
View
BIN wp-admin/images/align-center-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/align-left-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/align-none-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/align-right-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/arrows-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/arrows-dark-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/arrows-dark-vs-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/arrows-vs-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/date-button-2x.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/date-button.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/wp-logo-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/wp-logo-vs-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-admin/images/xit-2x.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
16 wp-includes/css/wp-pointer.css
@@ -185,3 +185,19 @@
.rtl .wp-pointer-undefined .wp-pointer-arrow {
right: 50px;
}
+
+/**
+ * HiDPI Displays
+ */
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+
+ .wp-pointer-buttons a.close:before {
+ background-image: url('../images/xit-2x.gif');
+ background-size: 20px auto;
+ }
+
+ .wp-pointer-content h3:before {
+ background-image: url('../images/icon-pointer-flag.png');
+ background-size: 36px auto;
+ }
+}
View
BIN wp-includes/images/icon-pointer-flag-2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN wp-includes/images/xit-2x.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b28a6c0

Please sign in to comment.