Merge branch 'main' into large-storage-custom-nas

themes/lhs/layouts/_default/baseof.html

@@ -30,7 +30,7 @@
                                 <div class="column is-half">
                                     {{ block "hero-image" . }}
                                     {{ $hero := printf "%s/%s" "images/" .Params.hero_image }}
-                                    <img class="image hero-img" src="{{ absURL $hero }}">
+                                    <img class="image hero-img" src="{{ absURL $hero }}" alt="" height="300px">
                                     {{ end }}
                                 </div>
                                 {{ end }}
@@ -48,10 +48,10 @@
             {{ block "content" . }}
             {{ end }}
         </div>
+
+        <div class="is-clearfix"></div>
     </section>
 
-    <div class="is-clearfix"></div>
-    
     {{ block "cta" . }}
     {{ if (default true .Params.show_cta) }}
         {{ if .Params.show_big_cta }}

themes/lhs/layouts/blog/list.html

@@ -15,12 +15,14 @@
 <h3 id="{{ .Key }}">{{ .Key }}</h3>
 
 {{- range .Pages }}
-{{ $image := .Resources.GetMatch .Params.listing_image }}
-{{ $image = $image.Fill "512x512 Center jpg" }}
 <div class="box">
     <div class="columns">
         <div class="column is-one-quarter has-text-centered is-hidden-mobile">
-            <img src="{{ $image.RelPermalink}}" class="image is-inline-block">
+					{{ with .Resources.GetMatch .Params.listing_image }}
+						{{ $image := . }}
+						{{ $image = $image.Fill "512x512 Center jpg" }}
+                            <img src="{{ $image.RelPermalink }}" class="image is-inline-block" alt="">
+					{{ end }}
         </div>
         <div class="column">
             <p><a href="{{ .RelPermalink }}">{{.Title}}</a> - {{ .Params.author }}<br />
@@ -32,4 +34,4 @@
 </div>
 {{- end }}
 {{- end }}
-{{ end }}
+{{ end }}

themes/lhs/layouts/blog/single.html

@@ -17,8 +17,10 @@
   </figure>
   <div class="media-content">
     <div class="content">
-      <p class="is-size-5 is-italic">This is a post by <b>{{ .Params.author }}</b>.<br />Originally
-        posted <b>{{ .PublishDate | time.Format ":date_full" }}</b></p>
+      <p class="is-size-6 is-italic">This is a post by <b>{{ .Params.author }}</b>.<br />
+        Posted <b>{{ .PublishDate | time.Format ":date_full" }}</b>
+        {{ if .Params.original_url }}<br/>Originally posted at <a href="{{ .Params.original_url }}" rel="canonical">{{ .Params.original_url }}</a>{{ end }}
+      </p>
     </div>
   </div>
 </article>

themes/lhs/layouts/partials/design/bigcta.html

@@ -3,7 +3,7 @@
         <div class="columns is-vcentered has-text-centered-mobile">
 
             <div class="column">
-                <img class="cta-img" src="{{ absURL "images/hero-img.svg" }}">
+                <img class="cta-img" src="{{ absURL "images/hero-img.svg" }}" height="560px" alt="">
             </div>
 
             <div class="column">

themes/lhs/layouts/partials/design/cta.html

@@ -1,8 +1,8 @@
 <section class="small_cta">
     <div class="container ">
         <div class="columns is-centered is-multiline is-vcentered is-half-desktop has-text-centered py-4">
-            <div class="column is-12-mobile _is-9-desktop _is-6-widescreen has-text-weight-bold" markdown="1">
-                Leigh Hackspace is open to all.<br>Being a member gives you access to our space, tools, and community.
+            <div class="column is-12-mobile _is-9-desktop _is-6-widescreen has-text-weight-bold">
+                <p>Leigh Hackspace is open to all.<br>Being a member gives you access to our space, tools, and community.</p>
             </div>
             <div class="column is-4-tablet _is-2-desktop is-3-widescreen">
                 <a href="{{ ref . "membership" }}" class="button is-primary is-fullwidth is-medium has-box-shadow">Join Leigh Hackspace</a>

themes/lhs/layouts/partials/footer.html

@@ -2,7 +2,7 @@
     <div class="container">
         <div class="columns">
             <div class="column is-1 is-pull-right-touch is-hidden-mobile">
-                <img src="{{ absURL "images/rose_logo.svg" }}" alt="The logo of Leigh Hackspace">
+                <img src="{{ absURL "images/rose_logo.svg" }}" alt="The logo of Leigh Hackspace" width="90px">
             </div>
 
             <div class="column is-4">

themes/lhs/layouts/partials/header.html

@@ -1,12 +1,11 @@
-<nav class="navbar is-spaced" role="navigation" aria-label="main navigation">
+<nav class="navbar is-spaced">
     <div class="container">
 
         <div class="navbar-brand">
             <a class="navbar-item" href="{{ absURL "" }}">
-                <img class="site-logo" src="{{ absURL "images/rose_logo.svg" }}" alt="The logo of Leigh Hackspace" width="70">
-                <span class="site-logo-text">Leigh<br/>Hackspace</span>
+                <img class="site-logo" src="{{ absURL "images/long_logo_solo_whitebg.svg" }}" alt="The logo of Leigh Hackspace" width="150">
             </a>
-            <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbar">
+            <a role="button" class="navbar-burger" aria-label="open menu" aria-expanded="false" data-target="navbar">
                 <span aria-hidden="true"></span>
                 <span aria-hidden="true"></span>
                 <span aria-hidden="true"></span>
@@ -18,7 +17,6 @@
 
                 {{- range site.Menus.main }}
                 <a href="{{ .URL }}" class="active navbar-item has-shadow is-size-5">{{ .Name }}</a>
-                </a>
                 {{- end }}
 
                 <div class="navbar-item has-shadow">

themes/lhs/layouts/shortcodes/clearfix.html

@@ -0,0 +1 @@
+    <div class="is-clearfix"></div>

themes/lhs/layouts/shortcodes/eventbrite.html

@@ -0,0 +1,3 @@
+<div class="events has-text-centered" id="eventbrite-events">
+    <a href="https://leighhack.eventbrite.com">☀️ See and book for our Summer of Making! ☀️</a>
+</div>