Skip to content

Commit

Permalink
Update font & timeline
Browse files Browse the repository at this point in the history
  • Loading branch information
ericthelemur committed Nov 20, 2024
1 parent 0a5777d commit 6b79e23
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 16 deletions.
12 changes: 6 additions & 6 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ paths_keep_dates = true

[extra]
event_year = "2025" # e.g. "2022" or "Summer 2021"
event_start_date = "#th Feb 2025"
subs_close_date = "#th Jan"
sub_close_time = "2025-01-08T23:59:00Z"
countdown_time = "2025-02-03T10:00:00Z"
end_time = "2025-02-04T22:00:00Z"
event_date_range = "#-#th Feb"
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"

Expand Down
11 changes: 11 additions & 0 deletions sass/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion sass/custom/_timeline.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Binary file not shown.
1 change: 0 additions & 1 deletion templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
7 changes: 4 additions & 3 deletions templates/parts/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,16 @@
<script src="{{ get_url(path="scripts/site.js", cachebust=true) }}" defer></script>
<script src="{{ get_url(path="scripts/darkmode.js", cachebust=true) }}" defer></script>

<link rel="preload" as="font" type="font/woff2" href="/fonts/mulish-v13-latin-regular.woff2" crossorigin />
<link rel="preload" as="font" type="font/woff2" href="/fonts/montserrat-v26-latin-600.woff2" crossorigin />
{#<link rel="preload" as="font" type="font/woff2" href="/fonts/mulish-v13-latin-regular.woff2" />
<link as="font" type="font/woff2" href="/fonts/montserrat-v26-latin-600.woff2" />
<link rel="preload" as="font" type="font/woff2" href="/fonts/montserrat-v26-latin-normal.woff2" />#}

{# Open Graph #}
<meta property="og:title" content="Warwick Speedrunning 2024" />
<meta name="description" content="A student-led speedrunning marathon in the UK supporting SpecialEffect." />
<meta property="og:description" content="A student-led speedrunning marathon in the UK supporting SpecialEffect." />
<meta property="og:url" content="{{current_url | safe }}" />
<meta property="og:image" content="{{ get_url(path=" bg-16-9.png")}}" />
<meta property="og:image" content="{{ get_url(path="bg-16-9.png")}}" />
<meta property="og:locale" content="en_GB" />
<meta name="keywords" content="Speedrunning, Warwick, Speedrun, Charity, SpecialEffect, UK, UWCS, Computing, University, Computer Science, Warwick, University of Warwick Computing Society, Programming, Gaming, Coding">

Expand Down
9 changes: 4 additions & 5 deletions templates/parts/timeline.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<h4 class="title is-size-4">Timeline</h4>
<div id="timeline-div">
<ul class="timeline" id="timeline">
Expand All @@ -10,17 +9,17 @@ <h4 class="title is-size-4">Timeline</h4>
<div class="timestamp">{{ config.extra.subs_close_date }}</div>
<div class="status">Submissions Close</div>
</li>
<li class="tl-elem">
{# <li class="tl-elem">
<div class="timestamp">~#th Jan</div>
<div class="status">Runs Accepted</div>
</li>
</li> #}
<li class="tl-elem phase-schedule phase-before">
<div class="timestamp">~#th Jan</div>
<div class="timestamp">~15th Jan</div>
<div class="status">Schedule Released</div>
</li>
<li class="tl-elem phase-during phase-ended">
<div class="timestamp">{{ config.extra.event_date_range }}</div>
<div class="status">WASD!</div>
</li>
</ul>
</div>
</div>

0 comments on commit 6b79e23

Please sign in to comment.