Refactors and project cleanup #18

Merged
jeff merged 9 commits from refactors into master 2020-06-12 00:42:12 +00:00
15 changed files with 21 additions and 21 deletions

View File

@ -1,4 +1,5 @@
languageCode = "en-us" languageCode = "en-us"
disableKinds = ["taxonomy", "taxonomyTerm"]
title = "SimpleSystems, LLC" title = "SimpleSystems, LLC"
[markup.goldmark.renderer] [markup.goldmark.renderer]

View File

@ -1,4 +1,6 @@
[ ---
title:
ssattrs: [
{ {
"title": "Comprehensible Interaction", "title": "Comprehensible Interaction",
"img": "/img/interact.png", "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." "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."
} }
] ]
---

View File

@ -4,26 +4,20 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="/icons.css"> {{ partialCached "css-global.html" . }}
<link rel="stylesheet" href="/simplesystems.css">
<link rel="stylesheet" href="/light-theme.css">
<link rel="shortcut icon" href="/favicon.ico"> <link rel="shortcut icon" href="/favicon.ico">
<title>{{ block "title" . }} <title>{{ .Site.Title }} {{ block "title" . }} {{ with .Title }} | {{ . }} {{ end }} {{ end }}</title>
{{ .Site.Title }}
{{ end }}</title>
</head> </head>
<body> <body>
{{ partial "navbar/site-navbar.html" . }} {{ partialCached "navbar.html" . }}
<main> <main>
{{ block "main" . }} {{ block "main" . }} {{ end }}
<!-- The part of the page that begins to differ between templates -->
{{ end }}
</main> </main>
{{ partial "footer/site-footer.html" . }} {{ partialCached "footer.html" . }}
{{ partial "scripts/scripts.html" . }} {{ partialCached "js-global.html" . }}
</body> </body>
</html> </html>

View File

@ -1,6 +1,4 @@
{{ define "main" }} {{ define "main" }}
{{ .Content }}
<div class="container"> <div class="container">
<div class="row"> <div class="row">
{{ range .Pages }} {{ range .Pages }}

View File

@ -1,4 +1,4 @@
{{ define "main" }} {{ define "main" }}
{{ partial "jumbotron.html" . }} {{ partial "jumbotron.html" . }}
{{ partial "simple-software.html" . }} {{ partial "simple-software.html" .Params.ssattrs }}
{{ end }} {{ end }}

View File

@ -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 }}">

View File

@ -7,7 +7,7 @@
</div> </div>
<div class="row justify-center"> <div class="row justify-center">
{{ range $.Site.Data.home.ssattrs }} {{ range $ }}
<div class="col xs-12 sm-10 md-6"> <div class="col xs-12 sm-10 md-6">
{{ partial "cards/home-card.html" . }} {{ partial "cards/home-card.html" . }}
</div> </div>

View File

@ -1,6 +1,4 @@
{{ define "main" }} {{ define "main" }}
{{ .Content }}
<div class="container"> <div class="container">
<div class="row text-center"> <div class="row text-center">
<div class="col xs-12"> <div class="col xs-12">

View File

@ -1,6 +1,4 @@
{{ define "main" }} {{ define "main" }}
{{ .Content }}
<div class="container"> <div class="container">
<div class="row text-center"> <div class="row text-center">
<div class="col xs-12"> <div class="col xs-12">