From 30ef152202abd7d225a9b8c39257ae21119618b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Fri, 5 Jun 2015 13:57:50 +0200 Subject: [PATCH 1/2] Fix gray color in emails --- taiga/base/templates/emails/base-body-html.jinja | 2 +- taiga/base/templates/emails/hero-body-html.jinja | 2 +- taiga/base/templates/emails/updates-body-html.jinja | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/taiga/base/templates/emails/base-body-html.jinja b/taiga/base/templates/emails/base-body-html.jinja index 52a263f5..602bde96 100644 --- a/taiga/base/templates/emails/base-body-html.jinja +++ b/taiga/base/templates/emails/base-body-html.jinja @@ -121,7 +121,7 @@ .headerContent { text-align: center; - color:#b8b8b8 !important; + color:#8D8D8D !important; font-family: 'Open Sans', Arial, Helvetica; font-size:14px; margin-bottom:16px; diff --git a/taiga/base/templates/emails/hero-body-html.jinja b/taiga/base/templates/emails/hero-body-html.jinja index 349c3f2e..0439dcc8 100644 --- a/taiga/base/templates/emails/hero-body-html.jinja +++ b/taiga/base/templates/emails/hero-body-html.jinja @@ -60,7 +60,7 @@ * @style heading 2 */ h2{ - color: #b8b8b8 !important; + color: #8D8D8D !important; display:block; font-family: 'Open Sans', Arial; font-size:20px; diff --git a/taiga/base/templates/emails/updates-body-html.jinja b/taiga/base/templates/emails/updates-body-html.jinja index 4675b88a..8a6621a9 100644 --- a/taiga/base/templates/emails/updates-body-html.jinja +++ b/taiga/base/templates/emails/updates-body-html.jinja @@ -121,7 +121,7 @@ .headerContent { text-align: center; - color:#b8b8b8 !important; + color:#8D8D8D !important; font-family: 'Open Sans', Arial, Helvetica; font-size:14px; margin-bottom:16px; From d5e8b2ffd5010aeaf1e80ab947a9fdce39e1cdd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Fri, 5 Jun 2015 14:34:46 +0200 Subject: [PATCH 2/2] Fixed fields diff broken layout --- .../templates/emails/updates-body-html.jinja | 16 ++++++++-------- .../emails/includes/fields_diff-html.jinja | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/taiga/base/templates/emails/updates-body-html.jinja b/taiga/base/templates/emails/updates-body-html.jinja index 8a6621a9..86be9c92 100644 --- a/taiga/base/templates/emails/updates-body-html.jinja +++ b/taiga/base/templates/emails/updates-body-html.jinja @@ -418,14 +418,14 @@ {% for entry in history_entries%} {% if entry.comment %} - - - {% trans comment=mdrender(project, entry.comment) %} -

comment:

-

{{ comment }}

- {% endtrans %} - - + + + {% trans comment=mdrender(project, entry.comment) %} +

comment:

+

{{ comment }}

+ {% endtrans %} + + {% endif %} {% set changed_fields = entry.values_diff %} {% if changed_fields %} diff --git a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja index 88b56f41..4c99f755 100644 --- a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja +++ b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja @@ -96,7 +96,7 @@ {% set values_removed = lists_diff(values_from, values_to) %} - +

{{ verbose_name(obj_class, field_name) }}