diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-06-06 07:32:40 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-06-06 07:32:40 +0000 |
| commit | 391140d280dc636794748d341d9c676ea61cd217 (patch) | |
| tree | 1be75b604626abdd63b0e89e821c409f74052098 | |
| parent | 03c87f3db142b8a085f141b48f6d082a672624e2 (diff) | |
| download | redmine-391140d280dc636794748d341d9c676ea61cd217.tar.gz redmine-391140d280dc636794748d341d9c676ea61cd217.zip | |
Set a max width to html email content (#16535).
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/trunk@14300 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -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, 27 insertions, 4 deletions
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 46003e69d..003aec859 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -5,6 +5,8 @@ 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; } @@ -16,6 +18,7 @@ fieldset.attachments {border-width: 1px 0 0 0;} hr { width: 100%; height: 1px; + margin: 1em 0; background: #ccc; border: 0; } @@ -23,9 +26,28 @@ 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 -%> @@ -34,5 +56,6 @@ 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 9461d8490..6f13b0248 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) %> -<%= textilizable(issue, :description, :only_path => false) %> +<div class="description"><%= textilizable(issue, :description, :only_path => false) %></div> <% 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 99fd08d14..209b0286d 100644 --- a/app/views/mailer/issue_add.html.erb +++ b/app/views/mailer/issue_add.html.erb @@ -1,3 +1,3 @@ -<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %> +<p class="author"><%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %></p> <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 e3b6f5c6c..2e7009123 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 %> -<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %> +<p class="author"><%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %></p> <ul> <% details_to_strings(@journal_details, false, :only_path => false).each do |string| %> @@ -9,6 +9,6 @@ <% end %> </ul> -<%= textilizable(@journal, :notes, :only_path => false) %> +<div class="note"><%= textilizable(@journal, :notes, :only_path => false) %></div> <hr /> <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %> |