diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 55e47f065..f6bfe67c4 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -38,7 +38,7 @@ $time_format = get_option('time_format'); wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback')); -wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#6D6D6D', '#F1F1F1', '#DFDFDF')); +wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7')); wp_admin_css_color('fresh', __('Gray'), admin_url("css/colors-fresh.css"), array('#464646', '#6D6D6D', '#F1F1F1', '#DFDFDF')); wp_enqueue_script( 'common' ); diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 8343fc5a5..80d116874 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -1,5 +1,5 @@ html { - background-color: #f9f9f9; + background-color: #F5FCFD; } .find-box-search { @@ -71,7 +71,7 @@ div.dashboard-widget, } .widefat { - border-color: #dfdfdf; + border-color: #BBD8E7; background-color: #fff; } @@ -117,9 +117,10 @@ li.widget-list-control-item div.widget-control { border-color: #dfdfdf; } -#poststuff h3, -.metabox-holder h3 { - background-color: #dfdfdf; +.metabox-holder .postbox h3, +#poststuff .postbox h3, +#poststuff .stuffbox h3 { + background: #dfdfdf url("../images/blue-grad.png") repeat-x left top; text-shadow: #fff 0 1px 0; } @@ -173,7 +174,7 @@ ul#widget-list li.widget-list-item h4.widget-title { } .alternate, .alt { - background-color: #f9f9f9; + background-color: #EDFBFC; } .available-theme a.screenshot { @@ -434,7 +435,11 @@ ul#widget-list li.widget-list-item, .widefat td, .widefat th { - border-color: #dfdfdf; + border-bottom-color: #BBD8E7; +} + +.widefat th { + text-shadow: rgba(255,255,255,0.8) 0 1px 0; } .widefat thead tr, @@ -446,7 +451,7 @@ h3.dashboard-widget-title span, h3.dashboard-widget-title small, .find-box-head { color: #333; - background: #dfdfdf url(../images/gray-grad.png) repeat-x scroll left top; + background: #dfdfdf url(../images/blue-grad.png) repeat-x scroll left top; } h3.dashboard-widget-title small a { @@ -464,7 +469,7 @@ h3.dashboard-widget-title small a:hover { #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, a { - color: #21759b; + color: #1C6280; } /* Because we don't want visited on these links */ @@ -625,7 +630,7 @@ li.widget-list-control-item h4, .postbox textarea, .stuffbox input[type="text"], .stuffbox textarea { - border-color: #dfdfdf; + border-color: #BBD8E7; } .metabox-holder .postbox, @@ -1010,7 +1015,7 @@ abbr.required, } #adminmenu a.menu-top { - background: #f1f1f1 url(../images/menu-bits.gif) repeat-x scroll left -379px; + background: #EAF3FA url(../images/menu-bits.gif) repeat-x scroll left -379px; } #adminmenu .wp-submenu a { @@ -1075,17 +1080,17 @@ abbr.required, .folded #adminmenu li.menu-top, #adminmenu .wp-submenu .wp-submenu-head { - background-color: #F1F1F1; + background-color: #EAF2FA; } .folded #adminmenu li.wp-has-current-submenu, .folded #adminmenu li.menu-top.current { - background-color: #eaeaea; + background-color: #BBD8E7; } #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head { - background-color: #EAEAEA; - border-color: #aaa; + background-color: #BBD8E7; + border-color: #8CBDD5; } #adminmenu div.wp-submenu { @@ -1485,10 +1490,6 @@ fieldset.inline-edit-col-right .inline-edit-col { text-shadow: rgba(0,0,0,0.3) 0 -1px 0; } -.widefat th { - text-shadow: rgba(255,255,255,0.8) 0 1px 0; -} - #wphead h1 { text-shadow: rgba(0,0,0,0.6) 0 -1px 0; } diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 3c1837d04..1906ed4cc 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -111,26 +111,16 @@ li.widget-list-control-item h4.widget-title a, #plugin-information .action-button a:visited { color: #fff; } -/* -li.widget-list-control-item, -div.nav, -#dashboard-widgets p.dashboard-widget-links, -#replyhandle, -h3.info-box-title, -#screen-options-wrap, -#wpbody-content .describe tr { - background-color: #eaf3fa; -} -*/ li.widget-list-control-item div.widget-control { background-color: #fff; border-color: #dfdfdf; } -#poststuff h3, -.metabox-holder h3 { - background-color: #dfdfdf; +.metabox-holder .postbox h3, +#poststuff .postbox h3, +#poststuff .stuffbox h3 { + background: #dfdfdf url("../images/gray-grad.png") repeat-x left top; text-shadow: #fff 0 1px 0; } @@ -457,6 +447,10 @@ ul#widget-list li.widget-list-item, border-color: #dfdfdf; } +.widefat th { + text-shadow: rgba(255,255,255,0.8) 0 1px 0; +} + .widefat thead tr, .widefat tfoot tr, .thead, @@ -693,40 +687,7 @@ li.widget-list-control-item h4, border-top-color: #ccc; color: #555; } -/* -#upload-files a.file-link { - background-color: #d1e2ef; -} -#upload-file-view a img { - border-bottom-color: #69c; -} - -#upload-menu li #current-tab-nav, -#upload-file { - background-color: #f9fcfe; -} - -#upload-menu li span a.page-numbers { - color: #00019b; -} - -#upload-menu li.current { - border-right-color: #448abd; - color: #000; -} - -#upload-menu li.current a.upload-tab-link, -#upload-menu li a:hover { - background-color: #f9fcfe; - color: #000; -} - -#upload-menu, -#upload-menu li { - border-top-color: #247fab; -} -*/ .login #backtoblog a { color: #ccc; } @@ -1133,7 +1094,7 @@ abbr.required, .folded #adminmenu li.wp-has-current-submenu, .folded #adminmenu li.menu-top.current { - background-color: #eaeaea; + background-color: #e6e6e6; } #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head { @@ -1538,10 +1499,6 @@ fieldset.inline-edit-col-right .inline-edit-col { text-shadow: rgba(0,0,0,0.3) 0 -1px 0; } -.widefat th { - text-shadow: rgba(255,255,255,0.8) 0 1px 0; -} - #wphead h1 { text-shadow: rgba(0,0,0,0.6) 0 -1px 0; } diff --git a/wp-admin/gears-manifest.php b/wp-admin/gears-manifest.php index 879dc6ae1..7ead326e4 100644 --- a/wp-admin/gears-manifest.php +++ b/wp-admin/gears-manifest.php @@ -137,6 +137,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "images/align-none.png" }, { "url" : "images/align-right.png" }, { "url" : "images/archive-link.png" }, +{ "url" : "images/blue-grad.png" }, { "url" : "images/browse-happy.gif" }, { "url" : "images/bubble_bg.gif" }, { "url" : "images/bubble_bg-rtl.gif" }, @@ -174,7 +175,6 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "images/menu-dark.gif" }, { "url" : "images/menu-dark-rtl.gif" }, { "url" : "images/no.png" }, -{ "url" : "images/postbox-bg.gif" }, { "url" : "images/required.gif" }, { "url" : "images/resize.gif" }, { "url" : "images/screen-options-left.gif" }, diff --git a/wp-admin/images/blue-grad.png b/wp-admin/images/blue-grad.png new file mode 100644 index 000000000..3d338d713 Binary files /dev/null and b/wp-admin/images/blue-grad.png differ diff --git a/wp-admin/images/menu-vs.png b/wp-admin/images/menu-vs.png index feefc24fc..eb53fe8d1 100644 Binary files a/wp-admin/images/menu-vs.png and b/wp-admin/images/menu-vs.png differ diff --git a/wp-admin/images/postbox-bg.gif b/wp-admin/images/postbox-bg.gif deleted file mode 100644 index 02210fee8..000000000 Binary files a/wp-admin/images/postbox-bg.gif and /dev/null differ diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 266cbb024..ceba8168f 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -1624,9 +1624,6 @@ table.form-table td .updated { .metabox-holder .postbox h3, #poststuff .postbox h3, #poststuff .stuffbox h3 { - background-image: url("images/postbox-bg.gif"); - background-position: left top; - background-repeat: repeat-x; -moz-border-radius: 6px 6px 0 0; -webkit-border-top-right-radius: 6px; -webkit-border-top-left-radius: 6px; diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index a7e684173..9c92978d3 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -308,7 +308,7 @@ function wp_default_styles( &$styles ) { $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20081128' ); $styles->add_data( 'ie', 'conditional', 'gte IE 6' ); - $styles->add( 'colors', true, array(), '20081129' ); // Register "meta" stylesheet for admin colors + $styles->add( 'colors', true, array(), '20081130' ); // Register "meta" stylesheet for admin colors $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081129'); // for login.php. Is there a better way? $styles->add_data( 'colors-fresh', 'rtl', true ); $styles->add( 'colors-classic', '/wp-admin/css/colors-classic.css', array(), '20081129');