Skip to content

Commit 2f38404

Browse files
Merge pull request #241 from pluralsh/mjg/eng-73-implement-new-email-designs
Implement new emails
2 parents 97fc1d9 + 778a94b commit 2f38404

20 files changed

+878
-23
lines changed
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1-
<p>
2-
Click <a target="_blank" href='<%= url("/confirm-email/#{@token.external_id}") %>'>here</a> to confirm your email
3-
</p>
1+
<%= row do %>
2+
<%= text bold: true do %>
3+
Confirm Your Email
4+
<% end %>
5+
<% end %>
6+
<%= row do %>
7+
<%= text do %>
8+
Click below to confirm your email
9+
<% end %>
10+
<% end %>
11+
<%= row do %>
12+
<%= btn url: url("/confirm-email/#{@token.external_id}") do %>
13+
Confirm
14+
<% end %>
15+
<% end %>
Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
<p>
2-
Repository <b><%= @repo.name %></b> has unapplied breaking changes, to apply them,
3-
check out your repo locally and run the folling commands:
4-
</p>
1+
<%= row do %>
2+
<%= text bold: true do %>
3+
Your Installation Has Been Locked
4+
<% end %>
5+
<% end %>
6+
7+
<%= row do %>
8+
<%= text do %>
9+
Repository <b><%= @repo.name %></b> has unapplied breaking changes, to apply them,
10+
check out your repo locally and run the folling commands:
11+
<% end %>
12+
<% end %>
513

14+
<%= row do %>
15+
<div>
616
<code>
717
<%= if @deps.instructions.script do %>
818
<%= @deps.instructions.script %>
@@ -11,13 +21,16 @@ plural build --only <%= @repo.name %>
1121
plural deploy --commit "applying breaking changes to <%= @repo.name %>"
1222
plural repos unlock <%= @repo.name %>
1323
</code>
24+
</div>
25+
<% end %>
1426

1527
<%= if @deps.instructions.instructions do %>
16-
<p>
28+
<%= row do %>
29+
<%= text do %>
1730
The maintainers also have provided these instructions:
18-
31+
<% end %>
1932
<pre>
2033
<%= @deps.instructions.instructions %>
2134
</pre>
22-
</p>
35+
<% end %>
2336
<% end %>
Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1-
<p>
2-
Click <a target="_blank" href='<%= url("/passwordless-login/#{@login.token}") %>'>here</a> to log into plural.
3-
</p>
1+
<%= row do %>
2+
<%= text bold: true do %>
3+
Securely Log Into Plural
4+
<% end %>
5+
<% end %>
6+
<%= row do %>
7+
<% btn url: url("/passwordless-login/#{@login.token}") do %>
8+
Login
9+
<% end %>
10+
<% end %>
Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1-
<p>
2-
Click <a target="_blank" href='<%= url("/reset-password/#{@token.external_id}") %>'>here</a> to reset your password.
3-
</p>
1+
<%= row do %>
2+
<%= text bold: true do %>
3+
Reset Your Password
4+
<% end %>
5+
<% end %>
6+
7+
<%= row do %>
8+
<%= text do %>
9+
Hi <%= @user.name %>
10+
<% end %>
11+
<% end %>
12+
13+
<%= row do %>
14+
Click here to reset your plural password
15+
<% end %>
16+
17+
<%= row do %>
18+
<% btn url: url("/reset-password/#{@token.external_id}") do %>
19+
Reset Password
20+
<% end %>
21+
<% end %>
22+
23+
<%= row do %>
24+
<%= text do %>
25+
If you didn’t request a password reset, please disregard this email.
26+
<% end %>
27+
<% end %>
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
<p>
2-
<div>This is just a test email for <%= @user.email %></div>
3-
</p>
1+
<%= row do %>
2+
<%= text do %>
3+
This is just a test email for <%= @user.email %>
4+
<% end %>
5+
<% end %>

apps/email/lib/email_web/templates/layout/email.html.eex

Lines changed: 291 additions & 4 deletions
Large diffs are not rendered by default.

apps/email/lib/email_web/templates/layout/index.html.eex

Lines changed: 294 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;width:100%;line-height:100%;">
2+
<tbody>
3+
<tr>
4+
<td align="center" bgcolor="#293EFF" role="presentation" style="border:none;border-radius:3px;cursor:auto;mso-padding-alt:18px;background:#293EFF;" valign="middle">
5+
<a href="<%= @url %>" style="display:inline-block;background:#293EFF;color:#E9ECF0;font-family:Inter,Helvetica,Arial,sans-serif;font-size:20px;font-weight:600;line-height:24px;margin:0;text-decoration:none;text-transform:none;padding:18px;mso-padding-alt:0px;border-radius:3px;" target="blank">
6+
<%= @inner_content %>
7+
</a>
8+
</td>
9+
</tr>
10+
</tbody>
11+
</table>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<tr>
2+
<td align="left" style="font-size:0px;padding:0;word-break:break-word;">
3+
<%= @inner_content %>
4+
</td>
5+
</tr>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<tr>
2+
<td style="font-size:0px;padding:0;word-break:break-word;">
3+
<div style="height:56px;line-height:56px;">&#8202;</div>
4+
</td>
5+
</tr>

0 commit comments

Comments
 (0)