Merge branch 'master' into add-license-1

HackQuarantine · Apr 10, 2020 · 6323e27 · 6323e27
2 parents 8c3aad6 + 19db1e2
commit 6323e27
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/_data/event_colours.yml b/_data/event_colours.yml
@@ -14,7 +14,12 @@ side-event: &side-event
   name: Side Events
   colour: "#5c6d6d"
 side-event-not-streamed:
-  <<: *side-event
+  hidden: true
+  name: Side Events
+  colour: "#5c6d6d"
 talk:
   name: Talks
   colour: "#260c1c"
+lhd:
+  name: "Partner Event"
+  colour: "#43aaff"
diff --git a/_includes/header.html b/_includes/header.html
@@ -3,7 +3,7 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <meta name="theme-color" content="#0e1428">
-        <meta property="og:title" content="{{ page.title }}">
+        <meta property="og:title" content="{{ page.title }} • A global, virtual hackathon">
         <meta property="og:description" content="A global, virtual hackathon">
         <meta property="og:image" content="https://hackquarantine.com/assets/img/social_banner.png">
         <meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
@@ -42,5 +42,5 @@
           {% endfor %}
         {% endif %}
 
-        <title>{{ page.title }}</title>
+        <title>{{ page.title }} • A global, virtual hackathon</title>
     </head>
diff --git a/assets/js/calendar.js b/assets/js/calendar.js
@@ -8,7 +8,7 @@ const SMALL_DEVICE_WIDTH = 768
 const SMALL_DEVICE_VIEW = 'listYear'
 const LARGE_DEVICE_VIEW = 'listYear'
 
-const STREAMED_TYPES = ['workshop', 'side-event', 'ceremony', 'talk']
+const STREAMED_TYPES = ['workshop', 'side-event', 'ceremony', 'talk', 'lhd']
 const STREAM_LINK = `<hr>This event will be livestreamed on our <a href="https://www.twitch.tv/hackquarantine">Twitch</a> channel`
 const VOD_LINK = `<hr>\This event has finished. Find recorded events on our <a href="https://hackquarantine.com/youtube">Youtube</a> channel`
 const DISCORD_LINK = `<hr>\This event will be held on our <a href="https://discord.hackquarantine.com/">Discord</a> server`

diff --git a/schedule.md b/schedule.md
@@ -39,7 +39,9 @@ scripts:
   <b>Event Types</b>
   <div id="colour-key">
     {% for event in site.data.event_colours %}
+    {% unless event[1].hidden %}
       <div class="type-{{ event[0] }}">{{ event[1].name }}</div>
+    {% endunless %}
     {% endfor %}
   </div>
 </div>