diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 3a8002e62c..2efce8a3b6 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -43,15 +43,15 @@ div.dashboard-widget, border-color: #ccc; } -#poststuff .inside .spam { +#poststuff .inside label.spam { color: red; } -#poststuff .inside .waiting { +#poststuff .inside label.waiting { color: orange; } -#poststuff .inside .approved { +#poststuff .inside label.approved { color: green; } @@ -129,10 +129,6 @@ h3.info-box-title, background-color: #dfdfdf; } -.metabox-holder { - color: #777; -} - .form-table tr, .form-wrap .form-field { background-color: #f9f9f9; @@ -144,7 +140,7 @@ select { } strong .post-com-count span { - background-color: #2583ad; + background-color: #21759b; } #login form .submit input, @@ -192,7 +188,7 @@ ul#widget-list li.widget-list-item h4.widget-title { .available-theme a.screenshot { background-color: #f1f1f1; - border-color: #ccc; + border-color: #ddd; } .bar { @@ -330,13 +326,18 @@ a.button.disabled { border-color: #535353; } +a:active, +a:focus { + color: #d54e21 !important; +} + +a:hover, .button:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #adminmenu ul.wp-submenu a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, -a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, @@ -401,7 +402,7 @@ div.dashboard-widget-submit input:hover, .tablenav .next, .tablenav .prev { border-color: transparent; - color: #2583ad; + color: #21759b; } .tablenav .next:hover, @@ -432,8 +433,8 @@ ul#widget-list li.widget-list-item, border-color: #dfdfdf; } -.widefat thead, -.widefat tfoot, +.widefat thead tr, +.widefat tfoot tr, .thead, .tfoot, h3.dashboard-widget-title, @@ -465,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 */ @@ -538,7 +539,7 @@ li.widget-list-control-item h4, background-color: #fffbcc; } -#edit-slug-box strong, .login #nav a { +#edit-slug-box strong, .login #nav a, .tablenav .displaying-num { color: #777; } @@ -728,7 +729,7 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover, -.delete:hover { +.delete a:hover { color: #f00; } @@ -913,7 +914,7 @@ abbr.required, color: #888; } -.wp_themeSkin tr.mceFirst { +.wp_themeSkin tr.mceFirst td.mceToolbar { background-color: #dfdfdf; border-color: #dfdfdf; } @@ -1021,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, @@ -1037,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; } @@ -1055,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 { @@ -1285,7 +1307,7 @@ div.star.select:hover { .inline-editor .categories .catshow, .inline-editor .categories .cathide { - color: #2583AD; + color: #21759b; } .inline-editor .quick-edit-save { @@ -1305,6 +1327,134 @@ div.star.select:hover { background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px; } -#major-publishing-actions, #dashboard_quick_press .submit { +#major-publishing-actions { background: #eaf2fa; } + +.tablenav .tablenav-pages, { + color: #555; +} + +.tablenav .tablenav-pages a { + border-color: #efefef; + background: #eee; +} + +.tablenav .tablenav-pages a:hover { + color: #fff; + background-color: #d54e21; + border-color: #d54321; +} + +.tablenav .tablenav-pages a:active { + color: #fff !important; +} + +.tablenav .tablenav-pages .current { + background: #dfdfdf; + border-color: #dfdfdf; +} + +#availablethemes, +#availablethemes td { + border-color: #ddd; +} + +#current-theme img { + border-color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link, +#TB_window #TB_title a.tb-theme-preview-link:visited { + color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link:hover, +#TB_window #TB_title a.tb-theme-preview-link:focus { + color: #ccc; +} + + +form p.submit a.cancel { + border-color: red; + color: red; +} + +form p.submit a.cancel:hover { + background: red; + color: white; +} + +.misc-pub-section { + border-bottom-color: #eee; +} + +#minor-publishing { + border-bottom-color: #ddd; +} + +#post-body .misc-pub-section { + border-right-color: #eee; +} + +.post-com-count span { + background-color: #bbb; +} + +.form-table .color-palette td { + border-color: #fff; +} + +.sortable-placeholder { + border-color: #bbb; + background-color: #f5f5f5; +} + +#post-body ul#category-tabs li.ui-tabs-selected a { + color: #333; +} + +.view-switch img { + border-color: #fff; +} + +.view-switch img.current { + border-color: #999; +} + +#wp_editimgbtn, #wp_delimgbtn { + border-color: #999; + background-color: #eee; +} + +#wp_editimgbtn:hover, #wp_delimgbtn:hover { + border-color: #555; + background-color: #ccc; +} + +#favorite-first { + border-color: #464646; + background: #797979 url(../images/fav.png) repeat-x 0 center; +} + +#favorite-inside { + border-color: #797979; + background: #797979 url(../images/fav-bottom.png) repeat-x 0 bottom; +} + +#favorite-toggle { + background: transparent url(../images/fav-arrow.png) no-repeat 0 -4px; +} + +#favorite-actions a { + color: #eee; +} + +#favorite-inside a:hover { + background-color: #8f8f8f; + color: #fff; +} + +#favorite-actions .slide-down { + border-bottom-color: #626262; +} diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 5539ba2f96..2efce8a3b6 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -188,7 +188,7 @@ ul#widget-list li.widget-list-item h4.widget-title { .available-theme a.screenshot { background-color: #f1f1f1; - border-color: #ccc; + border-color: #ddd; } .bar { @@ -1353,4 +1353,108 @@ div.star.select:hover { .tablenav .tablenav-pages .current { background: #dfdfdf; border-color: #dfdfdf; -} \ No newline at end of file +} + +#availablethemes, +#availablethemes td { + border-color: #ddd; +} + +#current-theme img { + border-color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link, +#TB_window #TB_title a.tb-theme-preview-link:visited { + color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link:hover, +#TB_window #TB_title a.tb-theme-preview-link:focus { + color: #ccc; +} + + +form p.submit a.cancel { + border-color: red; + color: red; +} + +form p.submit a.cancel:hover { + background: red; + color: white; +} + +.misc-pub-section { + border-bottom-color: #eee; +} + +#minor-publishing { + border-bottom-color: #ddd; +} + +#post-body .misc-pub-section { + border-right-color: #eee; +} + +.post-com-count span { + background-color: #bbb; +} + +.form-table .color-palette td { + border-color: #fff; +} + +.sortable-placeholder { + border-color: #bbb; + background-color: #f5f5f5; +} + +#post-body ul#category-tabs li.ui-tabs-selected a { + color: #333; +} + +.view-switch img { + border-color: #fff; +} + +.view-switch img.current { + border-color: #999; +} + +#wp_editimgbtn, #wp_delimgbtn { + border-color: #999; + background-color: #eee; +} + +#wp_editimgbtn:hover, #wp_delimgbtn:hover { + border-color: #555; + background-color: #ccc; +} + +#favorite-first { + border-color: #464646; + background: #797979 url(../images/fav.png) repeat-x 0 center; +} + +#favorite-inside { + border-color: #797979; + background: #797979 url(../images/fav-bottom.png) repeat-x 0 bottom; +} + +#favorite-toggle { + background: transparent url(../images/fav-arrow.png) no-repeat 0 -4px; +} + +#favorite-actions a { + color: #eee; +} + +#favorite-inside a:hover { + background-color: #8f8f8f; + color: #fff; +} + +#favorite-actions .slide-down { + border-bottom-color: #626262; +} diff --git a/wp-admin/rtl.css b/wp-admin/rtl.css index b8c08e6a1d..3ffa79c63d 100644 --- a/wp-admin/rtl.css +++ b/wp-admin/rtl.css @@ -121,9 +121,6 @@ td.available-theme { float: right; margin: 9px 20px 0 0; } -ul#adminmenu li.write-new-button a { - font-family: Tahoma, "Times New Roman"; -} #wphead h1 { font-family: "Times New Roman", Tahoma; float: right; diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index a754d03da9..f91b3fe35f 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -62,9 +62,8 @@ form#upload #post_content { table#availablethemes { border-spacing: 0; - border: none; - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; + border-width: 1px 0; + border-style: solid none; margin: 10px auto; width: 100%; } @@ -78,29 +77,26 @@ td.available-theme { } table#availablethemes td { - border: 1px solid #eee; - border-top: none; -} - -table#availablethemes td.top { - border-top: none; + border-width: 0 1px 1px; + border-style: none solid solid; } table#availablethemes td.right, table#availablethemes td.left { - border-right: none; - border-left: none; + border-right: 0 none; + border-left: 0 none; } table#availablethemes td.bottom { - border-bottom: none; + border-bottom: 0 none; } .available-theme a.screenshot { width: 240px; height: 180px; display: block; - border: 1px solid #efefef; + border-width: 1px; + border-style: solid; margin-bottom: 10px; overflow: hidden; } @@ -133,7 +129,8 @@ table#availablethemes td.bottom { #current-theme img { float: left; - border: 1px solid #666; + border-width: 1px; + border-style: solid; margin-right: 1em; margin-bottom: 1.5em; width: 150px; @@ -142,15 +139,9 @@ table#availablethemes td.bottom { #TB_window #TB_title a.tb-theme-preview-link, #TB_window #TB_title a.tb-theme-preview-link:visited { font-weight: bold; - color: #999; text-decoration: none; } -#TB_window #TB_title a.tb-theme-preview-link:hover, -#TB_window #TB_title a.tb-theme-preview-link:focus { - color: #ccc; -} - .checkbox { border: none; margin: 0; @@ -210,22 +201,19 @@ kbd, code { border-bottom-right-radius: 3px; } -form p.submit .cancel { +form p.submit a.cancel { padding: 3px 0 0; - border: none; background: transparent; - border-bottom: 1px solid red; - color: red; + border-width: 0 0 1px; + border-style: none none solid; -moz-border-radius: 0; -webkit-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } -form p.submit .cancel:hover { +form p.submit a.cancel:hover { text-decoration: none; - background: red; - color: #fff; } .submit-top { @@ -244,11 +232,12 @@ form p.submit .cancel:hover { .misc-pub-section { padding: 6px; - border-bottom: 1px solid #eee; + border-bottom-width: 1px; + border-bottom-style: solid; } .misc-pub-section-last { - border-bottom: 0; + border-bottom: 0 none; } #minor-publishing-actions { @@ -257,7 +246,8 @@ form p.submit .cancel:hover { } #minor-publishing { - border-bottom: 1px solid #ddd; + border-bottom-width: 1px; + border-bottom-style: solid; } #save-post { @@ -303,8 +293,9 @@ form p.submit .cancel:hover { } #post-body .misc-pub-section { - border-right: 1px solid #eee; - border-bottom: 0; + border-right-width: 1px; + border-right-style: solid; + border-bottom: 0 none; min-height: 30px; float: left; max-width: 32%; @@ -867,25 +858,6 @@ a#view-site-link { margin: 9px 0 0 20px; } -ul#adminmenu li.write-new-button { - margin: -10px 18px 12px; -} -ul#adminmenu li.write-new-button a { - line-height: 1.2em; - font: 12px "Lucida Grande", Verdana, Arial, sans-serif; - padding: 6px 4px; - letter-spacing: normal; - border-width: 1px; - border-style: solid; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - text-indent: 0; - text-align: center; - color: #246; -} - #wphead h1 { font: normal 22px Georgia, "Times New Roman", Times, serif; padding: 10px 10px 5px; @@ -969,16 +941,6 @@ ul#adminmenu li.write-new-button a { height: 28px; } -/* -#adminmenu a { - outline: none; -} - -#adminmenu a:active, -#adminmenu a:selected { - color: #D54E21; -} -*/ #adminmenu li { margin: 0; padding: 0; @@ -986,7 +948,6 @@ ul#adminmenu li.write-new-button a { #adminmenu a { display: block; - font-size: 11.5px; line-height: 18px; padding: 1px 5px 3px; } @@ -1026,7 +987,6 @@ ul#adminmenu li.write-new-button a { overflow: hidden; border-width: 1px 1px 0; border-style: solid solid none; - background-color: #F1F1F1; } #adminmenu .menu-top-first a.menu-top, @@ -1185,7 +1145,6 @@ ul#adminmenu li.write-new-button a { height: 1.3em; line-height: 1.2em; padding: 0 0.5em; - background-color: #bbb; display: inline-block; cursor: pointer; -moz-border-radius: 3px; @@ -1202,11 +1161,15 @@ strong .post-com-count { background-position: center -3px; } -#adminmenu li a:hover #awaiting-mod, #adminmenu li a:hover #update-plugins, #sidemenu li a:hover #update-plugins { +#adminmenu li a:hover #awaiting-mod, +#adminmenu li a:hover #update-plugins, +#sidemenu li a:hover #update-plugins { background-position: -80px bottom; } -#adminmenu li a #awaiting-mod span, #adminmenu li a #update-plugins span, #sidemenu li a #update-plugins span { +#adminmenu li a #awaiting-mod span, +#adminmenu li a #update-plugins span, +#sidemenu li a #update-plugins span { top: -0.8em; right: 0; position: absolute; @@ -1219,32 +1182,6 @@ strong .post-com-count { -webkit-border-radius: 3px; border-radius: 3px; } - -/* -#wpbody ul.wp-menu { - list-style: none; - margin: 10px 0; - padding: 0; - font-size: 16px; -} - -#wpbody ul.wp-menu li { - display: inline; -} - -#wpbody ul.wp-menu li:before { - content: " | "; -} - -#wpbody ul.wp-menu li.wp-first-item:before { - content: ""; -} - -#wpbody ul.wp-menu li.current a { - text-decoration: none; - color: #666; -} -*/ /* end menu stuff */ /* Admin Footer */ @@ -1343,8 +1280,8 @@ html, body { } .form-table .color-palette td { - border-bottom: none; - border: 1px solid #fff; + border-width: 1px 1px 0 + border-stile: solid solid none; height: 10px; line-height: 20px; width: 10px; @@ -1673,8 +1610,8 @@ table.form-table td .updated { } .sortable-placeholder { - border: 1px dashed #bbb; - background-color: #f5f5f5; + border-width: 1px; + border-style: dashed; z-index: -1; } @@ -1973,7 +1910,6 @@ input#link_url { } #post-body ul#category-tabs li.ui-tabs-selected a { - color: #333; font-weight: bold; text-decoration: none; } @@ -2106,11 +2042,8 @@ body.wp-admin { .view-switch img { margin: 0; - border: 1px solid #fff; -} - -.view-switch img.current { - border: 1px solid #999; + border-width: 1px; + border-style: solid; } .filter { @@ -2250,19 +2183,14 @@ fieldset { #wp_editimgbtn, #wp_delimgbtn { margin: 2px; padding: 2px; - border: 1px solid #999; - background-color: #eee; + border-width: 1px; + border-style: solid; -moz-border-radius: 3px; -khtml-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; } -#wp_editimgbtn:hover, #wp_delimgbtn:hover { - border-color: #555; - background-color: #ccc; -} - .settings-toggle { text-align: right; margin: 5px 7px 15px 0; @@ -3043,13 +2971,8 @@ abbr.required { border-radius: 12px; line-height: 15px; padding: 3px 30px 4px 12px; - border-color: #464646; border-width: 1px; border-style: solid; - background-color: #797979; - background-image: url(images/fav.png); - background-repeat: repeat-x; - background-position: 0 center; } #favorite-inside { @@ -3067,21 +2990,11 @@ abbr.required { -khtml-border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; border-bottom-left-radius: 12px; - border-color: #797979; - background-color: #797979; - background-image: url(images/fav-bottom.png); - background-repeat: repeat-x; - background-position: 0 bottom; -} - -.favorite-action { - } #favorite-actions a { display: block; text-decoration: none; - color: #eee; font-size: 11px; } @@ -3089,18 +3002,12 @@ abbr.required { padding: 3px 5px 3px 10px; } -#favorite-inside a:hover { - background-color: #8f8f8f; - color: #fff; -} - #favorite-toggle { height: 22px; position: absolute; right: 0; top: 1px; width: 28px; - background: transparent url(images/fav-arrow.png) no-repeat 0 -4px; } #favorite-actions .slide-down { @@ -3114,7 +3021,8 @@ abbr.required { -khtml-border-bottom-left-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 0; - border-bottom: 1px solid #626262; + border-bottom-width: 1px; + border-bottom-style: solid; } #utc-time, #local-time { diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 21bc0e04fe..461203997b 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -300,13 +300,13 @@ 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(), '20081119' ); + $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20081119b' ); $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', true, array(), '20081118' ); // Register "meta" stylesheet for admin colors $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 );