Merge branch 'draft'

.github/workflows/draft.yml

@@ -0,0 +1,21 @@
+name: Deploy to site
+
+on:
+  push:
+    branches: [ draft ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SITES_SSH_PRIVATE_KEY }}
+          name: id_ed25519
+          known_hosts: ${{ vars.SSH_KNOWN_HOSTS }}
+          config: ${{ vars.SSH_CONFIG }}
+          if_key_exists: fail
+      - name: Update Server
+        run: ssh sites "/srv/warwickspeedrun/source/draft.sh"

build.sh

@@ -3,6 +3,8 @@ set -e
 
 export SCRIPT_DIR=$(dirname "$(realpath $0)")
 cd $SCRIPT_DIR && echo "Running in $SCRIPT_DIR"
+
+git checkout master
 if [ -z $NO_PULL ]; then 
     git fetch --all --prune
     git reset --hard origin/master

config.toml

@@ -20,14 +20,14 @@ external_links_target_blank = true
 paths_keep_dates = true
 
 [extra]
-event_year = "2024"  # e.g. "2022" or "Summer 2021"
-event_start_date = "3rd Feb 2024"
-subs_close_date = "8th Jan"
-sub_close_time = "2024-01-08T23:59:00Z"
-countdown_time = "2024-02-03T10:00:00Z"
-end_time = "2024-02-04T22:00:00Z"
-event_date_range = "3-4th Feb 2024"
-signup_link = "https://oengus.fun/wasd2024"
-money_raised = "£9,000"
+event_year = "2025"  # e.g. "2022" or "Summer 2021"
+event_start_date = "8th Feb 2025"
+subs_close_date = "12th Jan"
+sub_close_time = "2025-01-12T12:00:00Z"
+countdown_time = "2025-02-08T10:00:00Z"
+end_time = "2025-02-09T21:00:00Z"
+event_date_range = "8-9th Feb"
+signup_link = "https://oengus.fun/wasd2025"
+money_raised = "£10,000"
 
-show_schedule = true
+show_schedule = false

content/guides/_index.md

@@ -6,6 +6,53 @@ page_template = "guide.html"
 
 We currently have three guides:
 
-- [**How to Speedrun**](learn) - an overview of getting started with speedrunning
-- [**Runners Guide**](runner) - our guide for potential runners
-- [**Travel Guide**](travel) - how to get to the University of Warwick & where to stay
+<style>
+    .content {
+        background-color: #2F3338;
+        position: relative;
+        /* margin: 1em; */
+        padding: 1.5em 2em;
+    }
+
+    .content h2 {
+        margin-top: 0;
+    }
+
+    .col-lg-6 {
+        flex-shrink: 1;
+    }
+
+    .stretched-link::after {
+        position: absolute;
+        inset: 0;
+        z-index: 100;
+        content: "";
+    }
+</style>
+
+<div class="row">
+<div class="col-lg-6">
+    <div class="content backing">
+        <h2>How to Speedrun</h2>
+        <p>An overview of getting started with speedrunning</p>
+        <a class="ms-3" href="learn">Read More >>></a>
+    </div>
+</div>
+
+<div class="col-lg-6">
+    <div class="content backing">
+    <h2>Runners Guide</h2>
+    <p>Event & submission details for runners, including a tech guide</p>
+    <a class="ms-3" href="runner">Read More >>></a>
+    </div>
+</div>
+
+<div class="col-lg-6">
+    <div class="content backing">
+    <h2>Travel Guide</h2>
+    <p>How to get to University of Warwick (It's in Coventry!) and where to stay around here</p>
+    <a class="ms-3" href="travel">Read More >>></a>
+    </div>
+</div>
+
+</div>

content/guides/runner/intro.md

@@ -1,7 +1,7 @@
 +++
 +++
 
-WASD {{ event_year }} will be on-site at the University of Warwick, UK, in the <a target="_blank" href="https://goo.gl/maps/NqFXnJLw5Jzzumho6">Students' Union Atrium</a>, and streamed live to [Twitch](/twitch). For 2024, we don't currently plan to accept online runs.
+WASD {{ event_year }} will be on-site at the University of Warwick, UK, in the <a target="_blank" href="https://goo.gl/maps/NqFXnJLw5Jzzumho6">Students' Union Atrium</a> or newly in the Esports Centre (this hasn't been confirmed!), and streamed live to [Twitch](/twitch). For 2024, we don't currently plan to accept online runs.
 
 Got a question about any aspect of the event? Please don't hesitate to reach out on our [Discord](/discord), either in public channels or directly to an @Organiser.
 

content/guides/runner/setup.md

