Merge pull request #347 from taigaio/issue/2642/email-templates

Email templates fix
remotes/origin/enhancement/email-actions
David Barragán Merino 2015-06-06 09:29:39 +02:00
commit d8e4ce02f7
4 changed files with 12 additions and 12 deletions

View File

@ -121,7 +121,7 @@
.headerContent { .headerContent {
text-align: center; text-align: center;
color:#b8b8b8 !important; color:#8D8D8D !important;
font-family: 'Open Sans', Arial, Helvetica; font-family: 'Open Sans', Arial, Helvetica;
font-size:14px; font-size:14px;
margin-bottom:16px; margin-bottom:16px;

View File

@ -60,7 +60,7 @@
* @style heading 2 * @style heading 2
*/ */
h2{ h2{
color: #b8b8b8 !important; color: #8D8D8D !important;
display:block; display:block;
font-family: 'Open Sans', Arial; font-family: 'Open Sans', Arial;
font-size:20px; font-size:20px;

View File

@ -121,7 +121,7 @@
.headerContent { .headerContent {
text-align: center; text-align: center;
color:#b8b8b8 !important; color:#8D8D8D !important;
font-family: 'Open Sans', Arial, Helvetica; font-family: 'Open Sans', Arial, Helvetica;
font-size:14px; font-size:14px;
margin-bottom:16px; margin-bottom:16px;
@ -418,14 +418,14 @@
</tr> </tr>
{% for entry in history_entries%} {% for entry in history_entries%}
{% if entry.comment %} {% if entry.comment %}
<tr> <tr>
<td colspan="2"> <td colspan="2">
{% trans comment=mdrender(project, entry.comment) %} {% trans comment=mdrender(project, entry.comment) %}
<h3>comment:</h3> <h3>comment:</h3>
<p>{{ comment }}</p> <p>{{ comment }}</p>
{% endtrans %} {% endtrans %}
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
{% set changed_fields = entry.values_diff %} {% set changed_fields = entry.values_diff %}
{% if changed_fields %} {% if changed_fields %}

View File

@ -96,7 +96,7 @@
{% set values_removed = lists_diff(values_from, values_to) %} {% set values_removed = lists_diff(values_from, values_to) %}
<tr> <tr>
<td valign="middle" rowspan="2" class="update-row-name"> <td valign="middle" class="update-row-name">
<h3>{{ verbose_name(obj_class, field_name) }}</h3> <h3>{{ verbose_name(obj_class, field_name) }}</h3>
</td> </td>
<td valign="top" class="update-row-from"> <td valign="top" class="update-row-from">