From 5f934e023877a2b055768639ca3120a8477e3a4a Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 8 Sep 2016 09:59:51 +0200 Subject: [PATCH] feat(emails): move bg color to main table --- emails/templates/layouts/default.html | 6 +- public/emails/alert_notification.html | 254 +++++++++++++------------- public/emails/invited_to_org.html | 118 ++++++------ public/emails/new_user_invite.html | 122 ++++++------- public/emails/reset_password.html | 112 ++++++------ public/emails/signup_started.html | 116 ++++++------ public/emails/welcome_on_signup.html | 118 ++++++------ 7 files changed, 405 insertions(+), 441 deletions(-) diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index d19364dec75..f6d729054cd 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -90,12 +90,12 @@ td[class="stack-column-center"] { } } - - + +
- +
diff --git a/public/emails/alert_notification.html b/public/emails/alert_notification.html index 8106592fb8d..e91ab6450fe 100644 --- a/public/emails/alert_notification.html +++ b/public/emails/alert_notification.html @@ -5,7 +5,7 @@ - - - - -
-
- - - -
-
- - -
+ + +
+
- - -
- + + +
+
+ + + +
+ + + + - +
+
@@ -206,115 +200,115 @@ text-decoration: underline;
- - - +
+ + - - +
+
{{Subject .Subject "{{.Title}}"}} - - - - +
- - - - -
-

{{.Title}}

-
-
+ + +
+ + + + +
+

{{.Title}}

+
+
- - - - +
- - - - -
-

{{.Message}}

-
-
+ + +
+ + + + +
+

{{.Message}}

+
+
{{if ne .State "ok" }} - - - - +
-
- - - - - - {{range .EvalMatches}} - - - - - {{end}} -
-
Metric name
- 		-
Value
-
-
{{.Metric}}
- 		-
{{.Value}}
-
-
-
+ + +
+
+ + + + + + {{range .EvalMatches}} + + + + + {{end}} +
+
Metric name
+ 		+
Value
+
+
{{.Metric}}
+ 		+
{{.Value}}
+
+
+
{{end}} - - - - +
- - - - -
- -
-
+ + +
+ + + + +
+ +
+
- - - - +
- - - - - -
- - - - -
- View your Alert rule -
- 		- - - - -
- Go to the Alerts page -
-
-
+ + +
+ + + + + +
+ + + + +
+ View your Alert rule +
+ 		+ + + + +
+ Go to the Alerts page +
+
+
@@ -324,20 +318,20 @@ text-decoration: underline;
- - -
- - -
-
-

- Sent by Grafana v{{.BuildVersion}} + + + diff --git a/public/emails/invited_to_org.html b/public/emails/invited_to_org.html index edb69e13428..284728663c4 100644 --- a/public/emails/invited_to_org.html +++ b/public/emails/invited_to_org.html @@ -5,7 +5,7 @@ - - -
+ + + - +
+
+

+ Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
- - - -
-
- - -
+ + +
+
- - -
- + + +
+
+ + + +
+ + + + - +
+
@@ -206,26 +200,26 @@ text-decoration: underline;
- - - +
+ + - - +
+
{{Subject .Subject "{{.InvitedBy}} has added you to the {{.OrgName}} organization"}} - - -
+ + +
- - -
-

You have been added to {{.OrgName}}

+ + + - +
+

You have been added to {{.OrgName}}
@@ -233,22 +227,22 @@ text-decoration: underline;
- - -
- - -
-

