From 2c874f5189e0eac092286cf76eb33a10815ebd00 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 21 Feb 2008 00:27:23 +0000 Subject: [PATCH] Admin styling updates from mt. fixes #5940 git-svn-id: http://svn.automattic.com/wordpress/trunk@6950 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-header.php | 2 +- wp-admin/categories.php | 2 +- wp-admin/css/global.css | 10 ++- wp-admin/edit-category-form.php | 2 +- wp-admin/edit-form-advanced.php | 8 +-- wp-admin/edit-link-categories.php | 2 +- wp-admin/edit-link-category-form.php | 2 +- wp-admin/edit-link-form.php | 2 +- wp-admin/edit-page-form.php | 6 +- wp-admin/edit-pages.php | 2 +- wp-admin/edit-tag-form.php | 2 +- wp-admin/edit-tags.php | 2 +- wp-admin/edit.php | 4 +- wp-admin/import/blogger.php | 11 ++-- wp-admin/import/dotclear.php | 2 +- wp-admin/import/greymatter.php | 11 ++-- wp-admin/import/jkw.php | 4 +- wp-admin/import/textpattern.php | 14 ++-- wp-admin/import/wp-cat2tag.php | 4 +- wp-admin/includes/template.php | 2 +- wp-admin/link-manager.php | 4 +- wp-admin/upload.php | 4 +- wp-admin/users.php | 4 +- wp-admin/widgets.php | 4 +- wp-admin/wp-admin.css | 88 +++++++++++-------------- wp-content/themes/default/functions.php | 18 ++--- 26 files changed, 104 insertions(+), 112 deletions(-) diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 2de07d0d46..73ec721588 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -46,7 +46,7 @@ do_action('admin_head');

%2$s!'), 'profile.php', $user_identity) ?> | | Help'), 'http://codex.wordpress.org/') ?> | Forums'), 'http://wordpress.org/support/') ?>

