diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 2efce8a3b6..7a3fe180e5 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -129,9 +129,17 @@ h3.info-box-title, background-color: #dfdfdf; } +.form-table th, .form-wrap label { + color: #222; +} + +.setting-description, .form-wrap p { + color: #999; +} + .form-table tr, .form-wrap .form-field { - background-color: #f9f9f9; + background-color: #f3f3f3; } select { @@ -296,6 +304,11 @@ td.help { background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top; } +#wpcontent select { + background: url(../images/white-grad.png) repeat-x scroll left top; + color: #555; +} + .button-secondary, .submit .button-secondary { border-color: #CFE1EF; @@ -303,8 +316,10 @@ td.help { } .button-primary, -.submit .button-primary { +.submit .button-primary, +#login form .submit input { border-color: #21759B; + font-weight: bold; color: #FFF; background: #21759B url(../images/button-grad.png) repeat-x scroll left top; } @@ -343,8 +358,7 @@ a:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #media-upload a.del-link:hover, -.ui-tabs-nav a:hover, -#user_info a:hover { +.ui-tabs-nav a:hover { color: #d54e21; } @@ -358,9 +372,8 @@ div.dashboard-widget-submit input:hover, border-color: #328ab2; } -.button-primary:hover { - border-color: #156079; - background-image: inherit; +.button-primary:hover, #login form .submit input:hover { + color: #EAF2FA; } #side-info-column #category-tabs .ui-tabs-selected a { @@ -539,10 +552,18 @@ li.widget-list-control-item h4, background-color: #fffbcc; } -#edit-slug-box strong, .login #nav a, .tablenav .displaying-num { +#edit-slug-box strong, .tablenav .displaying-num { color: #777; } +.login #nav a { + color: #21759b !important; +} + +.login #nav a:hover { + color: #d54e21 !important; +} + #footer, #footer-upgrade { background: #464646; @@ -719,6 +740,15 @@ body.login { color: #999; } +#user_info a:hover { + color: #fff; + text-decoration: underline !important; +} + +#user_info a:active { + color: #ccc !important; +} + #user_info a, #user_info a:visited { color: #ccc; text-decoration: none; @@ -1022,12 +1052,12 @@ 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 -208px; + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -207px; } #adminmenu .wp-has-submenu:hover .wp-menu-toggle, #adminmenu .wp-menu-open .wp-menu-toggle { - background: transparent url(../images/menu-bits.gif) no-repeat scroll left -108px; + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -109px; } #adminmenu a.menu-top { @@ -1048,10 +1078,9 @@ abbr.required, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu .menu-top .current { - background: url(../images/menu-bits.gif) top left repeat-x; - border-color: #B5B5B5; + background: #6d6d6d url(../images/menu-bits.gif) top left repeat-x; + border-color: #6d6d6d; 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 { @@ -1086,7 +1115,6 @@ abbr.required, background-color: #f5f5f5; background-image: none; border-color: #e3e3e3; - text-shadow: #fff 0px 1px 0px; } #adminmenu .wp-submenu ul { @@ -1341,8 +1369,7 @@ div.star.select:hover { } .tablenav .tablenav-pages a:hover { - color: #fff; - background-color: #d54e21; + color: #d54e21; border-color: #d54321; } @@ -1433,8 +1460,9 @@ form p.submit a.cancel:hover { } #favorite-first { - border-color: #464646; background: #797979 url(../images/fav.png) repeat-x 0 center; + border-color: #777 !important; + border-bottom-color: #666 !important; } #favorite-inside { @@ -1451,8 +1479,8 @@ form p.submit a.cancel:hover { } #favorite-inside a:hover { - background-color: #8f8f8f; color: #fff; + text-decoration: underline; } #favorite-actions .slide-down { diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 08f2df9cf0..7a3fe180e5 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -316,7 +316,8 @@ td.help { } .button-primary, -.submit .button-primary { +.submit .button-primary, +#login form .submit input { border-color: #21759B; font-weight: bold; color: #FFF; @@ -371,7 +372,7 @@ div.dashboard-widget-submit input:hover, border-color: #328ab2; } -.button-primary:hover { +.button-primary:hover, #login form .submit input:hover { color: #EAF2FA; } @@ -551,10 +552,18 @@ li.widget-list-control-item h4, background-color: #fffbcc; } -#edit-slug-box strong, .login #nav a, .tablenav .displaying-num { +#edit-slug-box strong, .tablenav .displaying-num { color: #777; } +.login #nav a { + color: #21759b !important; +} + +.login #nav a:hover { + color: #d54e21 !important; +} + #footer, #footer-upgrade { background: #464646; diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index 8389b1ba65..c75ab41ab7 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -360,6 +360,10 @@ h6 { border-style: solid; padding: 0 0.6em; margin: 3px 15px 5px; + -moz-border-radius: 3px; + -khtml-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } .updated p, diff --git a/wp-admin/css/login.css b/wp-admin/css/login.css index e465a19cbc..862516ffe8 100644 --- a/wp-admin/css/login.css +++ b/wp-admin/css/login.css @@ -3,35 +3,53 @@ body { border-top-width: 30px; border-top-style: solid; - font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font: 11px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; } form { margin-left: 8px; padding: 16px 16px 40px 16px; - font-weight: bold; - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - -webkit-border-radius: 5px; + font-weight: normal; + -moz-border-radius: 11px; + -khtml-border-radius: 11px; + -webkit-border-radius: 11px; border-radius: 5px; + background: #fff; + border: 1px solid #e5e5e5; + -webkit-box-shadow: rgba(200,200,200,1) 0 4px 18px; } -form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0;} +form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0; } #login form .submit input { font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 3px 5px; + padding: 3px 10px; border: none; - font-size: 13px; + font-size: 12px; border-width: 1px; border-style: solid; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; + -moz-border-radius: 11px; + -khtml-border-radius: 11px; + -webkit-border-radius: 11px; + border-radius: 11px; cursor: pointer; text-decoration: none; - margin-top: -6px; + margin-top: -3px; + text-shadow: rgba(0,0,0,0.3) 0 -1px 0; +} + +#login form p { + margin-bottom: 0; +} + +label { + color: #777; + font-size: 13px; +} + +form .forgetmenot label { + font-size: 11px; + line-height: 19px; } form .submit { float: right; } @@ -39,15 +57,19 @@ form .submit { float: right; } form p { margin-bottom: 24px; } h1 a { - background: url(../images/logo-login.gif) no-repeat; - width: 292px; - height: 66px; + background: url(../images/logo-login.gif) no-repeat top center; + width: 326px; + height: 67px; text-indent: -9999px; overflow: hidden; padding-bottom: 15px; display: block; } +#nav { + text-shadow: rgba(255,255,255,1) 0 1px 0; +} + #backtoblog a { position: absolute; top: 7px; @@ -55,20 +77,28 @@ h1 a { text-decoration: none; } -#login { width: 292px; margin: 7em auto; } +#login { width: 320px; margin: 7em auto; } #login_error, .message { margin: 0 0 16px 8px; border-width: 1px; border-style: solid; padding: 12px; + -moz-border-radius: 3px; + -khtml-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } #nav { margin: 0 0 0 8px; padding: 16px; } #user_pass, #user_login, #user_email { - font-size: 20px; + font-size: 24px; width: 97%; padding: 3px; + margin-top: 2px; margin-right: 6px; -} \ No newline at end of file + margin-bottom: 16px; + border: 1px solid #e5e5e5; + background: #f9f9f9; +} diff --git a/wp-admin/images/logo-login.gif b/wp-admin/images/logo-login.gif index a9445107aa..72422b206f 100644 Binary files a/wp-admin/images/logo-login.gif and b/wp-admin/images/logo-login.gif differ diff --git a/wp-login.php b/wp-login.php index a59463ca30..d9cfb480cc 100644 --- a/wp-login.php +++ b/wp-login.php @@ -323,7 +323,7 @@ case 'retrievepassword' : -
+