diff --git a/emails/assets/css/style.css b/emails/assets/css/style.css index 63c7aaa5b3b..6f46d36581d 100644 --- a/emails/assets/css/style.css +++ b/emails/assets/css/style.css @@ -84,6 +84,10 @@ margin-top:25px; margin-bottom: 25px; } +.data { + font-size: 16px; +} + .footer { background-color: #2e2e2e; color: #999999; @@ -138,6 +142,45 @@ table.columns td.better-button { color: #FFFFFF !important; } +table.better-button-alt { + margin-top: 10px; + margin-bottom: 20px; +} + +table.columns td.better-button-alt { + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + padding-bottom: 0px; +} + +.better-button-alt a { + text-decoration: none; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + + padding: 12px 25px; + border: 1px solid #ff8f2b; + background-color: #EFEFEF; + display: inline-block; + color: #ff8f2b; +} + +.better-button-alt:hover a { + color: #ff8f2b !important; + background-color: #DDDDDD; + border: 1px solid #F2821E; +} + +.better-button-alt:visited a { + color: #ff8f2b !important; +} + +.better-button-alt:active a { + color: #ff8f2b !important; +} + .verification-code { background-color: #EEEEEE; padding: 3px; diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html index 2f64854ce4e..4c7eed1d5d9 100644 --- a/emails/templates/alert_notification.html +++ b/emails/templates/alert_notification.html @@ -16,7 +16,7 @@ -
+
@@ -31,24 +31,24 @@ [[if ne .State "ok" ]] -
+
- - - [[range .EvalMatches]] dwds + [[range .EvalMatches]] - - [[end]] @@ -79,8 +79,23 @@
- Metric name + +
Metric name
- Value + +
Value
- [[.Metric]] + +
[[.Metric]]
- [[.Value]] + +
[[.Value]]
- +
- Alert rule - Alerts page + + + + + +
+ View your Alert rule +
+
+ + + + +
+ Go to the Alerts page +
diff --git a/emails/templates/alert_notification_example.html b/emails/templates/alert_notification_example.html new file mode 100644 index 00000000000..7b618130e57 --- /dev/null +++ b/emails/templates/alert_notification_example.html @@ -0,0 +1,115 @@ + + + + +
+ + + + +
+

[CRITICAL] Imaginary timeserie alert

+
+
+ + + + + +
+ + + + +
+

Alert message that will support markdown in some distant future.

+
+
+ + + + + + +
+
+ + + + + + + + + + + + + + + + + +
+ Metric name + + Value +
+ desktop + + 40 +
+ mobile + + 20 +
+
+
+ + + + + + +
+ + + + +
+ +
+
+ + + + + + +
+ + + + + +
+ + + + +
+ View your Alert rule +
+
+ + + + +
+ Go to the Alerts page +
+
+
+ + + \ No newline at end of file diff --git a/emails/templates/invited_to_org.html b/emails/templates/invited_to_org.html index 59e76cd5a77..681830604b9 100644 --- a/emails/templates/invited_to_org.html +++ b/emails/templates/invited_to_org.html @@ -9,7 +9,7 @@ @@ -25,7 +25,7 @@
-

You have been added to [[.OrgName]]

+

You have been added to [[.OrgName]]

diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index eb968ed7cbc..6dece2f29c3 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -10,25 +10,25 @@ @@ -174,14 +135,14 @@ td[class="stack-column-center"] {
-

[[.InvitedBy]] has added you to the [[.OrgName]] organization in Grafana. +

[[.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.

- +