{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. -

Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.

+ + +
+ + + - + - -
+

{{.InvitedBy}} has added you to the {{.OrgName}} organization in Grafana. +

Once logged in, {{.OrgName}} will be available in the left side menu, in the dropdown below your username.
- - - + + @@ -265,20 +259,20 @@ text-decoration: underline;
Log in now
+ + +
Log in now
- - -
- - -
-
-

- Sent by Grafana v{{.BuildVersion}} + + + diff --git a/public/emails/new_user_invite.html b/public/emails/new_user_invite.html index 43d57748f68..7fb015138b9 100644 --- a/public/emails/new_user_invite.html +++ b/public/emails/new_user_invite.html @@ -5,7 +5,7 @@ - - -
+ + + - +
+
+

+ Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
- - - -
-
- - -
+ + +
+
- - -
- + + +
+
+ + + +
+ + + + - +
+
@@ -206,26 +200,26 @@ text-decoration: underline;
- - - +
+ + - - +
+
{{Subject .Subject "{{.InvitedBy}} has invited you to join Grafana"}} - - -
+ + +
- - -
-

You're invited to join {{.OrgName}}

+ + + - +
+

You're invited to join {{.OrgName}}
@@ -233,29 +227,29 @@ text-decoration: underline;
- - -
- - -
-

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:

+ + +
+ + + - - @@ -266,20 +260,20 @@ text-decoration: underline;
+

You've been invited to join the {{.OrgName}} organization by {{.InvitedBy}}. To accept your invitation and join the team, please click the link below:
- - - + + - - + - +
Accept Invitation
+ + +
Accept Invitation
-

You can also copy/paste this link into your browser directly: {{.LinkUrl}}

+
+

You can also copy/paste this link into your browser directly: {{.LinkUrl}}
- - -
- - -
-
-

- Sent by Grafana v{{.BuildVersion}} + + + diff --git a/public/emails/reset_password.html b/public/emails/reset_password.html index cdc62902c30..7290195b074 100644 --- a/public/emails/reset_password.html +++ b/public/emails/reset_password.html @@ -5,7 +5,7 @@ - - -
+ + + - +
+
+

+ Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
- - - -
-
- - -
+ + +
+
- - -
- + + +
+
+ + + +
+ + + + - +
+
@@ -206,24 +200,24 @@ text-decoration: underline;
- - - +
+ + - - +
+
{{Subject .Subject "Reset your Grafana password - {{.Name}}"}} - - -
+ + +
- - -
-

Hi {{.Name}},

+ + + - +
+

Hi {{.Name}},
@@ -231,21 +225,21 @@ text-decoration: underline;
- - -
- - -
-

+ + +
+ + + - +
+

Please click the following link to reset your password within {{.EmailCodeValidHours}} hours.

-

- {{.AppUrl}}user/password/reset?code={{.Code}} +

+ {{.AppUrl}}user/password/reset?code={{.Code}}

-

Not working? Try copying and pasting it to your browser.

+

Not working? Try copying and pasting it to your browser.
@@ -260,20 +254,20 @@ text-decoration: underline;
- - -
- - -
-
-

- Sent by Grafana v{{.BuildVersion}} + + + diff --git a/public/emails/signup_started.html b/public/emails/signup_started.html index a22d439072f..1123576b461 100644 --- a/public/emails/signup_started.html +++ b/public/emails/signup_started.html @@ -5,7 +5,7 @@ - - -
+ + + - +
+
+

+ Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
- - - -
-
- - -
+ + +
+
- - -
- + + +
+
+ + + +
+ + + + - +
+
@@ -206,24 +200,24 @@ text-decoration: underline;
- - - +
+ + - - +
+
{{Subject .Subject "Welcome to Grafana, please complete your sign up!"}} - - -
+ + +
- - -
-

Complete the signup

+ + + - +
+

Complete the signup
@@ -231,23 +225,23 @@ text-decoration: underline;
- - -
- - -
+ + +
+ + + - + - -
Copy and past the email verification code:
- {{.Code}}
in + {{.Code}}
in the sign up form or use the link below.
- - - + + @@ -264,20 +258,20 @@ text-decoration: underline;
Complete Sign Up
+ + +
Complete Sign Up
- - -
- - -
-
-

- Sent by Grafana v{{.BuildVersion}} + + + diff --git a/public/emails/welcome_on_signup.html b/public/emails/welcome_on_signup.html index 606c804df0d..e37f23c4653 100644 --- a/public/emails/welcome_on_signup.html +++ b/public/emails/welcome_on_signup.html @@ -5,7 +5,7 @@ - - -
+ + + - +
+
+

+ Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank

- -
-
- - - -
-
- - -
+ + +
+
- - -
- + + +
+
+ + + +
+ + + + - +
+
@@ -206,27 +200,27 @@ text-decoration: underline;
- - - +
+ + - - +
+
{{Subject .Subject "Welcome to Grafana"}} - - -
+ + +
- - -
-

Hi {{.Name}},

+ + + - + - - + @@ -236,23 +230,23 @@ text-decoration: underline;
+

Hi {{.Name}},
+
Welcome! Ready to start building some beautiful metric and analytic dashboards?
- - -
- - -
-

- If you are new to Grafana please read the Getting Started guide. + + +
+ + + - + - - +
+

+ If you are new to Grafana please read the Getting Started guide.

+
Thank you for joining our community.
-

The Grafana Team

+

The Grafana Team
@@ -267,20 +261,20 @@ text-decoration: underline;
- - -
- - -
-
-

- Sent by Grafana v{{.BuildVersion}} + + +
+ + + - +
+
+

+ Sent by Grafana v{{.BuildVersion}}
© 2016 Grafana and raintank