Skip to content

Commit 7508575

Browse files
joshuazhou744joshuazhou744
authored
Merge branch 'dev' into feat/auto-emails
2 parents 67fcb7e + a1c6f88 commit 7508575

15 files changed

Lines changed: 18 additions & 18 deletions

‎assets/email/AccountConfirmation.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@
356356
<table border="0" cellpadding="0" cellspacing="0" width="100%" id="templateHeader" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;border-collapse:collapse;" >
357357
<tr>
358358
<td valign="top" class="headerContent" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;" >
359-
<img src="https://mchacks.ca/mchacks-long-tight.png" width="250" height="59" alt="Logo" title="Logo" id="headerImage"
359+
<img src="https://mchacks.ca/martlet-text-13.png" width="250" height="59" alt="Logo" title="Logo" id="headerImage"
360360
mc:label="header_image" mc:edit="header_image" mc:allowdesigner
361361
mc:allowtext style="-ms-interpolation-mode:bicubic;border-width:0;line-height:100%;outline-style:none;text-decoration:none;height:auto;max-width:30%;width:250px;padding-top:20px;padding-bottom:20px;margin-left:auto;margin-right:auto;display:block;" />
362362
</td>

‎assets/email/AccountInvitation.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
<tr>
359359
<td valign="top" class="headerContent"
360360
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;">
361-
<img src="https://mchacks.ca/mchacks-long-tight.png" width="250" height="59"
361+
<img src="https://mchacks.ca/martlet-text-13.png" width="250" height="59"
362362
alt="Logo" title="Logo" id="headerImage" mc:label="header_image"
363363
mc:edit="header_image" mc:allowdesigner mc:allowtext
364364
style="-ms-interpolation-mode:bicubic;border-width:0;line-height:100%;outline-style:none;text-decoration:none;height:auto;max-width:30%;width:250px;padding-top:20px;padding-bottom:20px;margin-left:auto;margin-right:auto;display:block;" />

‎assets/email/ResetPassword.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@
356356
<table border="0" cellpadding="0" cellspacing="0" width="100%" id="templateHeader" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;border-collapse:collapse;" >
357357
<tr>
358358
<td valign="top" class="headerContent" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;" >
359-
<img src="https://mchacks.ca/mchacks-long-tight.png" width="250" height="59" alt="Logo" title="Logo" id="headerImage"
359+
<img src="https://mchacks.ca/martlet-text-13.png" width="250" height="59" alt="Logo" title="Logo" id="headerImage"
360360
mc:label="header_image" mc:edit="header_image" mc:allowdesigner
361361
mc:allowtext style="-ms-interpolation-mode:bicubic;border-width:0;line-height:100%;outline-style:none;text-decoration:none;height:auto;max-width:30%;width:250px;padding-top:20px;padding-bottom:20px;margin-left:auto;margin-right:auto;display:block;" />
362362
</td>

‎assets/email/Ticket.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;border-collapse:collapse;">
352352
<tr>
353353
<td valign="top" class="headerContent" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;">
354-
<img src="https://mchacks.ca/static/mchacks-long-tight.png" width="250"
354+
<img src="https://mchacks.ca/static/martlet-text-13.png" width="250"
355355
height="59" alt="Logo" title="Logo" id="headerImage" mc:label="header_image"
356356
mc:edit="header_image" mc:allowdesigner mc:allowtext style="-ms-interpolation-mode:bicubic;border-width:0;line-height:100%;outline-style:none;text-decoration:none;height:auto;max-width:30%;width:250px;padding-top:20px;padding-bottom:20px;margin-left:auto;margin-right:auto;display:block;" />
357357
</td>

‎assets/email/Welcome.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;border-collapse:collapse;">
352352
<tr>
353353
<td valign="top" class="headerContent" style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;">
354-
<img src="https://mchacks.ca/static/mchacks-long-tight.png" width="250"
354+
<img src="https://mchacks.ca/static/martlet-text-13.png" width="250"
355355
height="59" alt="Logo" title="Logo" id="headerImage" mc:label="header_image"
356356
mc:edit="header_image" mc:allowdesigner mc:allowtext style="-ms-interpolation-mode:bicubic;border-width:0;line-height:100%;outline-style:none;text-decoration:none;height:auto;max-width:30%;width:250px;padding-top:20px;padding-bottom:20px;margin-left:auto;margin-right:auto;display:block;" />
357357
</td>

