From 4d590699993b6c2c5fe01118164e48b753a8848b Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Mon, 27 Oct 2008 20:41:05 +0000 Subject: [PATCH] Fix button styling inconsistency on settings pages, props sivel, fixes #7975 git-svn-id: https://develop.svn.wordpress.org/trunk@9369 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/css/colors-fresh.css | 35 +++++++++++++-------------------- wp-admin/export.php | 4 ++-- wp-admin/import/btt.php | 4 ++-- wp-admin/import/dotclear.php | 12 +++++------ wp-admin/import/greymatter.php | 2 +- wp-admin/import/jkw.php | 4 ++-- wp-admin/import/mt.php | 4 ++-- wp-admin/import/stp.php | 6 +++--- wp-admin/import/textpattern.php | 12 +++++------ wp-admin/import/utw.php | 8 ++++---- wp-admin/options-discussion.php | 2 +- wp-admin/options-general.php | 2 +- wp-admin/options-media.php | 2 +- wp-admin/options-misc.php | 4 ++-- wp-admin/options-permalink.php | 2 +- wp-admin/options-privacy.php | 2 +- wp-admin/options-reading.php | 2 +- wp-admin/options-writing.php | 2 +- wp-admin/theme-editor.php | 2 +- wp-admin/user-edit.php | 2 +- wp-admin/users.php | 2 +- wp-admin/widgets.php | 3 ++- 22 files changed, 56 insertions(+), 62 deletions(-) diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 73643faadc..b02e535921 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -217,27 +217,12 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #666; } -.submit input, -#login form .submit input, -div.dashboard-widget-submit input, -#edit-slug-buttons a.save { - background-color: #e5e5e5; - color: #246; - border-color: #80b5d0; -} - .button { border-color: #DCDCDC; color: #464646; text-shadow: #FFF 0 1px 0; } -.button-primary { - border-color: #21759B; - color: #FFF; - background: #21759B url(../images/button-grad.png) repeat-x scroll left top; -} - .button-secondary { border-color: #CFE1EF; color: #464646; @@ -249,15 +234,22 @@ div.dashboard-widget-submit input, background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top; } +.button-primary { + border-color: #21759B; + color: #FFF; + background: #21759B url(../images/button-grad.png) repeat-x scroll left top; +} + .button[disabled], .button:disabled { background-color: #999; } -.submit input:hover, .button:hover, #edit-slug-buttons a.save:hover { +.button:hover, +#edit-slug-buttons a.save:hover { border-color: #535353; } -.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, +.button:hover, .button-secondary: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, div.dashboard-widget-submit input:hover, @@ -266,15 +258,16 @@ div.dashboard-widget-submit input, color: #d54e21; } -.button-primary:hover { - border-color: #156079; -} - .button-secondary:hover, #login form .submit input:hover { border-color: #328ab2; } +.button-primary:hover { + border-color: #156079; + background-image: inherit; +} + #side-info-column #category-tabs .ui-tabs-selected a { color: #333; } diff --git a/wp-admin/export.php b/wp-admin/export.php index d2a71bfd60..8b54a37aec 100644 --- a/wp-admin/export.php +++ b/wp-admin/export.php @@ -48,7 +48,7 @@ foreach ( $authors as $id ) { -

+