diff --git a/wp-admin/categories.php b/wp-admin/categories.php index 41312ea5dd..4c4addba71 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -134,7 +134,7 @@ $messages[5] = __('Category not updated.');
- +
diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css index 169650f4d8..415d32a2b9 100644 --- a/wp-admin/css/global.css +++ b/wp-admin/css/global.css @@ -4,6 +4,12 @@ a { color: #2583ad; text-decoration: none; } a:hover, .subsubsub a:hover, .subsubsub a.current:hover { color: #d54e21; } +a:focus, a:active { + border: none; + -moz-outline: none; + outline: none; +} + body { background: #ffffff; color: #333333; @@ -93,7 +99,7 @@ textarea, input, select { clear: both; color: #666666; font: 24px Georgia, "Times New Roman", Times, serif; - margin: 0 0 0 -5px; + margin: 5px 0 0 -4px; padding: 0; - padding-bottom: 5px; + padding-bottom: 7px; } diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php index 701ba0e705..1d539a6374 100644 --- a/wp-admin/edit-category-form.php +++ b/wp-admin/edit-category-form.php @@ -43,7 +43,7 @@ if ( ! empty($cat_ID) ) { -

+

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 38f89fbb7a..b46fd0050d 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -45,7 +45,7 @@ if ('' != $post->pinged) { $pings .= ''; } -$saveasdraft = ''; +$saveasdraft = ''; ?> @@ -154,14 +154,14 @@ if ($post_ID) {

- + post_status, array('publish', 'future') ) || 0 == $post_ID ) { ?> - + - +

- +
diff --git a/wp-admin/edit-link-category-form.php b/wp-admin/edit-link-category-form.php index 9afd440899..8d1b864ef6 100644 --- a/wp-admin/edit-link-category-form.php +++ b/wp-admin/edit-link-category-form.php @@ -37,7 +37,7 @@ if ( ! empty($cat_ID) ) { -

+

diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index a387e49998..a108f8df87 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -73,7 +73,7 @@ function xfn_check($class, $value = '', $deprecated = '') {

- +

diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index eb0dc46495..49a39646e2 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -119,14 +119,14 @@ if ($post_ID) {

- + post_status, array('publish', 'future') ) || 0 == $post_ID ) { ?> - + - +

- +
diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php index f94d44f3a9..48071e222f 100644 --- a/wp-admin/edit-tag-form.php +++ b/wp-admin/edit-tag-form.php @@ -33,7 +33,7 @@ if ( ! empty($tag_ID) ) { -

+

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 6ca56c1edb..0275f2b1ff 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -144,7 +144,7 @@ if ( $page_links ) ?>
- +
diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 71970f5386..66e6e89eb1 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -135,7 +135,7 @@ if ( $page_links ) ?>
- + - +
diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index dfaf4fb53e..722bbff653 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -20,7 +20,7 @@ class Blogger_Import {

$title

$welcome

$prereqs

$stepone

- + @@ -178,7 +178,7 @@ class Blogger_Import { $init .= "blogs[$i]=new blog($i,'$blogtitle','{$blog['mode']}'," . $this->get_js_status($i) . ');'; $pstat = "

 
$pdone/{$blog['total_posts']}
"; $cstat = "
 
$cdone/{$blog['total_comments']}
"; - $rows .= "$blogtitle{$blog['host']}$pstat$cstat\n"; + $rows .= "$blogtitle{$blog['host']}$pstat$cstat\n"; } echo "

$title

\n$rows
$name$url$posts$comments$action
"; @@ -618,7 +618,7 @@ class Blogger_Import { foreach ( $blog['authors'] as $i => $author ) $rows .= ""; - return "

$heading

$blogtitle

$directions

$rows
$mapthis$tothis
"; + return "

$heading

$blogtitle

$directions

$rows
$mapthis$tothis
"; } function get_user_options($current) { @@ -788,7 +788,7 @@ class Blogger_Import { $restart = __('Restart'); $message = __('We have saved some information about your Blogger account in your WordPress database. Clearing this information will allow you to start over. Restarting will not affect any posts you have already imported. If you attempt to re-import a blog, duplicate posts and comments will be skipped.'); $submit = __('Clear account information'); - echo "

$restart

$message

"; + echo "

$restart

$message

"; } } @@ -821,9 +821,6 @@ thead td { font-weight: bold; } position: relative; text-align: center; } -.submit { - text-align: center !important; -} '; + echo ''; printf('', __('DotClear Database User:')); printf('', __('DotClear Database Password:')); printf('', __('DotClear Database Name:')); diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php index 0b92865394..1004f76aa5 100644 --- a/wp-admin/import/greymatter.php +++ b/wp-admin/import/greymatter.php @@ -36,7 +36,7 @@ class GM_Import {

-

+
@@ -46,17 +46,14 @@ class GM_Import { - - - - +

so you need to enter the number of the last GM post here.
(if you don't know that number, just log into your FTP and look it out
in the entries' folder)") ?>

+ so you need to enter the number of the last GM post here.
(if you don't know that number, just log into your FTP and look it out
in the entries' folder)") ?>

-

+

-

 

footer(); } diff --git a/wp-admin/import/jkw.php b/wp-admin/import/jkw.php index 7886fde11b..e475fae2ba 100644 --- a/wp-admin/import/jkw.php +++ b/wp-admin/import/jkw.php @@ -20,11 +20,11 @@ class JeromesKeyword_Import { echo '

'.__('Don’t be stupid - backup your database before proceeding!').'

'; echo '
'; wp_nonce_field('import-jkw'); - echo '

'; + echo '

'; echo '
'; echo '
'; wp_nonce_field('import-jkw'); - echo '

'; + echo '

'; echo '
'; echo '
'; } diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php index 1ee7121d5d..52c5ba9d73 100644 --- a/wp-admin/import/textpattern.php +++ b/wp-admin/import/textpattern.php @@ -46,7 +46,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); $this->db_form(); - echo '

'; + echo '

'; echo '
'; echo ''; } @@ -481,7 +481,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); - printf('', attribute_escape(__('Import Users'))); + printf('', attribute_escape(__('Import Users'))); echo '
'; } @@ -494,7 +494,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); - printf('', attribute_escape(__('Import Posts'))); + printf('', attribute_escape(__('Import Posts'))); echo '
'; } @@ -508,7 +508,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); - printf('', attribute_escape(__('Import Comments'))); + printf('', attribute_escape(__('Import Comments'))); echo '
'; } @@ -520,7 +520,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); - printf('', attribute_escape(__('Import Links'))); + printf('', attribute_escape(__('Import Links'))); echo '
'; } @@ -533,7 +533,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); - printf('', attribute_escape(__('Finish'))); + printf('', attribute_escape(__('Finish'))); echo '
'; } @@ -575,7 +575,7 @@ class Textpattern_Import { function db_form() { - echo ''; + echo '
'; printf('', __('Textpattern Database User:')); printf('', __('Textpattern Database Password:')); printf('', __('Textpattern Database Name:')); diff --git a/wp-admin/import/wp-cat2tag.php b/wp-admin/import/wp-cat2tag.php index 47fb19b23a..0f271cecaf 100644 --- a/wp-admin/import/wp-cat2tag.php +++ b/wp-admin/import/wp-cat2tag.php @@ -68,7 +68,7 @@ function check_all_rows() { -

'; +

'; wp_nonce_field('import-cat2tag'); echo ''; - echo '

'; + echo '

'; echo ''; } diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 097614c833..17b400a66d 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -945,7 +945,7 @@ function wp_import_upload_form( $action ) {

- +

- + \n"; @@ -109,7 +109,7 @@ echo $select_cat; echo $select_order; ?> - +
diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 1dc1cc174d..3d293e24ac 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -138,7 +138,7 @@ if ( $page_links ) ?>
- + - +
diff --git a/wp-admin/users.php b/wp-admin/users.php index 2b8a8a65ca..a472151b22 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -149,7 +149,7 @@ case 'delete': '.__('Attribute all posts and links to:')." $user_dropdown"; ?> -

+

@@ -293,7 +293,7 @@ unset($role_links);
- +
diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 67961f687d..1e86881063 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -193,7 +193,7 @@ if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?> - +

@@ -210,7 +210,7 @@ if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?> - + diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 8ad3586142..1e8b7d995e 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -17,12 +17,6 @@ a.delete:hover { font-size: 16px; } -#import-upload-form { - margin: auto; - background: #eee; - padding: 1em; -} - .form-invalid { background-color: #FF9999 !important; } @@ -131,19 +125,24 @@ form#upload #post_content { margin: 1.5em 0; } -.submit input, .submit input:focus, .button, .button:focus { +.submit input, .button, .button-secondary { font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - color: #246; padding: 4px 6px; - background: #e5e5e5; border: none; + font-size: 13px; -moz-border-radius: 2px; -khtml-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; + color: #246; + background: #e5e5e5; } -.submit input:hover, .button:hover { +.button-secondary { + background: #cee1ef; +} + +.submit input:hover, .button:hover, .button-secondary:hover { color: #d54e21; } @@ -154,10 +153,6 @@ select { padding: none; } -.editform th, #postcustomsubmit { - text-align: right; -} - .submit a{ color: #fff; } @@ -515,13 +510,6 @@ p.pagenav { margin: 0 6px; } -.tablenav .button, -div.nav .button, -.niceblue tr .button { - padding: 4px 6px; - background: #cee1ef; -} - .tablenav .dots { background-color: #e4f2fd; border-color: #e4f2fd; @@ -608,9 +596,9 @@ a.view-comment-post-link { #user_info { position: absolute; right: 15%; - top: 9px; + top: 11px; color: #ccc; - font-size: 12px; + font-size: 11px; } #user_info p { @@ -622,6 +610,10 @@ a.view-comment-post-link { color: #fff; } +#user_info a:hover { + text-decoration: underline; +} + #wphead { border-top: 30px solid #464646; background: #e4f2fd; @@ -650,7 +642,7 @@ a.view-comment-post-link { #wphead h1 { font: normal 36px Georgia, "Times New Roman", Times, serif; color: #555; - padding: 15px 170px 18px 15px; + padding: 11px 170px 16px 12px; margin: 0; margin-right: 15%; } @@ -661,10 +653,10 @@ a.view-comment-post-link { margin: 0; list-style: none; position: absolute; - top: 5px; + top: 7px; left: 0; - font-size: 12px; - padding-left: 12px; + font-size: 11px; + padding-left: 9px; } #dashmenu a { @@ -674,7 +666,7 @@ a.view-comment-post-link { margin-right: 8px; } -#dashmenu a:hover, #dashmenu a.current, #dashmenu a.current:hover { +#dashmenu a.current { background: #e4f2fd; color: #555; -moz-border-radius-topleft: 3px; @@ -687,12 +679,20 @@ a.view-comment-post-link { border-top-right-radius: 3px; } +#dashmenu a:hover { + color: #fff; +} + +#dashmenu a.current:hover { + color: #555; +} + #adminmenu { margin: 0; list-style: none; background-color: #e4f2fd; border-bottom: 1px solid #c6d9e9; - padding-left: 15px; + padding-left: 11px; } /* Because we don't want visited on these links */ @@ -702,15 +702,16 @@ a.view-comment-post-link { #adminmenu a { font-size: 16px; - padding: 6px 7px 6px 7px; - line-height: 200%; + padding: 6px 7px; + line-height: 195%; } -#adminmenu a:hover, #adminmenu a.current, #adminmenu a.current:hover { +#adminmenu a.current { background: #fff; color: #d54e21; border: 1px solid #c6d9e9; - font-weight: bold; + border-bottom: 2px solid #fff; + font-weight: normal; padding: 6px; -moz-border-radius-topleft: 4px; -khtml-border-top-left-radius: 4px; @@ -723,16 +724,11 @@ a.view-comment-post-link { } #adminmenu a:hover { - border-bottom: 0; - font-weight: normal; -} - -#adminmenu a.current, #adminmenu a.current:hover { - border-bottom: 2px solid #fff; + color: #d54e21; } #sidemenu { - margin: 0; + margin: 0 -3px 0 0; color: #999; list-style: none; position: absolute; @@ -762,8 +758,7 @@ a.view-comment-post-link { #adminmenu li a #awaiting-mod { position: absolute; - margin-left: -1.2em; - margin-top: -0.2em; + margin-left: -0.2em; font-size: 0.7em; background-image: url(images/comment-stalk.gif); background-repeat: no-repeat; @@ -843,7 +838,7 @@ strong .post-com-count span { #submenu { margin: 0; list-style: none; - padding: 12px 0 15px 0; + padding: 7px 0 15px 0; } #submenu a { @@ -871,7 +866,7 @@ html, body { min-height: 100%; } #wpcontent{ - padding-bottom: 65px; + padding-bottom: 95px; } #footer { clear: both; @@ -881,7 +876,7 @@ html, body { background: #464646 url('images/logo-ghost.png') no-repeat 20px 10px; color: #999; position: relative; -// margin-top: -75px; + margin-top: -75px; } #footer a { @@ -1006,9 +1001,6 @@ html, body { border-bottom: 1px solid #ccc; padding: 2px; margin-bottom: 10px; -} - -#poststuff .postarea { margin-right: 8px; } diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php index 4c65eb60ef..e0451e7df4 100644 --- a/wp-content/themes/default/functions.php +++ b/wp-content/themes/default/functions.php @@ -157,7 +157,7 @@ function kubrick_theme_page_head() { kUpdate(ColorPicker_targetInput.id); } function PopupWindow_populate(contents) { - contents += '

'; + contents += '

'; this.contents = contents; this.populated = false; } @@ -386,18 +386,18 @@ function kubrick_theme_page() {
- - - - - + + + + + -

+

@@ -406,8 +406,8 @@ function kubrick_theme_page() {


-
-
+
+