Finalize footer area.

front-seat · Apr 22, 2024 · 0bf9710 · 0bf9710
1 parent a11e2e3
commit 0bf9710
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 16 deletions.
diff --git a/server/settings.py b/server/settings.py
@@ -174,7 +174,7 @@
 
 # The email address that emails are sent from unless explicitly overridden
 # when invoking Django's `send_mail` function
-DEFAULT_FROM_EMAIL = os.getenv("DEFAULT_FROM_EMAIL", "hello@voterbowl.org")
+DEFAULT_FROM_EMAIL = os.getenv("DEFAULT_FROM_EMAIL", "info@voterbowl.org")
 
 # The *sending* email address used when Django emails admins about errors.
 # For now, we make this the same as DEFAULT_FROM_EMAIL

diff --git a/server/static/voter_bowl_logo.svg → server/static/img/voter_bowl_logo.svg b/server/static/voter_bowl_logo.svg → server/static/img/voter_bowl_logo.svg
diff --git a/server/vb/templates/email/base/body.dhtml b/server/vb/templates/email/base/body.dhtml
@@ -218,7 +218,7 @@
                             <p style="text-align: left; margin: 0">
                               <b>The VoterBowl Team</b>
                               <br />
-                              hello@voterbowl.org
+                              info@voterbowl.org
                             </p>
 
                             {% block footerextra %}{% endblock %}

diff --git a/server/vb/templates/email/base/body.txt b/server/vb/templates/email/base/body.txt
@@ -4,6 +4,6 @@
 {% block footer %}
 ---
 The VoterBowl Team
-hello@voterbowl.org
+info@voterbowl.org
 {% endblock %}
 {% endautoescape %}
diff --git a/server/vb/templates/includes/faq.dhtml b/server/vb/templates/includes/faq.dhtml
@@ -98,7 +98,7 @@
   <div class="qa">
     <h3>I have another question.</h3>
     <p>
-      <a href="mailto:hello@voterbowl.org">Contact us</a> and we'd be happy to answer it.
+      <a href="mailto:info@voterbowl.org">Contact us</a> and we'd be happy to answer it.
     </p>
   </div>
 </div>
diff --git a/server/vb/templates/includes/footer.dhtml b/server/vb/templates/includes/footer.dhtml
@@ -1,37 +1,54 @@
+{% load static %}
 <footer>
   <style>
     me {
       background-color: black;
-      color: #bbb;
+      color: #aaa;
       padding-top: 4rem;
       padding-bottom: 2rem;
+      padding-left: 2em;
+      padding-right: 2em;
+      width: 100%;
+    }
+
+    me div.center {
+      margin-bottom: 2em;
+      display: flex;
+      justify-content: center;
+    }
+
+    me div.outer {
       display: flex;
       flex-direction: row;
       justify-content: space-between;
-      width: 100%;
-      padding-left: 2em;
-      padding-right: 2em;
+      align-items: baseline;
     }
 
-    me div {
+    me div.inner {
       display: flex;
       flex-direction: row;
       gap: 1em;
     }
 
     me a {
-      color: #bbb;
+      color: #aaa;
       text-decoration: underline;
     }
 
     me a:hover {
       color: white;
     }
   </style>
-  <p>© 2024 VoterBowl & VoteAmerica</p>
-  <div>
-    <a href="/rules/" target="_blank">Rules</a>
-    <a href="https://about.voteamerica.com/privacy" target="_blank">Privacy</a>
-    <a href="https://about.voteamerica.com/terms" target="_blank">Terms</a>
+  <div class="center">
+    <img src="{% static "/img/voter_bowl_logo.svg" %}" alt="VoterBowl Logo">
+  </div>
+  <div class="outer">
+    <p>© 2024 Vote America</p>
+    <div class="inner">
+      <a href="{% url "vb:rules" %}" target="_blank">Rules</a>
+      <a href="https://about.voteamerica.com/privacy" target="_blank">Privacy</a>
+      <a href="https://about.voteamerica.com/terms" targdet="_blank">Terms</a>
+      <a href="mailto:[email protected]">Contact us</a>
+    </div>
   </div>
 </footer>
diff --git a/server/vb/templates/verify_email.dhtml b/server/vb/templates/verify_email.dhtml
@@ -170,7 +170,7 @@
             Sorry, <b>there was an error</b>. Please try again later.
           </p>
           <p>
-            If you continue to have issues, please contact us at <a href="mailto:hello@voterbowl.org">hello@voterbowl.org</a>.
+            If you continue to have issues, please contact us at <a href="mailto:info@voterbowl.org">info@voterbowl.org</a>.
           </p>
         {% else %}
           <p>Thanks for making sure you're ready to vote.</p>