@@ -58,4 +58,4 @@ foreach ( $authors as $id ) { include ('admin-footer.php'); -?> \ No newline at end of file +?> diff --git a/wp-admin/import/btt.php b/wp-admin/import/btt.php index 25664d2a0e..450d4cdb01 100644 --- a/wp-admin/import/btt.php +++ b/wp-admin/import/btt.php @@ -34,7 +34,7 @@ class BunnyTags_Import { echo '

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

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

'; + echo '

'; echo '
'; echo ''; } @@ -104,7 +104,7 @@ class BunnyTags_Import { echo '
'; wp_nonce_field('import-btt'); - echo '

'; + echo '

'; echo '
'; echo ''; } diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php index 9b4ddb44f9..808a4f3dd3 100644 --- a/wp-admin/import/dotclear.php +++ b/wp-admin/import/dotclear.php @@ -214,7 +214,7 @@ class Dotclear_Import { echo '
'; wp_nonce_field('import-dotclear'); $this->db_form(); - echo '

'; + echo '

'; echo '
'; } @@ -631,7 +631,7 @@ class Dotclear_Import { echo '
'; wp_nonce_field('import-dotclear'); - printf('', attribute_escape(__('Import Users'))); + printf('

', attribute_escape(__('Import Users'))); echo '
'; } @@ -644,7 +644,7 @@ class Dotclear_Import { echo '
'; wp_nonce_field('import-dotclear'); - printf('', attribute_escape(__('Import Posts'))); + printf('

', attribute_escape(__('Import Posts'))); echo '
'; } @@ -658,7 +658,7 @@ class Dotclear_Import { echo '
'; wp_nonce_field('import-dotclear'); - printf('', attribute_escape(__('Import Comments'))); + printf('

', attribute_escape(__('Import Comments'))); echo '
'; } @@ -670,7 +670,7 @@ class Dotclear_Import { echo '
'; wp_nonce_field('import-dotclear'); - printf('', attribute_escape(__('Import Links'))); + printf('

', attribute_escape(__('Import Links'))); echo '
'; } @@ -683,7 +683,7 @@ class Dotclear_Import { echo '
'; wp_nonce_field('import-dotclear'); - printf('', attribute_escape(__('Finish'))); + printf('

', attribute_escape(__('Finish'))); echo '
'; } diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php index 9db705d993..d39e307da7 100644 --- a/wp-admin/import/greymatter.php +++ b/wp-admin/import/greymatter.php @@ -66,7 +66,7 @@ class GM_Import {

-

+

footer(); diff --git a/wp-admin/import/jkw.php b/wp-admin/import/jkw.php index 845cce3dd3..265936a6f3 100644 --- a/wp-admin/import/jkw.php +++ b/wp-admin/import/jkw.php @@ -119,7 +119,7 @@ class JeromesKeyword_Import { echo '
'; wp_nonce_field('import-jkw'); - echo '

'; + echo '

'; echo '
'; echo ''; } @@ -152,7 +152,7 @@ class JeromesKeyword_Import { } echo '
'; wp_nonce_field('import-jkw'); - echo '

'; + echo '

'; echo '
'; echo ''; } diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php index bb32b3afdc..751fc7acf3 100644 --- a/wp-admin/import/mt.php +++ b/wp-admin/import/mt.php @@ -45,7 +45,7 @@ class MT_Import { mt-export.txt in your /wp-content/ directory'); ?>

- +

out of memory error try splitting up the import file into pieces.'); ?>

@@ -211,7 +211,7 @@ class MT_Import { echo ''; } - echo ''.'
'; + echo '

'.'
'; echo ''; echo ''; diff --git a/wp-admin/import/stp.php b/wp-admin/import/stp.php index 2a30c93a1f..4a5b61f47c 100644 --- a/wp-admin/import/stp.php +++ b/wp-admin/import/stp.php @@ -32,7 +32,7 @@ class STP_Import { echo '

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

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

'; + echo '

'; echo '
'; echo ''; } @@ -92,7 +92,7 @@ class STP_Import { echo '
'; wp_nonce_field('import-stp'); - echo '

'; + echo '

'; echo '
'; echo ''; } @@ -108,7 +108,7 @@ class STP_Import { echo '

' . sprintf( __ngettext('Done! %s tag was added!', 'Done! %s tags were added!', $tags_added), $tags_added ) . '

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

'; + echo '

'; echo '
'; echo ''; } diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php index 9dfae4a989..1362bd27a6 100644 --- a/wp-admin/import/textpattern.php +++ b/wp-admin/import/textpattern.php @@ -69,7 +69,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); $this->db_form(); - echo '

'; + echo '

'; echo '
'; echo ''; } @@ -504,7 +504,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); - printf('', attribute_escape(__('Import Users'))); + printf('

', attribute_escape(__('Import Users'))); echo '
'; } @@ -517,7 +517,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); - printf('', attribute_escape(__('Import Posts'))); + printf('

', attribute_escape(__('Import Posts'))); echo '
'; } @@ -531,7 +531,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); - printf('', attribute_escape(__('Import Comments'))); + printf('

', attribute_escape(__('Import Comments'))); echo '
'; } @@ -543,7 +543,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); - printf('', attribute_escape(__('Import Links'))); + printf('

', attribute_escape(__('Import Links'))); echo '
'; } @@ -556,7 +556,7 @@ class Textpattern_Import { echo '
'; wp_nonce_field('import-textpattern'); - printf('', attribute_escape(__('Finish'))); + printf('

', attribute_escape(__('Finish'))); echo '
'; } diff --git a/wp-admin/import/utw.php b/wp-admin/import/utw.php index 81470033a7..2b65756526 100644 --- a/wp-admin/import/utw.php +++ b/wp-admin/import/utw.php @@ -32,7 +32,7 @@ class UTW_Import { echo '

'.__('To accommodate larger databases for those tag-crazy authors out there, we have made this into an easy 5-step program to help you kick that nasty UTW habit. Just keep clicking along and we will let you know when you are in the clear!').'

'; echo '

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

'; echo '
'; - echo '

'; + echo '

'; echo '
'; echo ''; } @@ -119,7 +119,7 @@ class UTW_Import { echo '
'; wp_nonce_field('import-utw'); - echo '

'; + echo '

'; echo '
'; echo ''; } @@ -155,7 +155,7 @@ class UTW_Import { echo '
'; wp_nonce_field('import-utw'); - echo '

'; + echo '

'; echo '
'; echo ''; @@ -174,7 +174,7 @@ class UTW_Import { echo '
'; wp_nonce_field('import-utw'); - echo '

'; + echo '

'; echo '
'; echo ''; diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index 1b1e6946f6..2e0ce039c2 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -221,7 +221,7 @@ echo apply_filters('default_avatar_select', $avatar_list);

- +

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 8be93b10f1..a20a9222f6 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -207,7 +207,7 @@ endfor;

- +

diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php index 7391d6e7b6..9dd95ae3eb 100644 --- a/wp-admin/options-media.php +++ b/wp-admin/options-media.php @@ -122,7 +122,7 @@ include('admin-header.php');

- +

diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php index dbcee35c73..e58d451f4e 100644 --- a/wp-admin/options-misc.php +++ b/wp-admin/options-misc.php @@ -76,10 +76,10 @@ include('admin-header.php');

- +

- \ No newline at end of file + diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 8d382534a3..4c44e43a29 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -199,7 +199,7 @@ $structures = array(

- +

diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php index fd7794cf15..950cd6b6c3 100644 --- a/wp-admin/options-privacy.php +++ b/wp-admin/options-privacy.php @@ -40,7 +40,7 @@ include('./admin-header.php');

- +

diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index 364e864ff2..a08702f46c 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -78,7 +78,7 @@ include('admin-header.php');

- +

diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index e1f218c662..577207e854 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -149,7 +149,7 @@ endforeach;

- +

diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index 1f114d3e32..c28b72354a 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -181,7 +181,7 @@ if ($allowed_files) :

"; + echo ""; ?>

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index ed304a4578..f8d51cab4e 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -390,7 +390,7 @@ if ( $show_password_fields ) :

- +

diff --git a/wp-admin/users.php b/wp-admin/users.php index 720b091a85..c048090a63 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -474,7 +474,7 @@ foreach ( $wp_user_search->get_results() as $userid ) {

- +

diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php index 00a84ab13e..641f16cf66 100644 --- a/wp-admin/widgets.php +++ b/wp-admin/widgets.php @@ -305,7 +305,7 @@ require_once( 'admin-header.php' ); ?>

- + @@ -321,3 +321,4 @@ require_once( 'admin-header.php' ); ?> +