Project

General

Profile

Feature #20641 » email_css_improvement.diff

patch - Go MAEDA, 2014-04-06 14:14

View differences:

app/views/layouts/mailer.html.erb (working copy)
5 5
  font-family: Verdana, sans-serif;
6 6
  font-size: 0.8em;
7 7
  color:#484848;
8
  background: #f6f6f6;
9
  padding: 2em;
8 10
}
9 11
h1, h2, h3 { font-family: "Trebuchet MS", Verdana, sans-serif; margin: 0px; }
10 12
h1 { font-size: 1.2em; }
......
16 18
hr {
17 19
  width: 100%;
18 20
  height: 1px;
21
  margin: 2em 0;
19 22
  background: #ccc;
20 23
  border: 0;
21 24
}
......
23 26
  font-size: 0.8em;
24 27
  font-style: italic;
25 28
}
29
#content {
30
  max-width: 60em;
31
  margin: 0 auto;
32
  padding: 1em;
33
  border: 1px solid #e4e4e4;
34
  border-radius: 4px;
35
  background: #fff;
36
}
37
.description, .note {
38
  margin: 2em 0;
39
  color: #484848;
40
}
41
.author {
42
  background: #f6f6f6;
43
  border-radius: 3px;
44
  padding: 3px;
45
  margin: 0;
46
}
26 47
</style>
27 48
</head>
28 49
<body>
50
<div id="content">
29 51
<% if Setting.emails_header.present? -%>
30 52
<span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span>
31 53
<% end -%>
......
34 56
<% if Setting.emails_footer.present? -%>
35 57
<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span>
36 58
<% end -%>
59
</div>
37 60
</body>
38 61
</html>
app/views/mailer/_issue.html.erb (working copy)
2 2

  
3 3
<%= render_email_issue_attributes(issue, users.first, true) %>
4 4

  
5
<%= textilizable(issue, :description, :only_path => false) %>
5
<div class="description"><%= textilizable(issue, :description, :only_path => false) %></div>
6 6

  
7 7
<% if issue.attachments.any? %>
8 8
  <fieldset class="attachments"><legend><%= l(:label_attachment_plural) %></legend>
app/views/mailer/issue_add.html.erb (working copy)
1
<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
1
<p class="author"><%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %></p>
2 2
<hr />
3 3
<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
app/views/mailer/issue_edit.html.erb (working copy)
1 1
<% if @journal.private_notes? %>
2 2
  (<%= l(:field_private_notes) %>)
3 3
<% end %>
4
<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
4
<p class="author"><%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %></p>
5 5

  
6 6
<ul>
7 7
<% details_to_strings(@journal_details, false, :only_path => false).each do |string| %>
......
9 9
<% end %>
10 10
</ul>
11 11

  
12
<%= textilizable(@journal, :notes, :only_path => false) %>
12
<div class="note"><%= textilizable(@journal, :notes, :only_path => false) %></div>
13 13
<hr />
14 14
<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :users => @users, :issue_url => @issue_url } %>
(1-1/3)