WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Combine font-family, remove few unused bits, props ocean90, see #18314 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-10-03 16:36:19 +00:00
parent 69994de5d1
commit 6e0729790f
3 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/wp-admin.css
View File

File diff suppressed because one or more lines are too long

97
wp-admin/css/wp-admin.dev.css
View File

@ -626,10 +626,9 @@ div.error p {
.wrap h2, .wrap h2,
.subtitle { .subtitle {
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
text-shadow: rgba(255,255,255,1) 0 1px 0; text-shadow: #fff 0 1px 0;
} }
.wrap h2 { .wrap h2 {
@ -718,9 +717,38 @@ div.error p {
1.0 - Text Styles 1.0 - Text Styles
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
div.sidebar-name h3,
#menu-management .nav-tab,
#dashboard_plugins h5,
a.rsswidget,
#dashboard_right_now td.b,
#dashboard-widgets h4,
.tool-box .title,
#poststuff h3,
.metabox-holder h3,
.pressthis a,
#your-profile legend,
.inline-edit-row fieldset span.title,
.inline-edit-row fieldset span.checkbox-title,
.tablenav .displaying-num,
.welcome-panel h3,
.widefat th,
#wphead h1,
.quicktags, .quicktags,
.search { .search {
font: 12px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
}
h2 .nav-tab,
.wrap h2,
.subtitle,
.login form .input {
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
}
.quicktags,
.search {
font-size: 12px;
} }
.icon32 { .icon32 {
@ -1373,7 +1401,8 @@ form.upgrade .hint {
} }
#wphead h1 { #wphead h1 {
font: normal 16px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-style: normal;
font-size: 16px;
padding: 6px 8px 5px; padding: 6px 8px 5px;
margin: 0; margin: 0;
float: left; float: left;
@ -1382,6 +1411,7 @@ form.upgrade .hint {
#wphead h1 a:hover { #wphead h1 a:hover {
text-decoration:none; text-decoration:none;
} }
#wphead h1 a:hover #site-title { #wphead h1 a:hover #site-title {
text-decoration:underline; text-decoration:underline;
} }
@ -1669,6 +1699,7 @@ form.upgrade .hint {
top: -5px; top: -5px;
left: 26px; left: 26px;
} }
.js #adminmenu .wp-submenu.sub-open { .js #adminmenu .wp-submenu.sub-open {
padding: 0 8px 8px 0; padding: 0 8px 8px 0;
} }
@ -1758,6 +1789,7 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
#adminmenu li.wp-not-current-submenu li { #adminmenu li.wp-not-current-submenu li {
margin-left: 8px; margin-left: 8px;
} }
.folded #adminmenu li.wp-not-current-submenu li { .folded #adminmenu li.wp-not-current-submenu li {
margin-left: 0; margin-left: 0;
} }
@ -1772,6 +1804,7 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
.wp-menu-arrow { .wp-menu-arrow {
display: none; display: none;
} }
#adminmenu li.wp-has-current-submenu .wp-menu-arrow, #adminmenu li.wp-has-current-submenu .wp-menu-arrow,
#adminmenu li.menu-top.current .wp-menu-arrow, #adminmenu li.menu-top.current .wp-menu-arrow,
#adminmenu li.wp-has-submenu:hover .wp-menu-arrow { #adminmenu li.wp-has-submenu:hover .wp-menu-arrow {
@ -1786,6 +1819,7 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
#adminmenu li.menu-top:hover .wp-menu-arrow { #adminmenu li.menu-top:hover .wp-menu-arrow {
z-index: 1500; z-index: 1500;
} }
.folded #adminmenu li.menu-top:hover .wp-menu-arrow { .folded #adminmenu li.menu-top:hover .wp-menu-arrow {
display: none; display: none;
} }
@ -2016,7 +2050,6 @@ body.admin-bar #adminmenu {
} }
.widefat th { .widefat th {
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-weight: normal; font-weight: normal;
} }
@ -2168,7 +2201,6 @@ body.admin-bar #adminmenu {
} }
.welcome-panel h3 { .welcome-panel h3 {
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-size: 24px; font-size: 24px;
font-weight: normal; font-weight: normal;
} }
@ -2319,7 +2351,6 @@ th.asc:hover span.sorting-indicator {
} }
/* Bulk Actions */ /* Bulk Actions */
.tablenav-pages a { .tablenav-pages a {
border-bottom-style: solid; border-bottom-style: solid;
border-bottom-width: 2px; border-bottom-width: 2px;
@ -2381,7 +2412,6 @@ th.asc:hover span.sorting-indicator {
.tablenav .displaying-num { .tablenav .displaying-num {
margin-right: 10px; margin-right: 10px;
font-size: 12px; font-size: 12px;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-style: italic; font-style: italic;
} }
@ -2592,7 +2622,6 @@ tr.inline-edit-row td {
width: 6em; width: 6em;
} }
/* Styling */ /* Styling */
.inline-edit-row h4 { .inline-edit-row h4 {
text-transform: uppercase; text-transform: uppercase;
@ -2600,7 +2629,6 @@ tr.inline-edit-row td {
.inline-edit-row fieldset span.title, .inline-edit-row fieldset span.title,
.inline-edit-row fieldset span.checkbox-title { .inline-edit-row fieldset span.checkbox-title {
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-style: italic; font-style: italic;
line-height: 1.8em; line-height: 1.8em;
} }
@ -2998,6 +3026,7 @@ div.tabs-panel-inactive {
#normal-sortables .comments-box { #normal-sortables .comments-box {
border: 0 none; border: 0 none;
} }
ul.category-tabs, ul.category-tabs,
ul.add-menu-item-tabs, ul.add-menu-item-tabs,
ul.wp-tab-bar { ul.wp-tab-bar {
@ -3040,7 +3069,6 @@ ul.wp-tab-bar li {
} }
/* positioning etc. */ /* positioning etc. */
form#tags-filter { form#tags-filter {
position: relative; position: relative;
} }
@ -3060,7 +3088,6 @@ form#tags-filter {
} }
/* Edit posts */ /* Edit posts */
td.post-title strong, td.plugin-title strong { td.post-title strong, td.plugin-title strong {
display: block; display: block;
margin-bottom: .2em; margin-bottom: .2em;
@ -3071,7 +3098,6 @@ td.post-title p, td.plugin-title p {
} }
/* Global classes */ /* Global classes */
.wp-hidden-children .wp-hidden-child, .wp-hidden-children .wp-hidden-child,
.ui-tabs-hide { .ui-tabs-hide {
display: none; display: none;
@ -4068,7 +4094,7 @@ span.imgedit-scale-warn {
.form-table th, .form-table th,
.form-wrap label { .form-wrap label {
font-weight: normal; font-weight: normal;
text-shadow: rgba(255,255,255,1) 0 1px 0; text-shadow: #fff 0 1px 0;
} }
.form-table th { .form-table th {
@ -4394,7 +4420,7 @@ div#custom-background-image img {
border-color: #dfdfdf #dfdfdf #fff; border-color: #dfdfdf #dfdfdf #fff;
border-width: 1px 1px 0; border-width: 1px 1px 0;
color: #aaa; color: #aaa;
text-shadow: rgba(255,255,255,1) 0 1px 0; text-shadow: #fff 0 1px 0;
font-size: 12px; font-size: 12px;
line-height: 16px; line-height: 16px;
display: inline-block; display: inline-block;
@ -4424,7 +4450,6 @@ h2.nav-tab-wrapper, h3.nav-tab-wrapper {
h2 .nav-tab { h2 .nav-tab {
padding: 4px 10px 6px; padding: 4px 10px 6px;
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
font-weight: 200; font-weight: 200;
font-size: 20px; font-size: 20px;
line-height: 24px; line-height: 24px;
@ -4524,7 +4549,6 @@ input.button-highlighted,
} }
#your-profile legend { #your-profile legend {
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-size: 22px; font-size: 22px;
} }
@ -4572,7 +4596,9 @@ input.button-highlighted,
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
border: 1px #b4b4b4 solid; border: 1px #b4b4b4 solid;
font: normal normal normal 14px/16px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-style: normal;
line-height: 16px;
font-size: 14px;
text-decoration: none; text-decoration: none;
text-shadow: #fff 0 1px 0px; text-shadow: #fff 0 1px 0px;
} }
@ -4759,7 +4785,6 @@ table.form-table td .updated {
#poststuff h3, #poststuff h3,
.metabox-holder h3 { .metabox-holder h3 {
font-size: 15px; font-size: 15px;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-weight: normal; font-weight: normal;
padding: 7px 10px; padding: 7px 10px;
margin: 0; margin: 0;
@ -4798,20 +4823,11 @@ td.post-title p, td.plugin-title p {
text-decoration: none; text-decoration: none;
} }
.tool-box {
margin: 15px 0 35px;
max-width: 650px;
}
.tool-box .buttons {
margin: 15px 0;
}
.tool-box .title { .tool-box .title {
margin: 8px 0; margin: 8px 0;
font: 18px/24px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-size: 18px;
} font-weight: normal;
line-height: 24px;
.pressthis a {
font-size: 1.2em;
} }
#sidemenu { #sidemenu {
@ -4870,7 +4886,6 @@ table .column-rating {
text-align: left; text-align: left;
} }
/* Scrollbar fix for bulk upgrade iframe */ /* Scrollbar fix for bulk upgrade iframe */
body.iframe { body.iframe {
height: 98%; height: 98%;
@ -5068,7 +5083,6 @@ div.postbox div.inside {
} }
#dashboard-widgets h4 { #dashboard-widgets h4 {
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-weight: normal; font-weight: normal;
font-size: 13px; font-size: 13px;
margin: 0 0 .2em; margin: 0 0 .2em;
@ -5076,7 +5090,6 @@ div.postbox div.inside {
} }
/* Right Now */ /* Right Now */
#dashboard_right_now p.sub, #dashboard_right_now p.sub,
#dashboard_right_now .table, #dashboard_right_now .versions { #dashboard_right_now .table, #dashboard_right_now .versions {
margin: -12px; margin: -12px;
@ -5126,7 +5139,6 @@ div.postbox div.inside {
#dashboard_right_now td.b { #dashboard_right_now td.b {
padding-right: 6px; padding-right: 6px;
text-align: right; text-align: right;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-size: 14px; font-size: 14px;
width: 1%; width: 1%;
} }
@ -5179,7 +5191,6 @@ div.postbox div.inside {
} }
/* Recent Comments */ /* Recent Comments */
#dashboard_recent_comments h3 { #dashboard_recent_comments h3 {
margin-bottom: 0; margin-bottom: 0;
} }
@ -5256,7 +5267,6 @@ div.postbox div.inside {
} }
/* QuickPress */ /* QuickPress */
#dashboard_quick_press h4 { #dashboard_quick_press h4 {
font-family: sans-serif; font-family: sans-serif;
float: left; float: left;
@ -5344,7 +5354,6 @@ div.postbox div.inside {
} }
/* Feeds */ /* Feeds */
.rss-widget ul { .rss-widget ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -5353,7 +5362,6 @@ div.postbox div.inside {
a.rsswidget { a.rsswidget {
font-size: 13px; font-size: 13px;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
line-height: 1.7em; line-height: 1.7em;
} }
@ -5383,8 +5391,8 @@ a.rsswidget {
#dashboard_plugins h4 { #dashboard_plugins h4 {
line-height: 1.7em; line-height: 1.7em;
} }
#dashboard_plugins h5 { #dashboard_plugins h5 {
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-weight: normal; font-weight: normal;
font-size: 13px; font-size: 13px;
margin: 0; margin: 0;
@ -5551,7 +5559,7 @@ a.rsswidget {
.login #nav, .login #nav,
.login #backtoblog { .login #backtoblog {
text-shadow: rgba(255,255,255,1) 0 1px 0; text-shadow: #fff 0 1px 0;
margin: 0 0 0 16px; margin: 0 0 0 16px;
padding: 16px 16px 0; padding: 16px 16px 0;
} }
@ -5561,7 +5569,6 @@ a.rsswidget {
} }
.login form .input { .login form .input {
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
font-weight: 200; font-weight: 200;
font-size: 24px; font-size: 24px;
width: 97%; width: 97%;
@ -5770,7 +5777,6 @@ a.rsswidget {
#menu-management .nav-tab { #menu-management .nav-tab {
margin-bottom: 0; margin-bottom: 0;
font-size: 14px; font-size: 14px;
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
} }
@ -6478,10 +6484,8 @@ img {
} }
.press-this #wphead h1 { .press-this #wphead h1 {
font: normal 16px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
padding: 6px 0 0; padding: 6px 0 0;
margin: 0; font-weight: normal;
float: left;
} }
.press-this #wphead h1 a { .press-this #wphead h1 a {
@ -7090,7 +7094,6 @@ div.widget-liquid-right {
} }
div.sidebar-name h3 { div.sidebar-name h3 {
font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
font-weight: normal; font-weight: normal;
font-size: 15px; font-size: 15px;
margin: 0; margin: 0;

2
wp-includes/script-loader.php
View File

@ -431,7 +431,7 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr // Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' ); $no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111002' ); $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111003' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110919' ); $styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110919' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );