More cleanup of CSS

config.toml

@@ -5,14 +5,18 @@ title = 'Leigh Hackspace'
 enableRobotsTXT = true
 
 [sitemap]
-  changeFreq = 'weekly'
-  filename = 'sitemap.xml'
-  priority = -1
+changeFreq = 'weekly'
+filename = 'sitemap.xml'
+priority = -1
 
 [params]
 company = "Leigh Hackspace CIC"
 company_number = "09404083"
 copyright_years = "2023"
+description = "Leigh Hackspace is a hackspace located in the north-west of England."
+
+[params.social]
+twitter = 'leigh_hackspace'
 
 # Header links
 [menu]
@@ -37,37 +41,37 @@ name = "Events"
 pageRef = "events"
 
 # Social links
-[[params.social]]
+[[params.social_links]]
 name = "twitter"
 url = "https://twitter.com/leigh_hackspace"
 icon = "fa-twitter"
 
-[[params.social]]
+[[params.social_links]]
 name = "slack"
 url = "https://join.slack.com/t/leighhack/shared_invite/enQtNDYzMjEyMDMxNDExLTE1MWY5N2IwMzdhMzQ0ZWFiNDkyNzJmMGM1ZmFkODcwMGM5ODFmYmI4MjhmM2JiMWEyY2E3NTRjMTQzMzljZWU"
 icon = "fa-slack"
 
-[[params.social]]
+[[params.social_links]]
 name = "github"
 url = "https://github.com/leigh-hackspace"
 icon = "fa-github-alt"
 
-[[params.social]]
+[[params.social_links]]
 name = "instagram"
 url = "https://www.instagram.com/leighhackspace"
 icon = "fa-instagram"
 
-[[params.social]]
+[[params.social_links]]
 name = "facebook"
 url = "https://www.facebook.com/groups/leighhackspace/"
 icon = "fa-facebook-square"
 
-[[params.social]]
+[[params.social_links]]
 name = "discourse"
 url = "https://discourse.leighhack.org"
 icon = "fa-discourse"
 
-[[params.social]]
+[[params.social_links]]
 name = "mastodon"
 url = "https://mastodon.social/@leigh_hackspace"
 icon = "fa-mastodon"
@@ -125,4 +129,4 @@ price = " POA"
 period = "per month"
 description = "Enhanced membership which includes a dedicated space for your personal use."
 link = "mailto:info@leighhack.org?subject=Artist%20Pod%20Lease"
-button = "Enquire"
+button = "Enquire"

themes/lhs/assets/js/site.js

@@ -1,5 +1,3 @@
-// Hide and show menu 
-
 document.addEventListener('DOMContentLoaded', () => {
 
   // Get all "navbar-burger" elements
@@ -23,6 +21,4 @@ document.addEventListener('DOMContentLoaded', () => {
       });
     });
   }
-
-
 });

themes/lhs/assets/sass/leighhack.scss

@@ -1,5 +1,11 @@
 @charset "utf-8";
 
+// Additional fonts
+@font-face {
+	font-family: 'Transport Medium';
+	src: url('/fonts/transport-medium.woff2') format('woff2');
+}
+
 // Hackspace Branding 
 $family-sans-serif: "Roboto", sans-serif;
 $primary: #d41246;

themes/lhs/layouts/_default/baseof.html

@@ -45,8 +45,7 @@
     {{ end }}
 
     {{ partial "footer.html" .}}
-
-    <script src="/js/site.js"></script>
+    {{ partial "foot.html" .}}
 </body>
 
 </html>

themes/lhs/layouts/partials/foot.html

@@ -0,0 +1,4 @@
+{{ $site := resources.Get "js/site.js" }}
+{{ $js := slice $site | resources.Concat "js/bundle.js" | resources.Minify }}
+{{ $secureJS := $js | resources.Fingerprint "sha512" }}
+<script src="{{ $secureJS.Permalink }}" integrity="{{ $secureJS.Data.Integrity }}"></script>

themes/lhs/layouts/partials/footer.html

@@ -37,7 +37,7 @@
                 <div class="columns">
                     <div class="column is-4">
                         <ul class="has-text-white is-size-6 ">
-                            {{- with .Site.Params.social }}
+                            {{- with .Site.Params.social_links }}
                             {{ range . -}}
                             <li><a href="{{ .url | safeURL }}" target="_blank" rel="noopener me" title="{{ .name | humanize }}">{{ .name | humanize }}</a></li>
                             {{ end }}

