diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-09-01 00:15:13 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-09-01 00:15:13 +0000 |
| commit | d90de96def267ab2a8261ee756e78d9edd9db908 (patch) | |
| tree | 5b2b73d5e4ff3c31ce4ba85742dfbd3355c94c68 /app | |
| parent | 0dc3c2fe1c864b3236e23cad7592d359d40a8075 (diff) | |
| download | redmine-d90de96def267ab2a8261ee756e78d9edd9db908.tar.gz redmine-d90de96def267ab2a8261ee756e78d9edd9db908.zip | |
trunk: revert r14300 (#16535, #20466, #20641)
Set a max width to html email content.
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/trunk@14541 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/mailer.html.erb | 23 | ||||
| -rw-r--r-- | app/views/mailer/_issue.html.erb | 2 | ||||
| -rw-r--r-- | app/views/mailer/issue_add.html.erb | 2 | ||||
| -rw-r--r-- | app/views/mailer/issue_edit.html.erb | 4 |
4 files changed, 4 insertions, 27 deletions
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 003aec859..46003e69d 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -5,8 +5,6 @@ body { font-family: Verdana, sans-serif; font-size: 0.8em; color:#484848; - background: #f6f6f6; - padding: 0.5em; } h1, h2, h3 { font-family: "Trebuchet MS", Verdana, sans-serif; margin: 0px; } h1 { font-size: 1.2em; } @@ -18,7 +16,6 @@ fieldset.attachments {border-width: 1px 0 0 0;} hr { width: 100%; height: 1px; - margin: 1em 0; background: #ccc; border: 0; } @@ -26,28 +23,9 @@ span.footer { font-size: 0.8em; font-style: italic; } -#content { - max-width: 60em; - margin: 0 auto; - padding: 1em; - border: 1px solid #e4e4e4; - border-radius: 4px; - background: #fff; -} -.description, .note { - margin: 2em 0; - color: #484848; -} -.author { - background: #f6f6f6; - border-radius: 3px; - padding: 3px; - margin: 0; -} </style> </head> <body> -<div id="content"> <% if Setting.emails_header.present? -%> <span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span> <% end -%> @@ -56,6 +34,5 @@ span.footer { <% if Setting.emails_footer.present? -%> <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span> <% end -%> -</div> </body> </html> diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb index 6f13b0248..9461d8490 100644 --- a/app/views/mailer/_issue.html.erb +++ b/app/views/mailer/_issue.html.erb @@ -2,7 +2,7 @@ <%= render_email_issue_attributes(issue, users.first, true) %> -<div class="description"><%= textilizable(issue, :description, :only_path => false) %></div> +<%= textilizable(issue, :description, :only_path => false) %> <% if issue.attachments.any? %> <fieldset class="attachments"><legend><%= l(:label_attachment_plural) %></legend> diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb index 209b0286d..99fd08d14 100644 --- a/app/views/mailer/issue_add.html.erb +++ b/app/views/mailer/issue_add.html.erb @@ -1,3 +1,3 @@ -<p class="author"><%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %></p> +<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %> <hr /> <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %> diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb index 2e7009123..e3b6f5c6c 100644 --- a/app/views/mailer/issue_edit.html.erb +++ b/app/views/mailer/issue_edit.html.erb @@ -1,7 +1,7 @@ <% if @journal.private_notes? %> (<%= l(:field_private_notes) %>) <% end %> -<p class="author"><%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %></p> +<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %> <ul> <% details_to_strings(@journal_details, false, :only_path => false).each do |string| %> @@ -9,6 +9,6 @@ <% end %> </ul> -<div class="note"><%= textilizable(@journal, :notes, :only_path => false) %></div> +<%= textilizable(@journal, :notes, :only_path => false) %> <hr /> <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %> |