Merge branch 'master' of git.handmade.network:hmn/hmn into jam-2022

src/templates/src/landing.html

@@ -102,6 +102,60 @@
 </div>
 */}}
 
+<div class="mb3 ph3 ph0-ns">
+	<style>
+        #jam-banner {
+            background: linear-gradient(174deg, #346ba6, #814cb7);
+            color: white !important;
+            text-align: center;
+        }
+
+        #jam-banner h3 {
+            font-family: 'MohaveHMN', sans-serif;
+            font-weight: normal;
+            font-size: 2.2rem;
+            line-height: 0.8;
+            margin: 0;
+            text-transform: uppercase;
+        }
+
+        #jam-details {
+            font-family: 'MohaveHMN', sans-serif;
+            font-variant: small-caps;
+            font-size: 1.2rem;
+            line-height: 0.8;
+            margin-top: 0.6rem;
+            letter-spacing: 0.02rem;
+        }
+
+        #jam-learn-more {
+            font-size: 1rem;
+        }
+
+        @media screen and (min-width: 30rem) {
+            #jam-banner {
+                text-align: left;
+            }
+
+            #jam-title-container {
+                padding-top: 0.2rem;
+            }
+        }
+    </style>
+	<a id="jam-banner" class="pv3 ph3 ph4-l br3 flex flex-column flex-row-ns items-center" href="{{ .JamUrl }}">
+		<img class="h3" src="{{ static "wheeljam2022/logo.svg" }}">
+		<div id="jam-title-container" class="flex flex-column pl3-m pl4-l pv3 pv0-ns">
+			<h3 id="jam-title">Wheel Reinvention Jam</h3>
+			<div id="jam-details">August 15 - 21. Change the status quo.</div>
+		</div>
+		<div class="flex-grow-1"></div>
+		<div id="jam-learn-more">
+			Learn more
+			<div class="dib svgicon">{{ svg "chevron-right" }}</div>
+		</div>
+	</a>
+</div>
+
 {{ if not .User }}
 	<div class="mb3 ph3 ph0-ns">
 		<style>

src/templates/src/wheeljam_2021_index.html

@@ -8,6 +8,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ static "favicon-16x16.png" }}">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ static "favicon-32x32.png" }}">
+
     {{ if .CanonicalLink }}<link rel="canonical" href="{{ .CanonicalLink }}">{{ end }}
     {{ range .OpenGraphItems }}
         {{ if .Property }}

src/templates/src/wheeljam_2022_index.html

@@ -8,6 +8,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ static "wheeljam2022/favicon-16x16.png" }}">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ static "wheeljam2022/favicon-32x32.png" }}">
+
     {{ if .CanonicalLink }}<link rel="canonical" href="{{ .CanonicalLink }}">{{ end }}
     {{ range .OpenGraphItems }}
         {{ if .Property }}
@@ -270,9 +273,9 @@
                     The jam takes place from Monday, August 15 through Sunday, August 21. Here's how you can participate:
                 </p>
                 
-                <h3>Pick a project and register.</h3>
+                <h3>Pick a project and form a team.</h3>
                 <p>
-                    Find a project idea that excites you! If there's a project you've always wanted to start, go for it. Otherwise, join the conversation over on our <a href="https://github.com/HandmadeNetwork/wishlist/discussions" target="_blank">Wishlist</a>, brainstorm project ideas, and find a team.
+                    Find a project idea that excites you! Whether there's a project you've always wanted to start, or you're looking for inspiration, join the conversation over on our <a href="https://github.com/HandmadeNetwork/wishlist/discussions" target="_blank">Wishlist</a>, brainstorm project ideas, and find a team.
                 </p>
 
                 <h3>Jam.</h3>

src/website/landing.go

@@ -29,7 +29,7 @@ type LandingTemplateData struct {
 	AtomFeedUrl    string
 	MarkAllReadUrl string
 
-	WheelJamUrl string
+	JamUrl string
 }
 
 func Index(c *RequestContext) ResponseData {
@@ -149,7 +149,7 @@ func Index(c *RequestContext) ResponseData {
 		AtomFeedUrl:    hmnurl.BuildAtomFeed(),
 		MarkAllReadUrl: hmnurl.HMNProjectContext.BuildForumMarkRead(0),
 
-		WheelJamUrl: hmnurl.BuildJamIndex(),
+		JamUrl: hmnurl.BuildJamIndex(),
 	}, c.Perf)
 	if err != nil {
 		return c.ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to render landing page template"))