@@ -28,7 +28,7 @@ If you're bringing your own device, please note that we'll be using a HDMI captu
 
 ## On the Day
 
-Please arrive **at least half an hour before** your scheduled slot, and come talk to the tech crew so we can set things up beforehand. The SU Atrium should look something like this:
+Please arrive **at least half an hour before** your scheduled slot, and come talk to the tech crew so we can set things up beforehand. Our layout should look something like this:
 
 ![/images/layout.png](/images/layout.png)
 

sass/_variables.scss

@@ -1,22 +1,22 @@
 $wasd-background: #fafafa;
 
-$hero-gradient-end: #3b0051;
-$hero-gradient-start: #661e92;
-$hero-gradient-tint: #d71eef;
-$hero-text: #1c002d;
+$hero-gradient-end: #15B228;
+$hero-gradient-start: #0E624A;
+$hero-gradient-tint: #15B228;
+$hero-text: #0F6C46;
 
-$where-grad-start: #501e92;
-$where-grad-end: #370051;
+$where-grad-start: #15B228;
+$where-grad-end: #0E624A;
 $where-text: $hero-text;
 
-$drop-shadow: #1F005188;
+$drop-shadow: #0E624A88;
 
 $uwcs-grey: #202429;
 $uwcs-greyer: #2F3338;
 
-$dark-purple: #74009D;
-$purple: #8A01CA;
-$pink: #C601A0;
+$dark-purple: #0E624A;
+$purple: #15B228;
+$pink: #E4E82B;
 
 $body-bg: #fafafa;
 // $body-bg-dark: $uwcs-grey;
@@ -27,6 +27,17 @@ $body-color: #363636;
 
 // $body-secondary-bg-dark: $uwcs-greyer;
 
+@font-face {
+    font-family: 'Montserrat';
+    src: url('/fonts/montserrat-v26-latin-regular.woff2');
+}
+
+@font-face {
+    font-family: 'Montserrat';
+    src: url('/fonts/montserrat-v26-latin-600.woff2');
+    font-weight: 600;
+}
+
 $font-family-sans-serif: "Montserrat", system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
 $headings-font-family: "Montserrat", system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
 

sass/custom/_event.scss

@@ -1,5 +1,5 @@
 .event-wrapper {
-  background-image: url('/images/top-bg.png?v=2024'), linear-gradient(5deg, $hero-gradient-end 5%, $hero-gradient-start 70%);
+  background-image: url('/images/event-bg.png?v=2025'), linear-gradient(5deg, $hero-gradient-end 5%, $hero-gradient-start 70%);
   background-size: cover;
   background-position: center;
 

sass/custom/_hero.scss

@@ -20,7 +20,7 @@
 }
 
 .hero {
-  background-image: url('/images/top-bg.png?v=2024'), linear-gradient(5deg, $hero-gradient-end 5%, $hero-gradient-start 70%);
+  background-image: url('/images/top-bg.png?v=2025'), linear-gradient(5deg, $hero-gradient-end 5%, $hero-gradient-start 70%);
   background-size: cover;
   background-position: center;
 
@@ -29,17 +29,17 @@
   z-index: 0;
   overflow: hidden;
 
-  & #photos {
-    background-image: url('/images/top-photos.png?v=2024');
-    background-size: cover;
-    background-position: center;
-    position: absolute;
-    height: 100%;
-    width: 100%;
-    max-width: unset;
-    z-index: -1;
-    animation: fadeInOut 20s infinite cubic-bezier(.93, .02, .95, .59);
-  }
+  // & #photos {
+  //   background-image: url('/images/top-photos.png?v=2024');
+  //   background-size: cover;
+  //   background-position: center;
+  //   position: absolute;
+  //   height: 100%;
+  //   width: 100%;
+  //   max-width: unset;
+  //   z-index: -1;
+  //   animation: fadeInOut 20s infinite cubic-bezier(.93, .02, .95, .59);
+  // }
 
   & .hero-body {
     padding-top: 0;

sass/custom/_timeline.scss

@@ -2,7 +2,7 @@
     @extend .clearfix;
     list-style-type: none;
     display: grid;
-    grid-template-columns: repeat(5, 18%);
+    grid-template-columns: repeat(4, 20%);
     justify-content: center;
     padding: 0;
 

templates/index.html

@@ -5,7 +5,6 @@
 
 {% block head %}
 {{ super() }}
-<link rel="preload" as="font" type="font/woff2" href="/fonts/montserrat-700-computingsociety-only.woff2" crossorigin />
 {% endblock %}
 
 {% block title %}Warwick Speedrunning 2024{% endblock title %}