From ed8e61185ffda25319dd7491e092e0e107566368 Mon Sep 17 00:00:00 2001
From: Felix Sargent <felix.sargent@gmail.com>
Date: Mon, 22 Jul 2024 16:46:33 -0700
Subject: [PATCH] Updated to match black and white color scheme of new CES
 site.

---
 approval_polls/staticfiles/style.css | 66 +++++++++++++++++++++++++---
 approval_polls/templates/base.html   | 10 +++--
 docker-compose.yml                   |  2 -
 3 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/approval_polls/staticfiles/style.css b/approval_polls/staticfiles/style.css
index b522ac8..30902d0 100644
--- a/approval_polls/staticfiles/style.css
+++ b/approval_polls/staticfiles/style.css
@@ -1,16 +1,41 @@
 .bg-primary {
   --bs-bg-opacity: 1;
-  background-color: #1d4749 !important;
+  background-color: #000000 !important;
 }
 
 .btn-secondary {
-  background-color: #42c2a1 !important; /* Teal */
-  border-color: #42c2a1 !important;
+  background-color: #fff !important; /* Teal */
+  border-color: #000 !important;
+  color: #000;
+}
+
+.btn-success {
+  background-color: #000 !important; /* Teal */
+  border-color: #fff !important;
+}
+
+.btn {
+    background-color: var(--token-80553515-7ab0-44ac-b981-96d7680674fd, #ffffff);
+    --border-bottom-width: 1px;
+    --border-color: var(--token-8333892f-efe4-41b8-b3da-b102a8c97a9f, #d4d4d4);
+    border-radius: 3px;
+    box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 1px 0px, rgba(0, 0, 0, 0.05) 0px 2px 4px 0px;
+    gap: 0px;
+    padding: 8px;
+}
+
+a {
+  color: #000;
+  font-weight: 600
+}
+
+a:hover {
+  color: #000;
 }
 
 .btn-primary {
-  background-color: #7ec242 !important;
-  border-color: #7ec242 !important;
+  background-color: #000;`
+  border-color: #fff;
 }
 
 .chart div {
@@ -52,3 +77,34 @@
   overflow: hidden;
   overflow-y: scroll;
 }
+
+body {
+  font-family: var(--framer-blockquote-font-family, var(--framer-font-family, Inter, Inter Placeholder, sans-serif));
+}
+
+@font-face {
+  font-family: Fragment Mono;
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url(https://fonts.gstatic.com/s/fragmentmono/v4/4iCr6K5wfMRRjxp0DA6-2CLnB45HhrUI.woff2) format("woff2");
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F
+}
+
+@font-face {
+  font-family: Fragment Mono;
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url(https://fonts.gstatic.com/s/fragmentmono/v4/4iCr6K5wfMRRjxp0DA6-2CLnB41HhrUI.woff2) format("woff2");
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF
+}
+
+@font-face {
+  font-family: Fragment Mono;
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url(https://fonts.gstatic.com/s/fragmentmono/v4/4iCr6K5wfMRRjxp0DA6-2CLnB4NHhg.woff2) format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD
+}
\ No newline at end of file
diff --git a/approval_polls/templates/base.html b/approval_polls/templates/base.html
index a94614d..b651fee 100644
--- a/approval_polls/templates/base.html
+++ b/approval_polls/templates/base.html
@@ -27,11 +27,13 @@
         <link type="text/css"
               rel="stylesheet"
               href="https://cdn.jsdelivr.net/jquery.jssocials/1.4.0/jssocials.css" />
-        <link href="https://cdn.jsdelivr.net/npm/bootswatch@5.1.3/dist/minty/bootstrap.min.css"
-              rel="stylesheet">
+        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous">
         </script>
-        <script src="https://js.sentry-cdn.com/78856604267db99554868743d5eb61e5.min.js"
+        <link rel="preconnect" href="https://fonts.googleapis.com">
+        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+        <link href="https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap" rel="stylesheet">
+                        <script src="https://js.sentry-cdn.com/78856604267db99554868743d5eb61e5.min.js"
                 crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jstimezonedetect/1.0.7/jstz.min.js"
                 integrity="sha512-pZ0i46J1zsMwPd2NQZ4IaL427jXE2RVHMk3uv/wPTNlBVp9AbB1L65/4YdrXRPLEmyZCkY9qYOOsQp44V4orHg=="
@@ -47,7 +49,7 @@
         {% get_current_timezone as TIME_ZONE %}
         <nav class="navbar navbar-expand-sm navbar-dark bg-primary">
             <div class="container-fluid">
-                <a class="navbar-brand" href="{% url 'index' %}">Vote.ElectionScience.Org</a>
+                <a class="navbar-brand" href="{% url 'index' %}">Vote, by ElectionScience.org</a>
                 <button class="navbar-toggler"
                         type="button"
                         data-bs-toggle="collapse"
diff --git a/docker-compose.yml b/docker-compose.yml
index 939ff0e..ea48494 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   web:
     build: .