From b1b0f713129afca4b8d22d0533a12a719621f503 Mon Sep 17 00:00:00 2001 From: Peter Holmberg Date: Fri, 22 Oct 2021 09:12:37 +0200 Subject: [PATCH] Alerting: Layout fixes for email template (#40676) * changes in email footer and ngalert template * more adjustments to labels list --- emails/assets/css/style.css | 3 ++- emails/templates/ng_alert_notification.html | 27 ++++++++++++++++----- public/emails/alert_notification.html | 2 +- public/emails/invited_to_org.html | 2 +- public/emails/new_user_invite.html | 2 +- public/emails/ng_alert_notification.html | 19 ++++++++------- public/emails/reset_password.html | 2 +- public/emails/signup_started.html | 2 +- public/emails/welcome_on_signup.html | 2 +- 9 files changed, 39 insertions(+), 22 deletions(-) diff --git a/emails/assets/css/style.css b/emails/assets/css/style.css index 83f8d2c67a6..065421a173d 100644 --- a/emails/assets/css/style.css +++ b/emails/assets/css/style.css @@ -91,7 +91,8 @@ margin-bottom: 25px; .footer { background-color: #2e2e2e; color: #999999; - margin-top: 20px; + margin: 0 auto; + width: 100%; } @media only screen and (max-width: 600px) { diff --git a/emails/templates/ng_alert_notification.html b/emails/templates/ng_alert_notification.html index d68c13e9b02..ec700434b71 100644 --- a/emails/templates/ng_alert_notification.html +++ b/emails/templates/ng_alert_notification.html @@ -5,21 +5,21 @@ [[ range .Annotations.SortedPairs ]] -

[[ .Name ]]: [[ .Value ]]

+

[[ .Name ]]: [[ .Value ]]

[[ end ]] [[ end ]] - Labels: - + + Labels: - + [[ if .SilenceURL ]] - + -[[ end ]] \ No newline at end of file +[[ end ]] diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index 1ffbd182400..8d7917c92d4 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -344,7 +344,7 @@ text-decoration: underline; - +
diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index 25b4ef8b034..b5459da967c 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -257,7 +257,7 @@ text-decoration: underline;
- +
diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index 89f465a8446..171d9bc13ef 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -258,7 +258,7 @@ text-decoration: underline;
- +
diff --git a/public/emails/ng_alert_notification.html b/public/emails/ng_alert_notification.html index 1eaae4fef27..7d952b80f69 100644 --- a/public/emails/ng_alert_notification.html +++ b/public/emails/ng_alert_notification.html @@ -211,21 +211,21 @@ text-decoration: underline; {{ end }} - - - - @@ -307,7 +307,7 @@ text-decoration: underline; - @@ -322,15 +322,16 @@ text-decoration: underline;
{{ range .Annotations.SortedPairs }} -

{{ .Name }}: {{ .Value }}

+

{{ .Name }}: {{ .Value }}

{{ end }}
Labels: -
    +
+ Labels: +
    {{ range .Labels.SortedPairs }}
  • {{ .Name }}: {{ .Value }}
    • {{ end }}
+ {{ if .SilenceURL }} @@ -286,7 +286,7 @@ text-decoration: underline; Firing + {{ .Labels.alertname }}
Resolved + {{ .Labels.alertname }}
- +
{{ end }} +
- +
diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index 697928655ed..5e8ce659a73 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -252,7 +252,7 @@ text-decoration: underline;
- +
diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index dab02e572e6..f95729c1acf 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -256,7 +256,7 @@ text-decoration: underline;
- +
diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index 921c96faae3..d71077453b5 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -258,7 +258,7 @@ text-decoration: underline;
- +