diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index c8774ca4ec..5539ba2f96 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -140,7 +140,7 @@ select { } strong .post-com-count span { - background-color: #2583ad; + background-color: #21759b; } #login form .submit input, @@ -402,7 +402,7 @@ div.dashboard-widget-submit input:hover, .tablenav .next, .tablenav .prev { border-color: transparent; - color: #2583ad; + color: #21759b; } .tablenav .next:hover, @@ -466,7 +466,7 @@ h3.dashboard-widget-title small a:hover { #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, a { - color: #2583ad; + color: #21759b; } /* Because we don't want visited on these links */ @@ -1022,7 +1022,7 @@ abbr.required, #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { - background: transparent url(../images/menu-bits.gif) no-repeat scroll left -206px; + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -208px; } #adminmenu .wp-has-submenu:hover .wp-menu-toggle, @@ -1038,16 +1038,35 @@ abbr.required, background: #FFFFFF url(../images/menu-bits.gif) no-repeat scroll 0 -310px; } +#adminmenu .wp-has-current-submenu ul li a { + background: none; +} + +#adminmenu .wp-has-current-submenu ul li a.current { + background: url(../images/menu-dark.gif) top left no-repeat !important; +} + #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu .menu-top .current { - background-color: #c0c0c0; - background-image: none; + background: url(../images/menu-bits.gif) top left repeat-x; border-color: #B5B5B5; color: #fff; + text-shadow: #666 0px -1px 0px; +} + +#adminmenu li.wp-has-current-submenu .wp-submenu, #adminmenu li.wp-has-current-submenu ul li a { + border-color: #aaa !important; +} + +#adminmenu li.wp-has-current-submenu ul li a { + background: url(../images/menu-dark.gif) bottom left no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu ul { + border-bottom-color: #aaa; } #adminmenu li.menu-top .current:hover { - background: #c0c0c0 none repeat scroll 0 0; border-color: #B5B5B5; } @@ -1056,16 +1075,18 @@ abbr.required, } #adminmenu .wp-submenu a:hover { - background-color: #EAF2FA; + background-color: #EAF2FA !important; color: #333 !important; } #adminmenu .wp-submenu li.current, #adminmenu .wp-submenu li.current a, #adminmenu .wp-submenu li.current a:hover { - color: #d54e21; - background-color: #fff; + color: #333; + background-color: #f5f5f5; + background-image: none; border-color: #e3e3e3; + text-shadow: #fff 0px 1px 0px; } #adminmenu .wp-submenu ul { @@ -1286,7 +1307,7 @@ div.star.select:hover { .inline-editor .categories .catshow, .inline-editor .categories .cathide { - color: #2583AD; + color: #21759b; } .inline-editor .quick-edit-save { diff --git a/wp-admin/css/dashboard.css b/wp-admin/css/dashboard.css index 94d06eb1b9..27b4e77ef3 100644 --- a/wp-admin/css/dashboard.css +++ b/wp-admin/css/dashboard.css @@ -297,7 +297,12 @@ div.postbox div.inside { #dashboard_quick_press #media-buttons { margin: 0 0 .5em 5em; - padding: 0 0 0 2px; + padding: 0 0 0 10px; + font-size: 11px; +} + +#dashboard_quick_press #media-buttons a { + vertical-align: bottom; } #dashboard-widgets #dashboard_quick_press form p.submit { @@ -353,6 +358,14 @@ a.rsswidget { font-size: 13px; line-height: 1.7em; } +/* +#the-comment-list .comment-item h4 { + line-height: 1.4; + margin-top: -.2em; + font-weight: normal; + color: #999; +} +*/ .rss-widget ul li { line-height: 1.4em; @@ -376,7 +389,7 @@ a.rsswidget { /* Plugins */ #dashboard_plugins h5 { - font-size: 14px; + font-size: 13px; margin: 0; display: inline; line-height: 1.4em; diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index a257de0fa4..9b97a5f111 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -148,7 +148,7 @@ input[type="radio"] { body, td { - font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font: 13px "Lucida Grande", Verdana, Arial, sans-serif; } p { @@ -179,7 +179,7 @@ dt { textarea, input, select { - font: 13px/19px Verdana, Arial, Helvetica, sans-serif; + font: 13px/19px "Lucida Grande", Verdana, Arial, sans-serif; margin: 1px; padding: 3px; } @@ -375,7 +375,7 @@ h6 { .wrap h2 { font: italic normal normal 24px/29px Georgia, "Times New Roman", Times, serif; margin: 0; - padding: 10px 15px 5px 0; + padding: 14px 15px 1px 0; } .wrap h2.long-header { diff --git a/wp-admin/gears-manifest.php b/wp-admin/gears-manifest.php index 61c52d314c..8ff25ff1c9 100644 --- a/wp-admin/gears-manifest.php +++ b/wp-admin/gears-manifest.php @@ -130,6 +130,8 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "images/menu-arrows.gif" }, { "url" : "images/menu-bits.gif" }, { "url" : "images/menu-bits-rtl.gif" }, +{ "url" : "images/menu-dark.gif" }, +{ "url" : "images/menu-dark-rtl.gif" }, { "url" : "images/del.png" }, { "url" : "images/list.gif" }, { "url" : "images/exc.gif" }, diff --git a/wp-admin/images/menu-bits-rtl.gif b/wp-admin/images/menu-bits-rtl.gif index 6ca1abd9d3..3765bfb807 100644 Binary files a/wp-admin/images/menu-bits-rtl.gif and b/wp-admin/images/menu-bits-rtl.gif differ diff --git a/wp-admin/images/menu-bits.gif b/wp-admin/images/menu-bits.gif index 6c6dcbb8d6..9a10a9a168 100644 Binary files a/wp-admin/images/menu-bits.gif and b/wp-admin/images/menu-bits.gif differ diff --git a/wp-admin/images/menu-dark.gif b/wp-admin/images/menu-dark.gif new file mode 100644 index 0000000000..739b888f32 Binary files /dev/null and b/wp-admin/images/menu-dark.gif differ diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 514733b1b5..a754d03da9 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -344,7 +344,7 @@ form p.submit .cancel:hover { .button-secondary, .button-highlighted, #postcustomstuff .submit input { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font-family: "Lucida Grande", Verdana, Arial, sans-serif; text-decoration: none; font-size: 11px !important; line-height: 16px; @@ -384,7 +384,7 @@ a.button { } #wpcontent select { - font: 12px/20px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font: 12px/20px "Lucida Grande", Verdana, Arial, sans-serif; padding: 2px; border-width: 1px; border-style: solid; @@ -872,7 +872,7 @@ ul#adminmenu li.write-new-button { } ul#adminmenu li.write-new-button a { line-height: 1.2em; - font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font: 12px "Lucida Grande", Verdana, Arial, sans-serif; padding: 6px 4px; letter-spacing: normal; border-width: 1px; @@ -924,7 +924,13 @@ ul#adminmenu li.write-new-button a { } #adminmenu .wp-submenu a { - font: normal 12px/18px Helvetica, Verdana, sans-serif; + font: normal 11px/18px "Lucida Grande", Verdana, Arial, sans-serif; +} + +#adminmenu .wp-submenu li.current, +#adminmenu .wp-submenu li.current a, +#adminmenu .wp-submenu li.current a:hover { + font-weight: bold; } #adminmenu a.menu-top, @@ -960,7 +966,7 @@ ul#adminmenu li.write-new-button a { #adminmenu div.wp-menu-image { float: left; width: 28px; - height: 30px; + height: 28px; } /* @@ -980,19 +986,19 @@ ul#adminmenu li.write-new-button a { #adminmenu a { display: block; - font-size: 11.5px !important; + font-size: 11.5px; line-height: 18px; padding: 1px 5px 3px; } #adminmenu li.menu-top { - min-height: 28px; + min-height: 26px; } #adminmenu a.menu-top { line-height: 18px; min-width: 10em; - padding: 6px 5px; + padding: 5px 5px; border-width: 1px 1px 0; border-style: solid solid none; } @@ -1028,28 +1034,28 @@ ul#adminmenu li.write-new-button a { #adminmenu .wp-submenu .wp-submenu-head { border-width: 1px 1px 0; border-style: solid solid none; - -moz-border-radius-topleft :8px; - -moz-border-radius-topright: 8px; - -webkit-border-top-right-radius: 8px; - -webkit-border-top-left-radius: 8px; - -khtml-border-top-right-radius: 8px; - -khtml-border-top-left-radius: 8px; - border-top-right-radius: 8px; - border-top-left-radius: 8px; + -moz-border-radius-topleft :6px; + -moz-border-radius-topright: 6px; + -webkit-border-top-right-radius: 6px; + -webkit-border-top-left-radius: 6px; + -khtml-border-top-right-radius: 6px; + -khtml-border-top-left-radius: 6px; + border-top-right-radius: 6px; + border-top-left-radius: 6px; } #adminmenu .menu-top-last a.menu-top, #adminmenu.folded li.menu-top-last { border-width: 1px; border-style: solid; - -moz-border-radius-bottomleft: 8px; - -moz-border-radius-bottomright: 8px; - -webkit-border-bottom-right-radius: 8px; - -webkit-border-bottom-left-radius: 8px; - -khtml-border-bottom-right-radius: 8px; - -khtml-border-bottom-left-radius: 8px; - border-bottom-right-radius: 8px; - border-bottom-left-radius: 8px; + -moz-border-radius-bottomleft: 6px; + -moz-border-radius-bottomright: 6px; + -webkit-border-bottom-right-radius: 6px; + -webkit-border-bottom-left-radius: 6px; + -khtml-border-bottom-right-radius: 6px; + -khtml-border-bottom-left-radius: 6px; + border-bottom-right-radius: 6px; + border-bottom-left-radius: 6px; } #adminmenu li.wp-menu-open a.menu-top-last { @@ -1127,14 +1133,19 @@ ul#adminmenu li.write-new-button a { clear: right; float: right; margin: 1px 0 0; - height: 29px; + height: 27px; padding: 1px 2px 0 0; } #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.menu-top > a.current { - font-style: italic; } + +#adminmenu li.wp-has-current-submenu ul { + border-bottom-width: 1px; + border-bottom-style: solid; +} + /* end side admin menu */ /* 2.6 */ @@ -1847,7 +1858,6 @@ input#link_url { #media-buttons a { cursor: pointer; padding: 0 0 5px 10px; - vertical-align: middle; } #media-buttons img { @@ -2227,7 +2237,7 @@ fieldset { line-height: 2; margin: 0; padding: 4px 8px; - font: 18px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font: 18px "Lucida Grande", Verdana, Arial, sans-serif; } #wp_editbtns { @@ -2542,7 +2552,7 @@ fieldset { #contextual-help-link-wrap { float: right; background: transparent url( images/screen-options-left.gif ) no-repeat 0 0; - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font-family: "Lucida Grande", Verdana, Arial, sans-serif; height: 23px; padding: 0; margin: -1px 10px 0 0; @@ -2824,7 +2834,7 @@ ul.cat-checklist { .inline-edit-row .catshow, .inline-edit-row .cathide, .inline-edit-row #bulk-titles div { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font-family: "Lucida Grande", Verdana, Arial, sans-serif; font-style: normal; font-size: 11px; } @@ -3200,4 +3210,3 @@ table.fixed { overflow: hidden; } - diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 00dde15c7f..f09c99d57d 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -300,20 +300,20 @@ function wp_default_styles( &$styles ) { $rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'press-this-ie', 'plugin-install', 'farbtastic' ); - $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081118' ); + $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081119' ); $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20081117' ); $styles->add_data( 'ie', 'conditional', 'gte IE 6' ); $styles->add( 'colors', true ); // Register "meta" stylesheet for admin colors - $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081118'); // for login.php. Is there a better way? + $styles->add( 'colors-fresh', '/wp-admin/css/colors-fresh.css', array(), '20081119'); // for login.php. Is there a better way? $styles->add_data( 'colors-fresh', 'rtl', true ); - $styles->add( 'global', '/wp-admin/css/global.css', array(), '20081106' ); + $styles->add( 'global', '/wp-admin/css/global.css', array(), '20081119' ); $styles->add( 'media', '/wp-admin/css/media.css', array(), '20080709' ); $styles->add( 'widgets', '/wp-admin/css/widgets.css' ); - $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081117' ); + $styles->add( 'dashboard', '/wp-admin/css/dashboard.css', array(), '20081119' ); $styles->add( 'install', '/wp-admin/css/install.css', array(), '20080708' ); $styles->add( 'theme-editor', '/wp-admin/css/theme-editor.css' ); $styles->add( 'press-this', '/wp-admin/css/press-this.css', array(), '20081115' );