From 0d605006a3eb95e0e62de9ea68c20e24926ae3bb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 21 Oct 2007 14:30:01 +0000 Subject: [PATCH] Fixed flashes style for IE6. git-svn-id: http://redmine.rubyforge.org/svn/trunk@859 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/admin/mail_options.rhtml | 2 +- app/views/layouts/base.rhtml | 6 ++---- public/stylesheets/application.css | 8 ++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml index 5f1fd9bb3..3c95ebd71 100644 --- a/app/views/admin/mail_options.rhtml +++ b/app/views/admin/mail_options.rhtml @@ -14,7 +14,7 @@

<%= check_all_links('mail-options-form') %>

-
Emails footer +
<%= l(:setting_emails_footer) %> <%= text_area_tag 'emails_footer', Setting.emails_footer, :class => 'wiki-edit', :rows => 5 %>
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 2b25820d9..3cd384c1e 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -64,10 +64,8 @@
-
- <%= content_tag('div', flash[:error], :class => 'error') if flash[:error] %> - <%= content_tag('div', flash[:notice], :class => 'notice') if flash[:notice] %> -
+ <%= content_tag('div', flash[:error], :class => 'flash error') if flash[:error] %> + <%= content_tag('div', flash[:notice], :class => 'flash notice') if flash[:notice] %> <%= yield %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 979c0d274..298e5748b 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -154,23 +154,23 @@ width: 200px; div.attachments p { margin:4px 0 2px 0; } /***** Flash & error messages ****/ -#flash div, #errorExplanation, .nodata { +#errorExplanation, div.flash, div.nodata { padding: 4px 4px 4px 30px; margin-bottom: 12px; font-size: 1.1em; border: 2px solid; } -#flash div {margin-top: 6px;} +div.flash {margin-top: 8px;} -#flash div.error, #errorExplanation { +div.flash.error, #errorExplanation { background: url(../images/false.png) 8px 5px no-repeat; background-color: #ffe3e3; border-color: #dd0000; color: #550000; } -#flash div.notice { +div.flash.notice { background: url(../images/true.png) 8px 5px no-repeat; background-color: #dfffdf; border-color: #9fcf9f; -- 2.39.5