Skip to content

Commit

Permalink
Changed color to mails buttons and links [Missing 2024 Banner] (#291)
Browse files Browse the repository at this point in the history
* Changed color to mails buttons and links

* Changed mail closing link from FB to IG

* Added travel closing message only to relevant emails

* Added new mail header

---------

Co-authored-by: Adri <119002051+AdriMM26@users.noreply.github.com>
  • Loading branch information
gerardm27 and AdriMM26 authored Feb 14, 2024
1 parent f045b47 commit 41e7f80
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 22 deletions.
Binary file modified app/static/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/static/logo_old3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions app/templates/base_email.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<title>{{ subject }}</title>
<style type="text/css">
a {
color: #BEB771;
color: #7F27A2;
text-decoration: none;
-webkit-transition: all .1s linear;
-moz-transition: all .1s linear;
Expand All @@ -17,7 +17,7 @@
}

a:hover, a:active, a:focus {
color: #67622f;
color: #7F27A2;
text-decoration: none;
}

Expand Down Expand Up @@ -102,12 +102,12 @@
}

.btn-primary table td:hover {
background-color: #67622f !important;
background-color: #410658 !important;
}

.btn-primary a:hover {
background-color: #67622f !important;
border-color: #67622f !important;
background-color: #410658 !important;
border-color: #410658 !important;
}
}
</style>
Expand Down
13 changes: 8 additions & 5 deletions app/templates/mails/include/closing.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
<p>
Have any other questions? Email us at {{ h_contact_email|urlize }}
{% if h_fb or h_tw %}
{% if h_ig or h_tw %}
or message us on
{% if h_fb %}
{% if h_ig %}
{% if h_tw %}
<a href="https://facebook.com/{{ h_fb }}" target="_blank">Facebook</a>
and
<a href="https://instagram.com/{{ h_ig }}" target="_blank">Instagram</a>
or
<a href="https://twitter.com/{{ h_tw }}" target="_blank">Twitter</a>.
{% else %}
<a href="https://facebook.com/{{ h_fb }}" target="_blank">Facebook</a>.
<a href="https://instagram.com/{{ h_ig }}" target="_blank">Instagram</a>.
{% endif %}
{% elif h_tw %}
<a href="https://twitter.com/{{ h_tw }}" target="_blank">Twitter</a>.
{% endif %}
{% endif %}
</p>
{% if travel == "true" %}
<p>If you have any questions regarding Travel Reimbursments, please reach us out at <a href="mailto:reimbursements@hackupc.com">reimbursements@hackupc.com</a>.</p>
{% endif %}
<p>We hope to see you at {{ h_name }}!</p>
<p>Best, {{ h_name }} Team.</p>
4 changes: 2 additions & 2 deletions app/templates/mails/include/email_button.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
style="border-collapse:separate;mso-table-lspace:0pt;mso-table-rspace:0pt;width:100%;width:auto;">
<tbody>
<tr>
<td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#BEB771;border-radius:5px;text-align:center; margin: 0 auto;">
<td style="font-family:sans-serif;font-size:14px;vertical-align:top;background-color:#7F27A2;border-radius:5px;text-align:center; margin: 0 auto;">
<a href="{{ url }}" target="_blank"
style="text-decoration:underline;border:solid 1px #BEB771;border-radius:5px;box-sizing:border-box;cursor:pointer;display:inline-block;font-size:14px;font-weight:bold;margin:0;padding:12px 25px;text-decoration:none;text-transform:capitalize;background-color:#BEB771;color:#ffffff;">
style="text-decoration:underline;border:solid 1px #7F27A2;border-radius:5px;box-sizing:border-box;cursor:pointer;display:inline-block;font-size:14px;font-weight:bold;margin:0;padding:12px 25px;text-decoration:none;text-transform:capitalize;background-color:#7F27A2;color:#ffffff;">
{{ text }}
</a>
</td>
Expand Down
2 changes: 1 addition & 1 deletion applications/templates/mails/confirmation_message.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

{% include 'mails/include/cancel.html' %}
{% include 'mails/include/arrival_departure_info.html' %}
{% include 'mails/include/closing.html' %}
{% include 'mails/include/closing.html' with travel="false"%}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
</p>
{% endif %}
{% include 'mails/include/arrival_departure_info.html' %}
{% include 'mails/include/closing.html' %}
{% include 'mails/include/closing.html' with travel="true"%}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
{% include 'mails/include/email_button.html' with text='Confirm' url=confirm_url %}
{% include 'mails/include/cancel.html' %}
{% include 'mails/include/arrival_departure_info.html' %}
{% include 'mails/include/closing.html' %}
{% include 'mails/include/closing.html' with travel="false"%}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
</p>
{% endif %}
{% include 'mails/include/arrival_departure_info.html' %}
{% include 'mails/include/closing.html' %}
{% include 'mails/include/closing.html' with travel="false"%}
{% endblock %}
2 changes: 1 addition & 1 deletion applications/templates/mails/last_reminder_message.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
{% include 'mails/include/email_button.html' with text='Confirm' url=confirm_url %}

{% include 'mails/include/cancel.html' %}
{% include 'mails/include/closing.html' %}
{% include 'mails/include/closing.html' with travel="true"%}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
<p>Please remember to <a href="{{ confirm_url }}">confirm</a> your spot if you haven't already. If your plans
have changed, please let us know by cancelling your invite <a href="{{ cancel_url }}">here</a>.
</p>
{% include 'mails/include/closing.html' %}
{% include 'mails/include/closing.html' with travel="false"%}
{% endblock %}
2 changes: 1 addition & 1 deletion reimbursement/templates/mails/reimbursement_message.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
<p>
If you need an invite letter for your visa, send us a email to reimbursements@hackupc.com with your full name, university name and passport number, as shown in your passport or if you have any questions, don't hesitate to contact us.
</p>
{% include 'mails/include/closing.html' %}
{% include 'mails/include/closing.html' with travel="false"%}
{% endblock %}
2 changes: 1 addition & 1 deletion user/templates/mails/password_reset_message.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
</p>
<p style="text-align: center;">{{ reset_url|urlize }}</p>

{% include 'mails/include/closing.html' %}
{% include 'mails/include/closing.html' with travel="false"%}

{% endblock %}
2 changes: 1 addition & 1 deletion user/templates/mails/sponsor_link_message.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
</p>
<p style="text-align: center;">{{ app_sponsor_url|urlize }}</p>

{% include 'mails/include/closing.html' %}
{% include 'mails/include/closing.html' with travel="false"%}

{% endblock %}
2 changes: 1 addition & 1 deletion user/templates/mails/verify_email_message.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<p>You have 5 days to verify your email address for your account at {{ h_name }}.</p>
{% include 'mails/include/email_button.html' with text='Verify' url=activate_url %}

{% include 'mails/include/closing.html' %}
{% include 'mails/include/closing.html' with travel="true"%}
{% endblock %}

0 comments on commit 41e7f80

Please sign in to comment.