public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added in additional text and incorporated the bulletproof button that was built for raintank. Needs some help from Torkel or Nick to make sure it's cleaner

Browse Source
This commit is contained in:
Matt Toback
2015-08-13 17:57:58 -04:00
parent f784551e20
commit 60eec49e95
8 changed files with 175 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emails/README.md
+1
View File
@@ -1,5 +1,6 @@
- npm install
- gem install premailer
- grunt (default task will build new inlines email templates)
- grunt watch (will build on source html or css change)
emails/assets/css/ink.css
+47 -11
View File
@@ -332,9 +332,9 @@ h1, h2, h3, h4, h5, h6 {
h1 {font-size: 40px;}
h2 {font-size: 36px;}
h3 {font-size: 32px;}
h4 {font-size: 28px;}
h5 {font-size: 24px;}
h3 {font-size: 26px;}
h4 {font-size: 24px;}
h5 {font-size: 22px;}
h6 {font-size: 20px;}
body, table.body, p, td {font-size: 14px;line-height:19px;}
@@ -351,21 +351,25 @@ small {
font-size: 10px;
}
.emphasis {
font-weight: 600;
}
a {
color: #2ba6cb;
color: #E67612;
text-decoration: none;
}
a:hover {
color: #2795b6 !important;
color: #ff8f2b !important;
}
a:active {
color: #2795b6 !important;
color: #F2821E !important;
}
a:visited {
color: #2ba6cb !important;
color: #E67612 !important;
}
h1 a,
@@ -413,6 +417,38 @@ h6 a:visited {
/* Buttons */
.better-button td{
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
}
.better-button a{
text-decoration: none;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
padding: 12px 25px;
border: 1px solid #ff8f2b;
display: inline-block;
color: #FFF;
}
.better-button:hover a {
color: #FFFFFF !important;
background-color: #F2821E;
border: 1px solid #F2821E;
}
.better-button:visited a {
color: #FFFFFF !important;
}
.better-button:active a {
color: #FFFFFF !important;
}
table.button,
table.tiny-button,
table.small-button,
@@ -430,8 +466,8 @@ table.large-button td {
display: block;
width: auto !important;
text-align: center;
background: #2ba6cb;
border: 1px solid #2284a1;
background: #ff8f2b;
border: 1px solid #ff8f2b;
color: #ffffff;
padding: 8px 0;
}
@@ -484,7 +520,7 @@ table.large-button td a {
table.button:hover td,
table.button:visited td,
table.button:active td {
background: #2795b6 !important;
background: #ff8f2b !important;
}
table.button:hover td a,
@@ -498,7 +534,7 @@ table.tiny-button:hover td,
table.small-button:hover td,
table.medium-button:hover td,
table.large-button:hover td {
background: #2795b6 !important;
background: #F2821E !important;
}
table.button:hover td a,
emails/templates/invited_to_org.html
+23 -3
View File
@@ -1,6 +1,6 @@
<!-- This email is sent when an existing user is added to an organization -->
[[Subject .Subject "[[.InvitedBy]] has added you to the Grafana organization [[.OrgName]]"]]
[[Subject .Subject "[[.InvitedBy]] has added you to the [[.OrgName]] organization"]]
<table class="row">
<tr>
@@ -9,7 +9,7 @@
<table class="twelve columns">
<tr>
<td>
<h3>You have been added to the Grafana organization [[.OrgName]]</h3>
<h3>You have been added to [[.OrgName]]</h3>
</td>
<td class="expander"></td>
</tr>
@@ -25,10 +25,30 @@
<table class="twelve columns">
<tr>
<td class="center">
<p>You can switch organization in the left side menu, in the dropdown below your username.</p>
<p><span class="emphasis">[[.InvitedBy]]</span> has added you to the <span class="emphasis">[[.OrgName]]</span> organization in Grafana.
<p>Once logged in, [[.OrgName]] will be available in the left side menu, in the dropdown below your username.</p>
</td>
<td class="expander"></td>
</tr>
<tr>
<td class="center">
<!-- <table class="button radius">
<tr>
<td>
<a href="[[.GrafanaUrl]]">Log in now</a>
</td>
</tr>
</table> -->
<table align="center" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center" class="better-button" style="padding-bottom: 0px; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px;" bgcolor="#ff8f2b"><a href="[[.GrafanaURL]]" target="_blank">Log in now</a></td>
</tr>
</table>
</td>
</tr>
</table>
</td>
emails/templates/new_user_invite.html
+19 -4
View File
@@ -9,7 +9,7 @@
<table class="twelve columns">
<tr>
<td>
<h3>You're invited to sign up to Grafana and join organization [[.OrgName]]</h3>
<h3>You're invited to join [[.OrgName]]</h3>
</td>
<td class="expander"></td>
</tr>
@@ -25,18 +25,33 @@
<table class="twelve columns">
<tr>
<td class="center">
<table class="button radius">
<p>You've been invited to join the <span class="emphasis">[[.OrgName]]</span> organization by <span class="emphasis">[[.InvitedBy]]</span></p>
<p>To accept your invitation and join the team, please click the link below:</p>
</td>
</tr>
<tr>
<td class="center">
<!-- <table class="small-button radius">
<tr>
<td>
<a href="[[.LinkUrl]]">Complete Sign Up</a>
</td>
</tr>
</table>
</table> -->
<table align="center" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center" class="better-button" style="padding-bottom: 0px; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px;" bgcolor="#ff8f2b"><a href="[[.LinkUrl]]" target="_blank">Complete Sign Up</a></td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="center">
<p>You can also copy/paste this link into your browser directly: <a href="[[.LinkUrl]]">[[.LinkUrl]]</a></p>
</td>
<td class="expander"></td>
</tr>
</table>
</td>
</tr>
</table>