2020-06-12 00:42:12 +00:00
15 changed files with 21 additions and 21 deletions
--- a/assets/icons.css
+++ b/assets/icons.css
--- a/assets/light-theme.css
+++ b/assets/light-theme.css
--- a/assets/simplesystems.css
+++ b/assets/simplesystems.css
--- a/config.toml
+++ b/config.toml
@ -1,4 +1,5 @@
 languageCode = "en-us"
+disableKinds = ["taxonomy", "taxonomyTerm"]
 title = "SimpleSystems, LLC"

 [markup.goldmark.renderer]
--- a/data/home/ssattrs.json
+++ b/data/home/ssattrs.json
@ -1,4 +1,6 @@
-[
+---
+title:
+ssattrs: [
 	{
 		"title": "Comprehensible Interaction",
 		"img": "/img/interact.png",
@ -20,3 +22,4 @@
 		"desc": "When software simply does its job, and does it well, it will be an asset to other systems.  When software becomes convoluted, it will hinder other systems."
 	}
 ]
+---
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@ -4,26 +4,20 @@
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

-		<link rel="stylesheet" href="/icons.css">
-		<link rel="stylesheet" href="/simplesystems.css">
-		<link rel="stylesheet" href="/light-theme.css">
+		{{ partialCached "css-global.html" . }}
 		<link rel="shortcut icon" href="/favicon.ico">

-		<title>{{ block "title" . }}
-		{{ .Site.Title }}
-		{{ end }}</title>
+		<title>{{ .Site.Title }} {{ block "title" . }} {{ with .Title }} | {{ . }} {{ end }} {{ end }}</title>
 	</head>

 	<body>
-		{{ partial "navbar/site-navbar.html" . }}
+		{{ partialCached "navbar.html" . }}

 		<main>
-			{{ block "main" . }}
-				<!-- The part of the page that begins to differ between templates -->
-			{{ end }}
+			{{ block "main" . }} {{ end }}
 		</main>

-		{{ partial "footer/site-footer.html" . }}
-		{{ partial "scripts/scripts.html" . }}
+		{{ partialCached "footer.html" . }}
+		{{ partialCached "js-global.html" . }}
 	</body>
 </html>
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@ -1,6 +1,4 @@
 {{ define "main" }}
-	{{ .Content }}
-
 	<div class="container">
 		<div class="row">
 			{{ range .Pages }}
--- a/layouts/index.html
+++ b/layouts/index.html
@ -1,4 +1,4 @@
 {{ define "main" }}
 	{{ partial "jumbotron.html" . }}
-	{{ partial "simple-software.html" . }}
+	{{ partial "simple-software.html" .Params.ssattrs }}
 {{ end }}
--- a/layouts/partials/css-global.html
+++ b/layouts/partials/css-global.html
@ -0,0 +1,8 @@
+{{ $sheets := slice }}
+{{ range slice "icons.css" "simplesystems.css" "light-theme.css" }}
+	{{ $sheets = $sheets | append (resources.Get .) }}
+{{ end }}
+
+{{ $css := $sheets | resources.Concat "/css/main.css" | resources.Fingerprint "sha512" }}
+
+<link rel="stylesheet" href="{{ $css.RelPermalink }}" integrity="{{ $css.Data.Integrity }}">
--- a/layouts/partials/footer/site-footer.html
+++ b/layouts/partials/footer/site-footer.html
--- a/layouts/partials/scripts/scripts.html
+++ b/layouts/partials/scripts/scripts.html
--- a/layouts/partials/navbar/site-navbar.html
+++ b/layouts/partials/navbar/site-navbar.html
--- a/layouts/partials/simple-software.html
+++ b/layouts/partials/simple-software.html
@ -7,7 +7,7 @@
 	</div>

 	<div class="row justify-center">
-		{{ range $.Site.Data.home.ssattrs }}
+		{{ range $ }}
 			<div class="col xs-12 sm-10 md-6">
 				{{ partial "cards/home-card.html" . }}
 			</div>
--- a/layouts/section/blog.html
+++ b/layouts/section/blog.html
@ -1,6 +1,4 @@
 {{ define "main" }}
-	{{ .Content }}
-
 	<div class="container">
 		<div class="row text-center">
 			<div class="col xs-12">
--- a/layouts/section/jobs.html
+++ b/layouts/section/jobs.html
@ -1,6 +1,4 @@
 {{ define "main" }}
-	{{ .Content }}
-
 	<div class="container">
 		<div class="row text-center">
 			<div class="col xs-12">