From 56aba374b8d34876410f87f6a2c45519093a4977 Mon Sep 17 00:00:00 2001 From: steverusso Date: Mon, 1 Jun 2020 18:07:55 -0400 Subject: [PATCH 1/9] Move navbar and footer out of directories where they are the only files, update base template. --- layouts/_default/baseof.html | 12 ++++-------- .../{footer/site-footer.html => footer.html} | 0 .../{navbar/site-navbar.html => navbar.html} | 0 3 files changed, 4 insertions(+), 8 deletions(-) rename layouts/partials/{footer/site-footer.html => footer.html} (100%) rename layouts/partials/{navbar/site-navbar.html => navbar.html} (100%) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 0dd2df1..3f38f69 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -9,21 +9,17 @@ - {{ block "title" . }} - {{ .Site.Title }} - {{ end }} + {{ block "title" . }} {{ .Site.Title }} {{ end }} - {{ partial "navbar/site-navbar.html" . }} + {{ partial "navbar.html" . }}
- {{ block "main" . }} - - {{ end }} + {{ block "main" . }} {{ end }}
- {{ partial "footer/site-footer.html" . }} + {{ partial "footer.html" . }} {{ partial "scripts/scripts.html" . }} diff --git a/layouts/partials/footer/site-footer.html b/layouts/partials/footer.html similarity index 100% rename from layouts/partials/footer/site-footer.html rename to layouts/partials/footer.html diff --git a/layouts/partials/navbar/site-navbar.html b/layouts/partials/navbar.html similarity index 100% rename from layouts/partials/navbar/site-navbar.html rename to layouts/partials/navbar.html -- 2.45.2 From 6e9771cffcd4d81d89267768b4e01bf861d4e312 Mon Sep 17 00:00:00 2001 From: steverusso Date: Mon, 1 Jun 2020 18:11:20 -0400 Subject: [PATCH 2/9] Fix baseof titling. --- content/_index.md | 3 +++ layouts/_default/baseof.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 content/_index.md diff --git a/content/_index.md b/content/_index.md new file mode 100644 index 0000000..18b6319 --- /dev/null +++ b/content/_index.md @@ -0,0 +1,3 @@ +--- +title: +--- diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 3f38f69..482130f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -9,7 +9,7 @@ - {{ block "title" . }} {{ .Site.Title }} {{ end }} + {{ .Site.Title }} {{ block "title" . }} {{ with .Title }} | {{ . }} {{ end }} {{ end }} -- 2.45.2 From ede280bb6494ede3d7f3bcbb00e0f2e4e3d88964 Mon Sep 17 00:00:00 2001 From: steverusso Date: Mon, 1 Jun 2020 19:26:02 -0400 Subject: [PATCH 3/9] These don't make any sense. --- layouts/_default/section.html | 2 -- layouts/section/blog.html | 2 -- layouts/section/jobs.html | 2 -- 3 files changed, 6 deletions(-) diff --git a/layouts/_default/section.html b/layouts/_default/section.html index e30bf06..1e73680 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -1,6 +1,4 @@ {{ define "main" }} - {{ .Content }} -
{{ range .Pages }} diff --git a/layouts/section/blog.html b/layouts/section/blog.html index 3f295f9..9b157b3 100644 --- a/layouts/section/blog.html +++ b/layouts/section/blog.html @@ -1,6 +1,4 @@ {{ define "main" }} - {{ .Content }} -
diff --git a/layouts/section/jobs.html b/layouts/section/jobs.html index 39684f9..b9b2bb4 100644 --- a/layouts/section/jobs.html +++ b/layouts/section/jobs.html @@ -1,6 +1,4 @@ {{ define "main" }} - {{ .Content }} -
-- 2.45.2 From 11bb22ab301f37f657a8ce27613876d2b0eb0c69 Mon Sep 17 00:00:00 2001 From: steverusso Date: Mon, 1 Jun 2020 19:29:02 -0400 Subject: [PATCH 4/9] Global CSS and JS partials. --- layouts/_default/baseof.html | 6 ++---- layouts/partials/css-global.html | 3 +++ layouts/partials/{scripts/scripts.html => js-global.html} | 0 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 layouts/partials/css-global.html rename layouts/partials/{scripts/scripts.html => js-global.html} (100%) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 482130f..2622f02 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -4,9 +4,7 @@ - - - + {{ partialCached "css-global.html" . }} {{ .Site.Title }} {{ block "title" . }} {{ with .Title }} | {{ . }} {{ end }} {{ end }} @@ -20,6 +18,6 @@ {{ partial "footer.html" . }} - {{ partial "scripts/scripts.html" . }} + {{ partial "js-global.html" . }} diff --git a/layouts/partials/css-global.html b/layouts/partials/css-global.html new file mode 100644 index 0000000..297f35a --- /dev/null +++ b/layouts/partials/css-global.html @@ -0,0 +1,3 @@ + + + diff --git a/layouts/partials/scripts/scripts.html b/layouts/partials/js-global.html similarity index 100% rename from layouts/partials/scripts/scripts.html rename to layouts/partials/js-global.html -- 2.45.2 From 13a4561745ddbed6c626741517f1caa308943985 Mon Sep 17 00:00:00 2001 From: steverusso Date: Mon, 1 Jun 2020 19:30:07 -0400 Subject: [PATCH 5/9] Can cache the scripts and the footer. --- layouts/_default/baseof.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 2622f02..62b2d4c 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -17,7 +17,7 @@ {{ block "main" . }} {{ end }} - {{ partial "footer.html" . }} - {{ partial "js-global.html" . }} + {{ partialCached "footer.html" . }} + {{ partialCached "js-global.html" . }} -- 2.45.2 From 5743d57d6d49d8ed09b5d585c0b7d0343ce1bbcc Mon Sep 17 00:00:00 2001 From: steverusso Date: Mon, 1 Jun 2020 19:44:05 -0400 Subject: [PATCH 6/9] Make the CSS assets and bundle the global CSS. --- {static => assets}/icons.css | 0 {static => assets}/light-theme.css | 0 {static => assets}/simplesystems.css | 0 layouts/partials/css-global.html | 11 ++++++++--- 4 files changed, 8 insertions(+), 3 deletions(-) rename {static => assets}/icons.css (100%) rename {static => assets}/light-theme.css (100%) rename {static => assets}/simplesystems.css (100%) diff --git a/static/icons.css b/assets/icons.css similarity index 100% rename from static/icons.css rename to assets/icons.css diff --git a/static/light-theme.css b/assets/light-theme.css similarity index 100% rename from static/light-theme.css rename to assets/light-theme.css diff --git a/static/simplesystems.css b/assets/simplesystems.css similarity index 100% rename from static/simplesystems.css rename to assets/simplesystems.css diff --git a/layouts/partials/css-global.html b/layouts/partials/css-global.html index 297f35a..00ab07d 100644 --- a/layouts/partials/css-global.html +++ b/layouts/partials/css-global.html @@ -1,3 +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" }} + + -- 2.45.2 From fe2b096172ae9a7dafd43bb7f04d04ad5748eea7 Mon Sep 17 00:00:00 2001 From: steverusso Date: Thu, 11 Jun 2020 20:30:46 -0400 Subject: [PATCH 7/9] Navbar can be cached. --- layouts/_default/baseof.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 62b2d4c..a534cba 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -11,7 +11,7 @@ - {{ partial "navbar.html" . }} + {{ partialCached "navbar.html" . }}
{{ block "main" . }} {{ end }} -- 2.45.2 From bff5d731f3eb5092db08fddc0a7c032fb18a0c9a Mon Sep 17 00:00:00 2001 From: steverusso Date: Thu, 11 Jun 2020 20:33:57 -0400 Subject: [PATCH 8/9] Put the simple software data in the home page content file. --- content/_index.md | 22 ++++++++++++++++++++++ data/home/ssattrs.json | 22 ---------------------- layouts/index.html | 2 +- layouts/partials/simple-software.html | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 data/home/ssattrs.json diff --git a/content/_index.md b/content/_index.md index 18b6319..6063ece 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,3 +1,25 @@ --- title: +ssattrs: [ + { + "title": "Comprehensible Interaction", + "img": "/img/interact.png", + "desc": "The interface to software should be clear, without surprises. Engineers working on the project should not be deciphering code. Documentation is implied as part of the system, enabling all users to understand the software package better." + }, + { + "title": "Straightforward Modification", + "img": "/img/tools.png", + "desc": "Software should handle changes smoothly. Great software feels like it was designed for future changes. The documentation will instruct an engineer's strategy, removing ambiguity of how something works." + }, + { + "title": "Robust", + "img": "/img/robust.png", + "desc": "Load spikes, accidental misuse, and business growth should not bring software crashing to the ground. Systems should be designed to handle faults gracefully. If there are errors, they should be reported clearly." + }, + { + "title": "Leveraged by Other Systems", + "img": "/img/leverage.png", + "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." + } +] --- diff --git a/data/home/ssattrs.json b/data/home/ssattrs.json deleted file mode 100644 index 64c00a3..0000000 --- a/data/home/ssattrs.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "title": "Comprehensible Interaction", - "img": "/img/interact.png", - "desc": "The interface to software should be clear, without surprises. Engineers working on the project should not be deciphering code. Documentation is implied as part of the system, enabling all users to understand the software package better." - }, - { - "title": "Straightforward Modification", - "img": "/img/tools.png", - "desc": "Software should handle changes smoothly. Great software feels like it was designed for future changes. The documentation will instruct an engineer's strategy, removing ambiguity of how something works." - }, - { - "title": "Robust", - "img": "/img/robust.png", - "desc": "Load spikes, accidental misuse, and business growth should not bring software crashing to the ground. Systems should be designed to handle faults gracefully. If there are errors, they should be reported clearly." - }, - { - "title": "Leveraged by Other Systems", - "img": "/img/leverage.png", - "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." - } -] diff --git a/layouts/index.html b/layouts/index.html index 8ab3285..930b759 100644 --- 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 }} diff --git a/layouts/partials/simple-software.html b/layouts/partials/simple-software.html index a384751..8f63958 100644 --- a/layouts/partials/simple-software.html +++ b/layouts/partials/simple-software.html @@ -7,7 +7,7 @@
- {{ range $.Site.Data.home.ssattrs }} + {{ range $ }}
{{ partial "cards/home-card.html" . }}
-- 2.45.2 From f3f379d349c38a944a04b31917c13c3562f7ebb6 Mon Sep 17 00:00:00 2001 From: steverusso Date: Thu, 11 Jun 2020 20:35:32 -0400 Subject: [PATCH 9/9] Disable taxonomy types. --- config.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.toml b/config.toml index 2e4c528..ac8095d 100644 --- a/config.toml +++ b/config.toml @@ -1,4 +1,5 @@ languageCode = "en-us" +disableKinds = ["taxonomy", "taxonomyTerm"] title = "SimpleSystems, LLC" [markup.goldmark.renderer] -- 2.45.2