diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index b3a9a83a0e..dff2b6be22 100644 --- a/wp-admin/css/colors-classic.css +++ b/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; + } + +} diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index e7ae11633c..fd459a4438 100644 --- a/wp-admin/css/colors-fresh.css +++ b/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; + } + +} diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css index 24b163eba9..653073c8c9 100644 --- a/wp-admin/css/media.css +++ b/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; + } +} diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css index ae5fe21968..6a0087d74e 100644 --- a/wp-admin/css/wp-admin-rtl.css +++ b/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 ------------------------------------------------------------------------------*/ diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index 919a3229fb..d9f4ba2951 100644 --- a/wp-admin/css/wp-admin.css +++ b/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 -------------------------------------------------------------- */ diff --git a/wp-admin/images/align-center-2x.png b/wp-admin/images/align-center-2x.png new file mode 100644 index 0000000000..0b6273445a Binary files /dev/null and b/wp-admin/images/align-center-2x.png differ diff --git a/wp-admin/images/align-left-2x.png b/wp-admin/images/align-left-2x.png new file mode 100644 index 0000000000..1b2d428333 Binary files /dev/null and b/wp-admin/images/align-left-2x.png differ diff --git a/wp-admin/images/align-none-2x.png b/wp-admin/images/align-none-2x.png new file mode 100644 index 0000000000..a64a0bed51 Binary files /dev/null and b/wp-admin/images/align-none-2x.png differ diff --git a/wp-admin/images/align-right-2x.png b/wp-admin/images/align-right-2x.png new file mode 100644 index 0000000000..013150513b Binary files /dev/null and b/wp-admin/images/align-right-2x.png differ diff --git a/wp-admin/images/arrows-2x.png b/wp-admin/images/arrows-2x.png new file mode 100644 index 0000000000..0b0c53d1a6 Binary files /dev/null and b/wp-admin/images/arrows-2x.png differ diff --git a/wp-admin/images/arrows-dark-2x.png b/wp-admin/images/arrows-dark-2x.png new file mode 100644 index 0000000000..86be981f0c Binary files /dev/null and b/wp-admin/images/arrows-dark-2x.png differ diff --git a/wp-admin/images/arrows-dark-vs-2x.png b/wp-admin/images/arrows-dark-vs-2x.png new file mode 100644 index 0000000000..c509a4ea8a Binary files /dev/null and b/wp-admin/images/arrows-dark-vs-2x.png differ diff --git a/wp-admin/images/arrows-vs-2x.png b/wp-admin/images/arrows-vs-2x.png new file mode 100644 index 0000000000..be558778d9 Binary files /dev/null and b/wp-admin/images/arrows-vs-2x.png differ diff --git a/wp-admin/images/date-button-2x.gif b/wp-admin/images/date-button-2x.gif new file mode 100644 index 0000000000..95839c9aff Binary files /dev/null and b/wp-admin/images/date-button-2x.gif differ diff --git a/wp-admin/images/date-button.gif b/wp-admin/images/date-button.gif index 7ee32cb515..33ecd66e11 100644 Binary files a/wp-admin/images/date-button.gif and b/wp-admin/images/date-button.gif differ diff --git a/wp-admin/images/wp-logo-2x.png b/wp-admin/images/wp-logo-2x.png new file mode 100644 index 0000000000..a8dad4f3e4 Binary files /dev/null and b/wp-admin/images/wp-logo-2x.png differ diff --git a/wp-admin/images/wp-logo-vs-2x.png b/wp-admin/images/wp-logo-vs-2x.png new file mode 100644 index 0000000000..3bfb20a06d Binary files /dev/null and b/wp-admin/images/wp-logo-vs-2x.png differ diff --git a/wp-admin/images/xit-2x.gif b/wp-admin/images/xit-2x.gif new file mode 100644 index 0000000000..64ab2ce789 Binary files /dev/null and b/wp-admin/images/xit-2x.gif differ diff --git a/wp-includes/css/wp-pointer.css b/wp-includes/css/wp-pointer.css index 1778967d72..51de5a96b0 100644 --- a/wp-includes/css/wp-pointer.css +++ b/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; + } +} \ No newline at end of file diff --git a/wp-includes/images/icon-pointer-flag-2x.png b/wp-includes/images/icon-pointer-flag-2x.png new file mode 100644 index 0000000000..99a2c2ab00 Binary files /dev/null and b/wp-includes/images/icon-pointer-flag-2x.png differ diff --git a/wp-includes/images/xit-2x.gif b/wp-includes/images/xit-2x.gif new file mode 100644 index 0000000000..64ab2ce789 Binary files /dev/null and b/wp-includes/images/xit-2x.gif differ