diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 03bb7b8ec9..6a66b3578c 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -102,7 +102,6 @@ textarea.disabled { } li.widget-list-control-item h4.widget-title a:hover, -#footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, @@ -207,6 +206,9 @@ ul#widget-list li.widget-list-item h4.widget-title { border-right-color: #99d; } +#media-upload { + background: #fff; +} #media-upload .slidetoggle { border-top-color: #dfdfdf; } @@ -297,31 +299,41 @@ td.help { .button, .submit input { - border-color: #DCDCDC; + border-color: #bbb; color: #464646; } +.button:hover, +.submit input:hover { + color: #000; + border-color: #666; +} + .button, .submit input, .button-secondary { background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top; } -.button-secondary, -.submit .button-secondary { - border-color: #CFE1EF; - color: #464646; +.button:active, +.submit input:active, +.button-secondary:active { + background: #eee url(../images/white-grad-active.png) repeat-x scroll left top; } .button-primary, .submit .button-primary, #login form .submit input { - border-color: #21759B; + border-color: #298cba; font-weight: bold; color: #FFF; background: #21759B url(../images/button-grad.png) repeat-x scroll left top; } +.button-primary:active, #login form .submit input:active { + background: #21759b url(../images/button-grad-active.png) repeat-x scroll left top !important; +} + .button[disabled], .button:disabled, .button-primary[disabled], @@ -331,21 +343,16 @@ td.help { a.button.disabled { background: #ddd; color: #888; -} - -.button:hover, -.submit input:hover, -#postcustomstuff .submit input:hover { - border-color: #535353; + text-shadow: rgba(255,255,255,0.6) 0 1px 0; + border-color: #ccc; } a:active, a:focus { - color: #d54e21 !important; + color: #d54e21; } a:hover, -.button:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #adminmenu ul.wp-submenu a:hover, @@ -365,13 +372,9 @@ div.dashboard-widget-submit input:hover, border-color: #dfdfdf; } -.button-secondary:hover, -#login form .submit input:hover { - border-color: #328ab2; -} - .button-primary:hover, #login form .submit input:hover { - color: #EAF2FA; + border-color: #13455b !important; + color: #EAF2FA !important; } #side-info-column #category-tabs .ui-tabs-selected a { @@ -509,7 +512,7 @@ body.press-this .ui-tabs-selected a:hover { } div#media-upload-header { - background-color: #f1f1f1; + background-color: #f9f9f9; border-bottom-color: #dfdfdf; } @@ -738,20 +741,19 @@ 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 { +#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited { color: #ccc; text-decoration: none; } +#user_info a:hover, #footer a:hover { + color: #fff; + text-decoration: underline !important; +} + +#user_info a:active, #footer a:active { + color: #ccc !important; +} div#media-upload-error, .file-error, @@ -1241,8 +1243,8 @@ table.diff .diff-addedline ins { /* edit image */ #sidemenu a { - background-color: #f1f1f1; - border-color: #f1f1f1; + background-color: #f9f9f9; + border-color: #f9f9f9; border-bottom-color: #dfdfdf; } @@ -1405,6 +1407,7 @@ div.star.select:hover { form p.submit a.cancel { border-color: red; color: red; + text-shadow: none; } form p.submit a.cancel:hover { @@ -1475,12 +1478,15 @@ form p.submit a.cancel:hover { } #favorite-actions a { - color: #eee; + color: #ddd; text-shadow: rgba(0,0,0,0.2) 0 -1px 0; } -#favorite-inside a:hover { +#favorite-actions a:hover { color: #fff; +} + +#favorite-inside a:hover { text-decoration: underline; } diff --git a/wp-admin/css/dashboard.css b/wp-admin/css/dashboard.css index 84d861238d..fa84405be4 100644 --- a/wp-admin/css/dashboard.css +++ b/wp-admin/css/dashboard.css @@ -89,15 +89,14 @@ div.postbox div.inside { font-size: 1em; font-weight: normal; font-style: italic; - font-family: Georgia, serif; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; } /* Right Now */ #dashboard_right_now p.sub, #dashboard_right_now .table, #dashboard_right_now .versions { - margin: -10px; - font-family: Georgia, serif; + margin: -12px; } #dashboard_right_now .inside { @@ -106,8 +105,10 @@ div.postbox div.inside { #dashboard_right_now p.sub { font-style: italic; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; padding: 5px 10px 15px; color: #777; + font-size: 13px; } #dashboard_right_now .table { @@ -135,7 +136,7 @@ div.postbox div.inside { #dashboard_right_now td.b { padding-right: 6px; text-align: right; - font-family: Georgia, "Times New Roman", Times, serif; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-size: 14px; } @@ -175,15 +176,8 @@ div.postbox div.inside { padding: 6px 10px 12px; } -#dashboard_right_now .versions, -#dashboard_right_now .versions p { - font-style: italic; - font-size: 13px; -} - -#dashboard_right_now .versions a, #dashboard_right_now .versions .b { - font-style: normal; + font-weight: bold; } #dashboard_right_now a.button { @@ -275,12 +269,12 @@ div.postbox div.inside { #dashboard_quick_press h4 { float: left; - width: 5em; + width: 5.5em; clear: both; font-weight: normal; - font-style: italic; - font-family: Georgia, serif; text-align: right; + padding-top: 5px; + font-size: 12px; } #dashboard_quick_press h4 label { @@ -334,7 +328,7 @@ div.postbox div.inside { } #dashboard_recent_drafts h4 abbr { - font-family: Georgia, serif; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; color: #999; } @@ -369,7 +363,7 @@ a.rsswidget { } .rss-widget span.rss-date { - font-family: Georgia, serif; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; } .rss-widget cite { @@ -399,5 +393,5 @@ a.rsswidget { #dashboard_plugins p { margin: 0 0 1em; - line-height: 1.5em; + line-height: 1.4em; } diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index 6ae9df26c5..0d6a04df82 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -162,7 +162,7 @@ input[type="radio"] { body, td { - font: 13px "Lucida Grande", Verdana, Arial, sans-serif; + font: 13px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } p { @@ -193,7 +193,7 @@ dt { textarea, input, select { - font: 13px/19px "Lucida Grande", Verdana, Arial, sans-serif; + font: 13px/19px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; margin: 1px; padding: 3px; } @@ -383,18 +383,19 @@ h6 { .updated p, .error p { - margin: 0.6em 0; + margin: 0.5em 0; } .wrap .updated, .wrap .error { - margin: 0 0 12px; + margin: 5px 0 12px; } .wrap h2 { - font: italic normal normal 24px/29px Georgia, "Times New Roman", Times, serif; + font: italic normal normal 24px/29px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; margin: 0; padding: 12px 15px 1px 0; + text-shadow: rgba(255,255,255,1) 0px 1px 0px; } .wrap h2.long-header { diff --git a/wp-admin/css/login.css b/wp-admin/css/login.css index 91f98883cc..9f806e79ea 100644 --- a/wp-admin/css/login.css +++ b/wp-admin/css/login.css @@ -3,7 +3,7 @@ body { border-top-width: 30px; border-top-style: solid; - font: 11px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font: 11px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } form { @@ -25,7 +25,7 @@ form { 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; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; padding: 3px 10px; border: none; font-size: 12px; diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css index 8ccae7da42..94fc0c9b68 100644 --- a/wp-admin/css/media.css +++ b/wp-admin/css/media.css @@ -43,6 +43,7 @@ th { } .media-upload-form label.form-help, td.help { + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; font-style: italic; font-weight: normal; } @@ -232,6 +233,7 @@ abbr.required { #media-upload p.help, #media-upload label.help { + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; font-style: italic; font-weight: normal; } diff --git a/wp-admin/images/button-grad-active.png b/wp-admin/images/button-grad-active.png new file mode 100644 index 0000000000..0177e5bf9e Binary files /dev/null and b/wp-admin/images/button-grad-active.png differ diff --git a/wp-admin/images/white-grad-active.png b/wp-admin/images/white-grad-active.png new file mode 100644 index 0000000000..04780150b1 Binary files /dev/null and b/wp-admin/images/white-grad-active.png differ diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 4a6b202bc5..8a8b8ed397 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -183,7 +183,7 @@ kbd, code { } .quicktags, .search { - font: 12px Georgia, "Times New Roman", Times, serif; + font: 12px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; } .submit { @@ -332,7 +332,7 @@ form p.submit a.cancel:hover { .button-secondary, .button-highlighted, #postcustomstuff .submit input { - font-family: "Lucida Grande", Verdana, Arial, sans-serif; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; text-decoration: none; font-size: 11px !important; line-height: 16px; @@ -373,7 +373,7 @@ a.button { } #wpcontent select { - font: 11px/20px "Lucida Grande", Verdana, Arial, sans-serif; + font: 11px/20px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; padding: 2px; border-width: 1px; border-style: solid; @@ -489,14 +489,14 @@ textarea.all-options, input.all-options { } #ed_toolbar input { - margin: 3px 2px 4px; + margin: 3px 1px 4px; line-height: 18px; display: inline-block; border-width: 1px; border-style: solid; min-width: 26px; padding: 2px 4px; - font-size: 13px; + font-size: 12px; -moz-border-radius: 3px; -khtml-border-radius: 3px; -webkit-border-radius: 3px; @@ -671,7 +671,7 @@ set display: none; */ } #your-profile legend { - font-family: Georgia, "Times New Roman", Times, serif; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-size: 22px; } @@ -769,7 +769,7 @@ p.pagenav { .tablenav .displaying-num { margin-right: 10px; font-size: 12px; - font-family: Georgia, "Times New Roman", Times, serif; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-style: italic; } @@ -860,14 +860,14 @@ a#view-site-link { } #wphead h1 { - font: normal 22px Georgia, "Times New Roman", Times, serif; + font: normal 22px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; padding: 10px 10px 5px; margin: 0; float: left; } #wphead h1.long-title { - font: normal 18px Georgia, "Times New Roman", Times, serif; + font: normal 18px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; padding: 12px 10px 5px; } @@ -897,7 +897,7 @@ a#view-site-link { } #adminmenu .wp-submenu a { - font: normal 11px/18px "Lucida Grande", Verdana, Arial, sans-serif; + font: normal 11px/18px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } #adminmenu .wp-submenu li.current, @@ -908,7 +908,7 @@ a#view-site-link { #adminmenu a.menu-top, #adminmenu .wp-submenu-head { - font: normal 13px/18px Georgia, "Times New Roman", Times, serif; + font: normal 13px/18px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; } .folded #adminmenu, @@ -1188,14 +1188,14 @@ html, body { #footer { word-spacing: .3em; - font-size: 11px; + font-size: 12px; margin-top: -47px; } -#footer #footer-thankyou, #footer #footer-upgrade { - font-size: 13px; +#footer #footer-thankyou, #footer #footer-upgrade, #footer #footer-thankyou a, #footer #footer-upgrade a { + font-size: 12px; word-spacing: 0; - font-family: Georgia, "Times New Roman", Times, serif; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-style: italic; } @@ -1209,8 +1209,9 @@ html, body { padding: 15px; } -#footer p a { +#footer a { text-decoration: none; + font-size: 11px; } #footer p a:hover { @@ -1239,6 +1240,7 @@ html, body { .form-table th, .form-wrap label { font-weight: normal; + text-shadow: rgba(255,255,255,1) 0 1px 0; } .form-table th, @@ -1363,7 +1365,7 @@ table.form-table td .updated { .setting-description, .form-wrap p { font-style: italic; - font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; + font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } .form-wrap .form-field { @@ -1549,7 +1551,7 @@ table.form-table td .updated { .howto { font-style: italic; display: block; - font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; + font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } .ac_results { @@ -1645,6 +1647,13 @@ table.form-table td .updated { 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; + -khtml-border-top-right-radius: 6px; + -khtml-border-top-left-radius: 6px; + border-top-right-radius: 6px; + border-top-left-radius: 6px; } .postbox table.form-table { @@ -2171,7 +2180,7 @@ fieldset { line-height: 2; margin: 0; padding: 4px 8px; - font: 18px "Lucida Grande", Verdana, Arial, sans-serif; + font: 18px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } #wp_editbtns { @@ -2481,8 +2490,8 @@ fieldset { #contextual-help-link-wrap { float: right; background: transparent url( images/screen-options-left.gif ) no-repeat 0 0; - font-family: "Lucida Grande", Verdana, Arial, sans-serif; - height: 23px; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + height: 22px; padding: 0; margin: 0 6px 0 0; } @@ -2700,7 +2709,7 @@ tr.inline-edit-row td { .inline-edit-row fieldset span.title, .inline-edit-row fieldset span.checkbox-title { - font-family: Georgia, serif; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-style: italic; } @@ -2759,7 +2768,7 @@ ul.cat-checklist { .inline-edit-row .catshow, .inline-edit-row .cathide, .inline-edit-row #bulk-titles div { - font-family: "Lucida Grande", Verdana, Arial, sans-serif; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; font-style: normal; font-size: 11px; } @@ -2830,7 +2839,6 @@ table .inline-edit-row fieldset ul.cat-hover { #wpbody-content .media-upload-form label { display: block; font-size: 13px; - font-weight: bold; margin: 0.5em; } @@ -3024,15 +3032,12 @@ abbr.required { #utc-time, #local-time { padding-left: 25px; font-style: italic; - font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, sans-serif; + font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } ul#dismissed-updates { display: none; } -ul.core-updates li { - padding: 12px; -} form.upgrade { margin-top: 8px; } @@ -3050,10 +3055,6 @@ form.upgrade { border-radius: 6px; } -#flash-upload-ui { - padding: 20px 12px 0; -} - br.clear { height: 2px; line-height: 2px; @@ -3112,3 +3113,7 @@ table.fixed { overflow: hidden; } +.widefat th { + text-shadow: rgba(255,255,255,0.8) 0 1px 0; +} + diff --git a/wp-includes/js/thickbox/thickbox.css b/wp-includes/js/thickbox/thickbox.css index a7c4a4012a..6c2b211991 100644 --- a/wp-includes/js/thickbox/thickbox.css +++ b/wp-includes/js/thickbox/thickbox.css @@ -3,12 +3,12 @@ /* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ /* ----------------------------------------------------------------------------------------------------------------*/ #TB_window { - font: 12px Arial, Helvetica, sans-serif; + font: 12px "Lucida Grande", Verdana, Arial, sans-serif; color: #333333; } #TB_secondLine { - font: 10px Arial, Helvetica, sans-serif; + font: 10px "Lucida Grande", Verdana, Arial, sans-serif; color:#666666; } @@ -49,10 +49,14 @@ z-index: 102; color:#000000; display:none; - border: 4px solid #525252; text-align:left; top:50%; left:50%; + border: 1px solid #555; + -moz-box-shadow: rgba(0,0,0,1) 0 4px 30px; + -webkit-box-shadow: rgba(0,0,0,1) 0 4px 30px; + -khtml-box-shadow: rgba(0,0,0,1) 0 4px 30px; + box-shadow: rgba(0,0,0,1) 0 4px 30px; } * html #TB_window { /* ie6 hack */ @@ -120,7 +124,7 @@ margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = d top: 50%; left: 50%; background-color: #E8E8E8; - border: 4px solid #525252; + border: 1px solid #555; margin: -45px 0pt 0pt -125px; padding: 40px 15px 15px; }