fix some ui (#10) and more

wlmac · Dec 18, 2022 · 188e2d4 · 188e2d4
1 parent 4682edc
commit 188e2d4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/scavenger2022/core/static/core/base.css b/scavenger2022/core/static/core/base.css
@@ -1,10 +1,12 @@
 :root {
   --size: 1.4rem;
-  --bg: #fc5656;
+  --bg: #D93B3B;
   --fg: #eeeeee;
   --link: hsl(220deg 100% 90%);
   --linkv: hsl(260deg 100% 90%);
-  --accent: hsl(0deg 100% 83.3%);
+  --accent: #FFAAAA;
+  --cd-bg: #8A3131;
+  --cd-txt: #DCC1C1;
   /* #fc5656 */
 }
 
@@ -16,7 +18,7 @@
 
 body {
   margin: 0;
-  font-family: 'Zen Kaku Gothic New', sans-serif;
+  font-family: 'Work Sans', sans-serif;
   font-size: var(--size);
   color: var(--fg);
   background: var(--bg);
@@ -68,6 +70,14 @@ body > nav {
   color: #f23749;
 }
 
+.cd_container {
+  width: calc(100vw - 2 * 1rem);
+  padding: 1rem;
+  color: var(--cd-txt);
+  background: var(--cd-bg);
+
+}
+
 .spacer {
   float: right;
 }
@@ -76,7 +86,7 @@ body > nav {
   background: none !important;
   border: none;
   padding: 0 !important;
-  font-family: 'Zen Kaku Gothic New', sans-serif;
+  font-family: 'Work Sans', sans-serif;
   font-size: var(--size);
   color: var(--link);
   text-decoration: underline;
@@ -94,6 +104,7 @@ a:visited {
 .messages, .nodot {
   list-style: none;
   padding: 1rem;
+  margin: 0.5rem;
 .}
 
 .imgicon {
@@ -136,11 +147,11 @@ a:visited {
   background: var(--fg);
   transition: 0.3s;
   border: 0;
-  padding: 0.5rem;
+  padding: 0.8rem;
   font-size: var(--size);
-  font-family: 'Zen Kaku Gothic New', sans-serif;
+  font-family: 'Work Sans', sans-serif;
   font-weight: inherit;
-  color: #000 !important;
+  color: #943131 !important;
   /* TODO: match design font weight */
   text-decoration: none;
 }
@@ -194,6 +205,7 @@ a:visited {
 .identity {
   display: flex;
   flex-direction: column;
+  line-height: 1.5rem;
 }
 
 .identity > .team-name {

diff --git a/scavenger2022/core/templates/core/base.html b/scavenger2022/core/templates/core/base.html
@@ -9,8 +9,7 @@
         <link rel="stylesheet" href="{% static 'core/base.css' %}" />
         <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=Zen+Kaku+Gothic+New:wght@300;400;700&display=swap" rel="stylesheet">
-        <link href="{% static 'fontawesomefree/css/fontawesome.css' %}" rel="stylesheet" type="text/css">
+        <link href="https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">        <link href="{% static 'fontawesomefree/css/fontawesome.css' %}" rel="stylesheet" type="text/css">
         <link href="{% static 'fontawesomefree/css/solid.css' %}" rel="stylesheet" type="text/css">
         {% if START_BEFORE or END_BEFORE %}
           <script type="module">
@@ -36,15 +35,15 @@
 
 <div id="common-header">
   <style>
-    @import url('https://fonts.googleapis.com/css2?family=Zen+Kaku+Gothic+New&display=swap');
+    @import url('https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
     #common-nav {
       background: #073763;
     }
     #common-nav-inner {
       margin: auto;
       max-width: 900px;
       font-size: 1rem;
-      font-family: 'Zen Kaku Gothic New', sans-serif;
+      font-family: 'Work Sans', sans-serif;
       font-weight: 400;
       color: #d0d0d0;
       padding: 4px;
@@ -109,7 +108,7 @@ <h1>{% block header %}{% endblock %}</h1>
     </main>
     <div style="flex-grow: 1;"></div>
     {% if START_BEFORE or END_BEFORE %}
-      <nav id="countdown-header">
+      <nav class="cd_container" id="countdown-header">
         <span id="countdown"></span>
         <span id="countdown-text"></span>
       </nav>