themes/lhs/layouts/partials/head.html

@@ -1,8 +1,12 @@
-<meta charset="utf-8">
 <title>{{ block "title" . }}{{ .Site.Title }} - {{ .Title }}{{ end }}</title>
+
+<meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 
+{{ template "_internal/opengraph.html" . }}
+{{ template "_internal/twitter_cards.html" . }}
+
 <!-- favicons -->
 <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
 <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
@@ -19,10 +23,3 @@
 {{ with resources.Get "sass/leighhack.scss" | toCSS $opts | minify | fingerprint }}
   <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
 {{ end }}
-
-<style>
-    @font-face {
-        font-family: 'Transport Medium';
-        src: url('/fonts/transport-medium.woff2') format('woff2');
-    }
-</style>

themes/lhs/layouts/partials/header.html

@@ -32,7 +32,7 @@
             </div>
 
             <div class="navbar-end navbar--social-links">
-                {{- with .Site.Params.social }}
+                {{- with .Site.Params.social_links }}
                 {{ range . -}}
                 <div class="navbar-item is-inline-block-touch">
                     <span class="icon">

themes/lhs/static/js/leighhack-map-contact.js

@@ -1,53 +0,0 @@
-var layers = [new ol.layer.Tile({ source: new ol.source.OSM() })];
-var layer = layers[0];
-var dragPan = new ol.interaction.DragPan();
-// function createStyle(src, img) {
-// 	return new Style({
-// 		image: new Icon({
-// 			anchor: [-2.49259, 53.4929387],
-// 			crossOrigin: 'anonymous',
-// 			src: src,
-// 			img: img,
-// 			imgSize: img ? [img.width, img.height] : undefined,
-// 		}),
-// 	});
-// }
-
-// const iconFeature = new Feature(new Point([0, 0]));
-// iconFeature.set('style', createStyle('data/icon.png', undefined));
-
-var map = new ol.Map({
-	interactions:[
-	],
-	controls: [
-	],
-	layers: layers,
-	target: 'map',
-	view: new ol.View({
-		center: ol.proj.fromLonLat([-2.493739, 53.493150]),
-		// center: [-2.49258, 53.4929384],
-		zoom: 17
-	}),
-});
-
-// Create markers
-var markers = new ol.layer.Vector({
-	source: new ol.source.Vector(),
-	style: new ol.style.Style({
-		image: new ol.style.Icon({
-			anchor: [0.5, 1],
-			scale: 0.5,
-			src: '/user/themes/leighhack/images/leighhackspace-map-marker.png'
-		})
-	})
-});
-map.addLayer(markers);
-
-// Display Hackspace
-var hackspace = new ol.Feature(new ol.geom.Point(ol.proj.fromLonLat([-2.49370, 53.4931])));
-markers.getSource().addFeature(hackspace);
-
-// Greyscale the map
-// var enhance = new ol.filter.Colorize({ operation: 'grayscale', value: 1 });
-// layer.addFilter(enhance);
-

themes/lhs/static/js/leighhack-map.js

@@ -1,56 +0,0 @@
-
-// Initialize and add the map
-function initMap() {
-	
-	// The location of leighhack
-	var leighhack = {lat: 53.493037, lng:-2.493562};
-	
-	// The map, centered at leighhack
-  var map = new google.maps.Map(
-			document.getElementById('map'), {
-				zoom: 17, 
-				disableDefaultUI: true,
-				center: leighhack,
-				styles:
-				[{
-					featureType: "poi.business",
-					elementType: "labels",
-					stylers:
-					[{
-						visibility: "off"
-					}]
-				}]
-			}
-			);		
-	
-	// The marker, positioned at leighhack
-	var hackmarker = {
-		url: "/map-icon.svg",
-		anchor: new google.maps.Point(25,50),
-		scaledSize: new google.maps.Size(32,32)
-	}
-	
-	var marker = new google.maps.Marker({
-		position: leighhack, 
-		map: map,
-		icon: hackmarker
-	});
-
-// 	var styles = {
-// 		default: null,
-// 		hidden: [
-// 			{
-// 				featureType: 'poi.business',
-// 				stylers: [{visibility: 'off'}]
-// 			},
-// 			{
-// 				featureType: 'transit',
-// 				elementType: 'labels.icon',
-// 				stylers: [{visibility: 'off'}]
-// 			}
-// 		]
-// 	};
-
-// map.setOptions({ styles: ['hidden'] });
-
-}