‎assets/email/marketingEmail/3Days.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
<tr>
359359
<td valign="top" class="headerContent"
360360
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;">
361-
<img src="https://mchacks.ca/mchacks-long-tight.png" width="250" height="59"
361+
<img src="https://mchacks.ca/martlet-text-13.png" width="250" height="59"
362362
alt="Logo" title="Logo" id="headerImage" mc:label="header_image"
363363
mc:edit="header_image" mc:allowdesigner mc:allowtext
364364
style="-ms-interpolation-mode:bicubic;border-width:0;line-height:100%;outline-style:none;text-decoration:none;height:auto;max-width:30%;width:250px;padding-top:20px;padding-bottom:20px;margin-left:auto;margin-right:auto;display:block;" />

‎assets/email/marketingEmail/EmailBlast.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
<tr>
359359
<td valign="top" class="headerContent"
360360
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;">
361-
<img src="https://mchacks.ca/mchacks-long-tight.png" width="250" height="59"
361+
<img src="https://mchacks.ca/martlet-text-13.png" width="250" height="59"
362362
alt="Logo" title="Logo" id="headerImage" mc:label="header_image"
363363
mc:edit="header_image" mc:allowdesigner mc:allowtext
364364
style="-ms-interpolation-mode:bicubic;border-width:0;line-height:100%;outline-style:none;text-decoration:none;height:auto;max-width:30%;width:250px;padding-top:20px;padding-bottom:20px;margin-left:auto;margin-right:auto;display:block;" />

‎assets/email/statusEmail/Accepted.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@
361361
<tr>
362362
<td valign="top" class="headerContent"
363363
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;">
364-
<img src="https://mchacks.ca/mchacks-long-tight.png" width="250" height="59"
364+
<img src="https://mchacks.ca/martlet-text-13.png" width="250" height="59"
365365
alt="Logo" title="Logo" id="headerImage" mc:label="header_image"
366366
mc:edit="header_image" mc:allowdesigner mc:allowtext
367367
style="-ms-interpolation-mode:bicubic;border-width:0;line-height:100%;outline-style:none;text-decoration:none;height:auto;max-width:30%;width:250px;padding-top:20px;padding-bottom:20px;margin-left:auto;margin-right:auto;display:block;" />

‎assets/email/statusEmail/Applied.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@
361361
<tr>
362362
<td valign="top" class="headerContent"
363363
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;">
364-
<img src="https://mchacks.ca/mchacks-long-tight.png" width="250" height="59"
364+
<img src="https://mchacks.ca/martlet-text-13.png" width="250" height="59"
365365
alt="Logo" title="Logo" id="headerImage" mc:label="header_image"
366366
mc:edit="header_image" mc:allowdesigner mc:allowtext
367367
style="-ms-interpolation-mode:bicubic;border-width:0;line-height:100%;outline-style:none;text-decoration:none;height:auto;max-width:30%;width:250px;padding-top:20px;padding-bottom:20px;margin-left:auto;margin-right:auto;display:block;" />

‎assets/email/statusEmail/Checked-in.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@
361361
<tr>
362362
<td valign="top" class="headerContent"
363363
style="-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;color:#4D4D4D;mso-table-lspace:0pt;mso-table-rspace:0pt;">
364-
<img src="https://mchacks.ca/mchacks-long-tight.png" width="250" height="59"
364+
<img src="https://mchacks.ca/martlet-text-13.png" width="250" height="59"
365365
alt="Logo" title="Logo" id="headerImage" mc:label="header_image"
366366
mc:edit="header_image" mc:allowdesigner mc:allowtext
367367
style="-ms-interpolation-mode:bicubic;border-width:0;line-height:100%;outline-style:none;text-decoration:none;height:auto;max-width:30%;width:250px;padding-top:20px;padding-bottom:20px;margin-left:auto;margin-right:auto;display:block;" />

0 commit comments

Comments
 (0)