]> source.dussan.org Git - redmine.git/commitdiff
projects / redmine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6ad6dd2)
3.1-stable: revert r14300 (#16535, #20466)
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Mon, 31 Aug 2015 07:20:29 +0000 (07:20 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Mon, 31 Aug 2015 07:20:29 +0000 (07:20 +0000)
Set a max width to html email content.

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14539 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/layouts/mailer.html.erb patch | blob | history
app/views/mailer/_issue.html.erb patch | blob | history
app/views/mailer/issue_add.html.erb patch | blob | history
app/views/mailer/issue_edit.html.erb patch | blob | history

diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 003aec859299b56cccfe3907e356c3b0ce91223b..46003e69d8ffea30410e4db03c4c0c6229db2c14 100644 (file)
--- 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 6f13b0248191e9b2c578108940e37155541d7ea1..9461d849060fceef94119319c1f669a58c2b8fe4 100644 (file)
--- 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 209b0286d43328ad7af7cddbe7b18d65c11a6686..99fd08d14050d16767fec435763616e5b306dcfd 100644 (file)
--- 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 2e70091236d637f4a93bfaf0679f74dfbe28929f..e3b6f5c6c22eda234739720b458ccf7cae172037 100644 (file)
--- 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 } %>
Mirror of redmine code source: https://github.com/redmine/redmine