From 648a67b056df898bfdd10033ce782aa121910a7c Mon Sep 17 00:00:00 2001 From: Mark Powers Date: Wed, 3 Aug 2022 21:28:39 -0500 Subject: Fix theme and content generation --- config.toml | 1 + content/_index.md | 20 ++++++++++++++++++++ content/index.md | 19 ------------------- themes/markskitchen/layouts/_default/baseof.html | 2 +- themes/markskitchen/layouts/_default/list.html | 7 +++++++ themes/markskitchen/layouts/index.html | 3 --- 6 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 content/_index.md delete mode 100644 content/index.md delete mode 100644 themes/markskitchen/layouts/index.html diff --git a/config.toml b/config.toml index 78c300c..22f883f 100644 --- a/config.toml +++ b/config.toml @@ -4,6 +4,7 @@ theme = "markskitchen" baseURL = "https://marks.kitchen" paginate = 5 rssLimit = 10 +description = "Mark's personal blog and more, showcasing lots of programming projects." [author] name = "Mark Powers" diff --git a/content/_index.md b/content/_index.md new file mode 100644 index 0000000..f9b7b0d --- /dev/null +++ b/content/_index.md @@ -0,0 +1,20 @@ +--- +title: "Mark's Kitchen" +date: 2022-07-18T20:37:25-05:00 +--- +Welcome to my website! + +Software Projects: +- [Gitweb](https://git.marks.kitchen) +- [GitHub](https://github.com/Mark-Powers) +- [Games](https://games.marks.kitchen/) +- [All projects](/projects) + +Writing +- [Blog](/blog) +- [Wiki](https://wiki.marks.kitchen/public) + +Follow: +- [Mastodon](https://fosstodon.org/@markp) +- [RSS feed](/index.xml) +- [Email](https://email.marks.kitchen) diff --git a/content/index.md b/content/index.md deleted file mode 100644 index 4603676..0000000 --- a/content/index.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: "Mark's Kitchen" -date: 2022-07-18T20:37:25-05:00 ---- -Welcome to my website! - -Software Projects: -- [Gitweb](https://git.marks.kitchen) -- [GitHub](https://github.com/Mark-Powers) -- [Games](https://games.marks.kitchen/) -- [All projects](/projects) - -Writing -- [Blog](/blog) -- [Wiki](https://wiki.marks.kitchen/public) - -Follow: -- [Mastodon](https://fosstodon.org/@markp) -- [RSS feed](/index.xml) diff --git a/themes/markskitchen/layouts/_default/baseof.html b/themes/markskitchen/layouts/_default/baseof.html index c4963da..5dc4b24 100644 --- a/themes/markskitchen/layouts/_default/baseof.html +++ b/themes/markskitchen/layouts/_default/baseof.html @@ -1,5 +1,5 @@ - + {{- partial "head.html" . -}} {{- partial "header.html" . -}} diff --git a/themes/markskitchen/layouts/_default/list.html b/themes/markskitchen/layouts/_default/list.html index 9388e7d..5c745d6 100644 --- a/themes/markskitchen/layouts/_default/list.html +++ b/themes/markskitchen/layouts/_default/list.html @@ -3,6 +3,12 @@ {{ end }} {{ define "main" }} +{{ if .Content }} +
+
+ {{ .Content }} +
+{{ else }}
    {{ range .Pages }} @@ -11,5 +17,6 @@ {{ end }}
+{{ end}}
{{ end }} diff --git a/themes/markskitchen/layouts/index.html b/themes/markskitchen/layouts/index.html deleted file mode 100644 index 422469a..0000000 --- a/themes/markskitchen/layouts/index.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "head" }} - -{{ end }} -- cgit v1.2.3