From 060cea27a7262809ad2aa906b34bd0a7da9d9f43 Mon Sep 17 00:00:00 2001 From: mntn Date: Tue, 24 Aug 2021 08:26:18 -0400 Subject: [PATCH 01/19] Format additional elements Add formatting for dl/dd/dt and samp, remove overflow:auto from inline elements --- static/css/typography.css | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/static/css/typography.css b/static/css/typography.css index a06ad18..d8f9150 100644 --- a/static/css/typography.css +++ b/static/css/typography.css @@ -101,6 +101,24 @@ ol li::marker { color: var(--bright-bg); } +dt { + margin: 0; + font-weight: bold; +} + +dd { + margin: 0 0 0 1.5rem; + font-style: italic; +} + +dd + dt { + margin-top: 1.5rem; +} + +dl { + margin: 0 0 1.5rem 0; +} + /* Blockquotes */ blockquote { position: relative; @@ -123,14 +141,15 @@ blockquote::before { /* Code */ pre, code, -kbd { - overflow-x: auto; +kbd, +samp { background: var(--dark-bg) !important; font-family: var(--font-monospace); color: var(--bright-bg); } pre { + overflow-x: auto; padding: 1.5rem; margin: 0 0 1.5rem 0; } @@ -158,6 +177,7 @@ hr:after { color: var(--bright-bg); } + /* Prevent super/sub from affecting line height */ sup, sub { vertical-align: baseline; From 6a53658646bfef1ae768f69aa1ff3f7aff72ad11 Mon Sep 17 00:00:00 2001 From: mntn Date: Tue, 24 Aug 2021 09:08:00 -0400 Subject: [PATCH 02/19] Ensure long page content doesn't overflow --- static/css/layout.css | 1 + 1 file changed, 1 insertion(+) diff --git a/static/css/layout.css b/static/css/layout.css index 711761a..da8027e 100644 --- a/static/css/layout.css +++ b/static/css/layout.css @@ -43,6 +43,7 @@ grid-area: body; background-color: var(--bg); box-shadow: 0 0 0 1rem var(--bg); + overflow-wrap: break-word; } .page__aside { From ea9f20b5a00455da0e14baa70d190cfda5267d78 Mon Sep 17 00:00:00 2001 From: mntn Date: Wed, 25 Aug 2021 14:16:36 -0400 Subject: [PATCH 03/19] Add bottom margin to hr for consistency --- static/css/typography.css | 1 + 1 file changed, 1 insertion(+) diff --git a/static/css/typography.css b/static/css/typography.css index a06ad18..2470e3f 100644 --- a/static/css/typography.css +++ b/static/css/typography.css @@ -151,6 +151,7 @@ mark { /* Other typographic elements */ hr { border: 0; + margin-bottom: 1.5rem; } hr:after { From 93a22994d4fa0efe6e32c03914ef925362727b05 Mon Sep 17 00:00:00 2001 From: mntn Date: Wed, 25 Aug 2021 14:42:42 -0400 Subject: [PATCH 04/19] Fix UL/OL margin per #11 --- static/css/typography.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/css/typography.css b/static/css/typography.css index a06ad18..c7fc34c 100644 --- a/static/css/typography.css +++ b/static/css/typography.css @@ -76,12 +76,12 @@ a:hover, a:active { /* Lists */ ul { - margin: 1rem 0; + margin: 0 0 1.5rem 0; padding-left: 1.25rem; } ol { - margin: 1rem 0; + margin: 0 0 1.5rem 0; padding-left: 1.75rem; } From 901bfea79ca21160a51b8376ad79234a7db325a9 Mon Sep 17 00:00:00 2001 From: Ahmet Artu Yildirim Date: Tue, 4 Jan 2022 15:01:24 -0800 Subject: [PATCH 05/19] Fix unicode rendering issue Unicode characters are not rendered correctly, in my case it was Turkish characters.. Specify utf-8 encoding in the header to fix this. --- layouts/partials/head.html | 1 + 1 file changed, 1 insertion(+) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 0407bf5..ce6930e 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -2,6 +2,7 @@ {{ with .Site.Params.about }}{{ end }} + From 10982d4bbbe7040b5cb4afdf7f860cffa5f7d5d6 Mon Sep 17 00:00:00 2001 From: Joe Roe Date: Mon, 10 Jan 2022 15:41:46 +0100 Subject: [PATCH 06/19] Remove example site readme Not needed, could be confusing. --- exampleSite/README.md | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 exampleSite/README.md diff --git a/exampleSite/README.md b/exampleSite/README.md deleted file mode 100644 index 11a456c..0000000 --- a/exampleSite/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# hugoBasicExample - -This repository offers an example site for [Hugo](https://gohugo.io/) and also it provides the default content for demos hosted on the [Hugo Themes Showcase](https://themes.gohugo.io/). - -# Using - -1. [Install Hugo](https://gohugo.io/overview/installing/) -2. Clone this repository - -```bash -git clone https://github.com/gohugoio/hugoBasicExample.git -cd hugoBasicExample -``` - -3. Clone the repository you want to test. If you want to test all Hugo Themes then follow the instructions provided [here](https://github.com/gohugoio/hugoThemes#installing-all-themes) - -4. Run Hugo and select the theme of your choosing - -```bash -hugo server -t YOURTHEME -``` - -5. Under `/content/` this repository contains the following: - -- A section called `/post/` with sample markdown content -- A headless bundle called `homepage` that you may want to use for single page applications. You can find instructions about headless bundles over [here](https://gohugo.io/content-management/page-bundles/#headless-bundle) -- An `about.md` that is intended to provide the `/about/` page for a theme demo - -6. If you intend to build a theme that does not fit in the content structure provided in this repository, then you are still more than welcome to submit it for review at the [Hugo Themes](https://github.com/gohugoio/hugoThemes/issues) respository From 64ef5c2385540e64ea72836470a3425de7133664 Mon Sep 17 00:00:00 2001 From: Joe Roe Date: Mon, 10 Jan 2022 17:32:36 +0100 Subject: [PATCH 07/19] Link to README.md for a quick example homepage. Closes #17 for now --- exampleSite/.hugo_build.lock | 0 exampleSite/content/_index.md | 4 +--- exampleSite/content/_index.md.old | 3 +++ static/css/typography.css | 6 ++++++ 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 exampleSite/.hugo_build.lock mode change 100644 => 120000 exampleSite/content/_index.md create mode 100644 exampleSite/content/_index.md.old diff --git a/exampleSite/.hugo_build.lock b/exampleSite/.hugo_build.lock new file mode 100644 index 0000000..e69de29 diff --git a/exampleSite/content/_index.md b/exampleSite/content/_index.md deleted file mode 100644 index ed6494b..0000000 --- a/exampleSite/content/_index.md +++ /dev/null @@ -1,3 +0,0 @@ -+++ -author = "Hugo Authors" -+++ diff --git a/exampleSite/content/_index.md b/exampleSite/content/_index.md new file mode 120000 index 0000000..fe84005 --- /dev/null +++ b/exampleSite/content/_index.md @@ -0,0 +1 @@ +../../README.md \ No newline at end of file diff --git a/exampleSite/content/_index.md.old b/exampleSite/content/_index.md.old new file mode 100644 index 0000000..ed6494b --- /dev/null +++ b/exampleSite/content/_index.md.old @@ -0,0 +1,3 @@ ++++ +author = "Hugo Authors" ++++ diff --git a/static/css/typography.css b/static/css/typography.css index 27e3587..5a2c044 100644 --- a/static/css/typography.css +++ b/static/css/typography.css @@ -206,3 +206,9 @@ th:first-child, td:first-child { th { text-align: inherit; } + +/* Figures */ +img { + max-width: 100%; + height: auto; +} From aefb9b2f00da8e00e2f567a580b537fec671f2c6 Mon Sep 17 00:00:00 2001 From: Joe Roe Date: Mon, 10 Jan 2022 17:33:39 +0100 Subject: [PATCH 08/19] Remove stray build file --- exampleSite/.hugo_build.lock | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 exampleSite/.hugo_build.lock diff --git a/exampleSite/.hugo_build.lock b/exampleSite/.hugo_build.lock deleted file mode 100644 index e69de29..0000000 From 3cacc821f4c651e280f8f5e93b8300b364104b51 Mon Sep 17 00:00:00 2001 From: Joe Roe Date: Wed, 20 Apr 2022 10:05:13 +0200 Subject: [PATCH 09/19] Close unclosed h1 tag. Fixes #29 --- layouts/_default/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index f91cdb0..37742ef 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,5 +1,5 @@ {{ define "main" }} -

{{ .Title | markdownify }}

+

{{ .Title | markdownify }}

{{ .Content }} From ad6b0f7c415780dceac144a40475778acb303a36 Mon Sep 17 00:00:00 2001 From: Robert Fox Date: Mon, 25 Jul 2022 12:16:08 +0800 Subject: [PATCH 10/19] Add param for "noindex" --- exampleSite/config.toml | 1 + layouts/partials/head.html | 1 + 2 files changed, 2 insertions(+) diff --git a/exampleSite/config.toml b/exampleSite/config.toml index a307cae..f47369b 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -15,6 +15,7 @@ ignoreErrors = ["error-remote-getjson"] sectionPagesMenu = "main" [params] +noindex = false [params.theme] palette = "gruvbox-dark" diff --git a/layouts/partials/head.html b/layouts/partials/head.html index ce6930e..3f67415 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -3,6 +3,7 @@ +{{ if .Site.Params.noindex }} {{ end }} From b283d363a4e8930eb82dd4ef0500bff9effb6705 Mon Sep 17 00:00:00 2001 From: "Wilson J. Holmes" Date: Mon, 8 Aug 2022 19:54:03 -0400 Subject: [PATCH 11/19] Update head.html to use newest font awesome icons --- layouts/partials/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 3f67415..4fd02f9 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -6,7 +6,7 @@ {{ if .Site.Params.noindex }} {{ end }} - + From e66b95587b66d60934cd2d05e79023baccbfd36b Mon Sep 17 00:00:00 2001 From: "Wilson J. Holmes" Date: Mon, 8 Aug 2022 20:05:28 -0400 Subject: [PATCH 12/19] Updated config.toml to reflect version bump --- exampleSite/config.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exampleSite/config.toml b/exampleSite/config.toml index f47369b..a838d04 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -29,16 +29,16 @@ logo = "images/rice.svg" # Sidebar: social links # Available icon sets: -# * FontAwesome 5 ('fas fa-' or 'fab-fa' for brands) +# * FontAwesome 6 ('fa-brands', 'fa-normal', or 'fa-solid' for brands) # * Academicons ('ai ai-') [[params.socialLinks]] -icon = "fab fa-github" +icon = "fa-brands fa-github" title = "GitHub" url = "https://github.com/joeroe/risotto" [[params.socialLinks]] -icon = "fas fa-envelope" +icon = "fa-solid fa-envelope" title = "Email" url = "mailto:example@example.com" From cee34f0461370aac107c82a35a0b36e7dece754d Mon Sep 17 00:00:00 2001 From: Rio <791713+rio-codes@users.noreply.github.com> Date: Tue, 20 Sep 2022 09:08:44 -0700 Subject: [PATCH 13/19] fix: add colors to dark mode css using variables --- static/css/colour/dark-mode.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/static/css/colour/dark-mode.css b/static/css/colour/dark-mode.css index 386f99d..d7b5f28 100644 --- a/static/css/colour/dark-mode.css +++ b/static/css/colour/dark-mode.css @@ -4,4 +4,7 @@ --bright-bg: var(--bright-black); --fg: var(--white); --bright-fg: var(--bright-white); + --logo-bg: var(--green); + --logo-hover: var(--bright-green); + --highlight-bg: var(--yellow); } From a1354188abcf27d309f3eab892f5f16ba4290d3b Mon Sep 17 00:00:00 2001 From: Rio <791713+rio-codes@users.noreply.github.com> Date: Tue, 20 Sep 2022 09:09:31 -0700 Subject: [PATCH 14/19] fix: add colors to light mode css using variables --- static/css/colour/light-mode.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/static/css/colour/light-mode.css b/static/css/colour/light-mode.css index 3ac2827..0e09f14 100644 --- a/static/css/colour/light-mode.css +++ b/static/css/colour/light-mode.css @@ -4,4 +4,7 @@ --bright-bg: var(--bright-black); --fg: var(--black); --bright-fg: var(--bright-black); + --logo-bg: var(--green); + --logo-hover: var(--bright-green); + --highlight-bg: var(--yellow); } From 1fe927af97026b0eee82af982cd2888b1a78c497 Mon Sep 17 00:00:00 2001 From: Rio <791713+rio-codes@users.noreply.github.com> Date: Tue, 20 Sep 2022 09:10:40 -0700 Subject: [PATCH 15/19] fix: change hard-coded colors to variables --- static/css/typography.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/css/typography.css b/static/css/typography.css index 5a2c044..abed6f4 100644 --- a/static/css/typography.css +++ b/static/css/typography.css @@ -163,7 +163,7 @@ strong { /* Highlighting */ ::selection, mark { - background-color: var(--yellow); + background-color: var(--highlight-bg); color: var(--bg); } From e93ff301909d3652ea33c72b40b10e2feb2d38f2 Mon Sep 17 00:00:00 2001 From: Rio <791713+rio-codes@users.noreply.github.com> Date: Tue, 20 Sep 2022 09:12:03 -0700 Subject: [PATCH 16/19] fix: change hard-coded colors to variables --- static/css/logo.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/css/logo.css b/static/css/logo.css index be24b86..06aa86c 100644 --- a/static/css/logo.css +++ b/static/css/logo.css @@ -11,7 +11,7 @@ .page__logo-inner { display: block; - background: var(--green); + background: var(--logo-bg); padding: 0.25rem; } @@ -22,7 +22,7 @@ a.page__logo-inner:link, a.page__logo-inner:visited { a.page__logo-inner:hover, a.page__logo-inner:active { - background: var(--bright-green); + background: var(--logo-hover); } .page__logo-inner:before { From a181c69fd64c2917ee4f5ee7a37ecd628873738a Mon Sep 17 00:00:00 2001 From: Joe Roe Date: Fri, 30 Sep 2022 12:54:31 +0200 Subject: [PATCH 17/19] Use base16 framework for palettes --- README.md | 36 ++++++++++++++++++++++----- exampleSite/.hugo_build.lock | 0 exampleSite/config.toml | 3 +-- layouts/partials/head.html | 3 +-- static/css/colour/dark-mode.css | 10 -------- static/css/colour/gruvbox-dark.css | 29 --------------------- static/css/colour/gruvbox-light.css | 30 ---------------------- static/css/colour/light-mode.css | 10 -------- static/css/colours.css | 17 +++++++++++++ static/css/footer.css | 2 +- static/css/layout.css | 6 ++--- static/css/logo.css | 5 ++-- static/css/palettes/base16-dark.css | 22 ++++++++++++++++ static/css/palettes/base16-light.css | 22 ++++++++++++++++ static/css/palettes/gruvbox-dark.css | 23 +++++++++++++++++ static/css/palettes/gruvbox-light.css | 23 +++++++++++++++++ static/css/risotto.css | 3 ++- static/css/typography.css | 20 +++++++-------- 18 files changed, 158 insertions(+), 106 deletions(-) create mode 100644 exampleSite/.hugo_build.lock delete mode 100644 static/css/colour/dark-mode.css delete mode 100644 static/css/colour/gruvbox-dark.css delete mode 100644 static/css/colour/gruvbox-light.css delete mode 100644 static/css/colour/light-mode.css create mode 100644 static/css/colours.css create mode 100644 static/css/palettes/base16-dark.css create mode 100644 static/css/palettes/base16-light.css create mode 100644 static/css/palettes/gruvbox-dark.css create mode 100644 static/css/palettes/gruvbox-light.css diff --git a/README.md b/README.md index acb717a..f0768d0 100644 --- a/README.md +++ b/README.md @@ -18,12 +18,6 @@ If your site is already a git repository, you can add the theme as a submodule i git submodule add https://github.com/joeroe/risotto.git themes/risotto ``` -## Configure - -To use the theme, add `theme = risotto` to your site's `config.toml` or `config.yaml`. - -See `exampleSite/config.toml` for the theme-specific parameters you need to add to your site's `config.toml` or `config.yaml` to configure the theme. - ## Update If you installed the theme using `git clone`, pull the repository to get the latest version: @@ -39,3 +33,33 @@ Or, if you added it as a git submodule: git submodule update --remote ``` +## Configure + +To use the theme, add `theme = risotto` to your site's `config.toml` or `config.yaml`. + +See `exampleSite/config.toml` for the theme-specific parameters you need to add to your site's `config.toml` or `config.yaml` to configure the theme. + +### Colour palettes + +Colour palettes for the theme are defined using the [base16 system](https://github.com/chriskempson/base16): + +| Base | Default colour | Used for | Examples | +| ---- | -------------- | -------- | -------- | +| 00 | Dark | Background | Page background | +| 01 | │ | Alt. background | Content background | +| 02 | │ | In-text backgrounds | `
`, ``, ``, `` |
+| 03   | │              | Muted text | `:before` & `:marker` symbols |
+| 04   | │              | Alt. foreground | Aside text          |
+| 05   | │              | Foreground         | Content text         |
+| 06   | │              |          |          |
+| 07   | Light          |          |          |
+| 08   | Red            |          |          |
+| 09   | Orange         |          |          |
+| 0A   | Yellow         | Highlights | Selected text, `` |
+| 0B   | Green          | Primary accent | Logo          |
+| 0C   | Cyan           | Active links | `a:active`, `a:hover`         |
+| 0D   | Blue           | Links    | `a:link`, `a:visited`         |
+| 0E   | Magenta        |          |          |
+| 0F   | Brown          |          |          |
+
+For light mode palettes, the sequence of 00–07 should be reversed (light to dark, not dark to light).
diff --git a/exampleSite/.hugo_build.lock b/exampleSite/.hugo_build.lock
new file mode 100644
index 0000000..e69de29
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index a838d04..567dd17 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -18,8 +18,7 @@ sectionPagesMenu = "main"
 noindex = false
 
 [params.theme]
-palette = "gruvbox-dark"
-mode = "dark-mode"
+palette = "gruvbox-light"
 
 # Sidebar: about/bio
 [params.about]
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 4fd02f9..900ccae 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -12,7 +12,6 @@
 
 
 
-
-
+
 
 
diff --git a/static/css/colour/dark-mode.css b/static/css/colour/dark-mode.css
deleted file mode 100644
index d7b5f28..0000000
--- a/static/css/colour/dark-mode.css
+++ /dev/null
@@ -1,10 +0,0 @@
-:root {
-    --bg: var(--black);
-    --dark-bg: var(--dark-black);
-    --bright-bg: var(--bright-black);
-    --fg: var(--white);
-    --bright-fg: var(--bright-white);
-    --logo-bg: var(--green);
-    --logo-hover: var(--bright-green);
-    --highlight-bg: var(--yellow);
-}
diff --git a/static/css/colour/gruvbox-dark.css b/static/css/colour/gruvbox-dark.css
deleted file mode 100644
index 24c4218..0000000
--- a/static/css/colour/gruvbox-dark.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* gruvbox dark mode
- * https://github.com/morhetz/gruvbox
- */
-:root {
-    --dark-black: #1d2021;
-    --black: #282828;
-    --bright-black: #928374;
-    
-    --white: #ebdbb2;
-    --bright-white: #fbf1c7;
-    
-    --red: #cc241d;
-    --green: #98971a;
-    --yellow: #d79921;
-    --blue: #458588;
-    --magenta: #b16286;
-    --cyan: #689d6a;
-    --orange: #d65d0e;
-    --gray: #928374;
-    
-    --bright-red: #fb4934;
-    --bright-green: #b8bb26;
-    --bright-yellow: #fabd2f;
-    --bright-blue: #83a598;
-    --bright-magenta: #d3869b;
-    --bright-cyan: #8ec07c;
-    --bright-orange: #fe8019;
-    --bright-gray: #a89984;
-}
diff --git a/static/css/colour/gruvbox-light.css b/static/css/colour/gruvbox-light.css
deleted file mode 100644
index cff8fa3..0000000
--- a/static/css/colour/gruvbox-light.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/* gruvbox light mode
- * https://github.com/morhetz/gruvbox
- */
-:root {
-    --dark-black: #282828;
-    --black: #3c3836;
-    --bright-black: #928374;
-    
-    --white: #fbf1c7;
-    --bright-white: #f9f5d7;
-
-    --red: #9d0006;
-    --green: #79740e;
-    --yellow: #b57614;
-    --blue: #076678;
-    --magenta: #8f3f71;
-    --cyan: #427b58;
-    --orange: #af3a03;
-    --gray: #7c6f64;
-
-    --dark-white: #f2e5bc;
-    --bright-red: #cc241d;
-    --bright-green: #98971a;
-    --bright-yellow: #d79921;
-    --bright-blue: #458588;
-    --bright-magenta: #b16286;
-    --bright-cyan: #689d6a;
-    --bright-orange: #d65d0e;
-    --bright-gray: #928374;
-}
diff --git a/static/css/colour/light-mode.css b/static/css/colour/light-mode.css
deleted file mode 100644
index 0e09f14..0000000
--- a/static/css/colour/light-mode.css
+++ /dev/null
@@ -1,10 +0,0 @@
-:root {
-    --bg: var(--white);
-    --dark-bg: var(--dark-white);
-    --bright-bg: var(--bright-black);
-    --fg: var(--black);
-    --bright-fg: var(--bright-black);
-    --logo-bg: var(--green);
-    --logo-hover: var(--bright-green);
-    --highlight-bg: var(--yellow);
-}
diff --git a/static/css/colours.css b/static/css/colours.css
new file mode 100644
index 0000000..4326985
--- /dev/null
+++ b/static/css/colours.css
@@ -0,0 +1,17 @@
+:root {
+	/* Background */
+	--bg: var(--base00);
+	--off-bg: var(--base01);
+	--inner-bg: var(--base02);
+
+	/* Text */
+	--fg: var(--base05);
+	--off-fg: var(--base04);
+	--muted: var(--base03);
+	--link: var(--base0D);
+	--hover: var(--base0C);
+	--highlight: var(--base0A);
+
+	/* Logo */
+	--logo: var(--base0B);
+}
diff --git a/static/css/footer.css b/static/css/footer.css
index 3c5d6e9..3e84188 100644
--- a/static/css/footer.css
+++ b/static/css/footer.css
@@ -1,5 +1,5 @@
 .page__footer {
-    color: var(--bright-bg);
+    color: var(--off-fg);
 }
 
 .page__footer p {
diff --git a/static/css/layout.css b/static/css/layout.css
index da8027e..d249166 100644
--- a/static/css/layout.css
+++ b/static/css/layout.css
@@ -41,14 +41,14 @@
 /* Body + aside */
 .page__body {
     grid-area: body;
-    background-color: var(--bg);
-    box-shadow: 0 0 0 1rem var(--bg);
+    background-color: var(--off-bg);
+    box-shadow: 0 0 0 1rem var(--off-bg);
     overflow-wrap: break-word;
 }
 
 .page__aside {
     grid-area: aside;
-    color: var(--bright-bg);
+    color: var(--off-fg);
 }
 
 /* Footer */
diff --git a/static/css/logo.css b/static/css/logo.css
index 06aa86c..368fff4 100644
--- a/static/css/logo.css
+++ b/static/css/logo.css
@@ -11,7 +11,8 @@
 
 .page__logo-inner {
     display: block;
-    background: var(--logo-bg);
+    background: var(--logo);
+    opacity: 0.90;
     padding: 0.25rem;
 }
 
@@ -22,7 +23,7 @@ a.page__logo-inner:link, a.page__logo-inner:visited {
 
 a.page__logo-inner:hover,
 a.page__logo-inner:active {
-    background: var(--logo-hover);
+    opacity: 1;
 }
 
 .page__logo-inner:before {
diff --git a/static/css/palettes/base16-dark.css b/static/css/palettes/base16-dark.css
new file mode 100644
index 0000000..cb1ec1d
--- /dev/null
+++ b/static/css/palettes/base16-dark.css
@@ -0,0 +1,22 @@
+/* base16 default dark
+ * https://github.com/chriskempson/base16-default-schemes
+ */
+
+:root {
+	--base00: #181818;
+	--base01: #282828;
+	--base02: #383838;
+	--base03: #585858;
+	--base04: #b8b8b8;
+	--base05: #d8d8d8;
+	--base06: #e8e8e8;
+	--base07: #f8f8f8;
+	--base08: #ab4642;
+	--base09: #dc9656;
+	--base0A: #f7ca88;
+	--base0B: #a1b56c;
+	--base0C: #86c1b9;
+	--base0D: #7cafc2;
+	--base0E: #ba8baf;
+	--base0F: #a16946;
+}
diff --git a/static/css/palettes/base16-light.css b/static/css/palettes/base16-light.css
new file mode 100644
index 0000000..bcbbb5a
--- /dev/null
+++ b/static/css/palettes/base16-light.css
@@ -0,0 +1,22 @@
+/* base16 default light
+ * https://github.com/chriskempson/base16-default-schemes
+ */
+
+:root {
+	--base00: #f8f8f8;
+	--base01: #e8e8e8;
+	--base02: #d8d8d8;
+	--base03: #b8b8b8;
+	--base04: #585858;
+	--base05: #383838;
+	--base06: #282828;
+	--base07: #181818;
+	--base08: #ab4642;
+	--base09: #dc9656;
+	--base0A: #f7ca88;
+	--base0B: #a1b56c;
+	--base0C: #86c1b9;
+	--base0D: #7cafc2;
+	--base0E: #ba8baf;
+	--base0F: #a16946;
+}
diff --git a/static/css/palettes/gruvbox-dark.css b/static/css/palettes/gruvbox-dark.css
new file mode 100644
index 0000000..1d60bd9
--- /dev/null
+++ b/static/css/palettes/gruvbox-dark.css
@@ -0,0 +1,23 @@
+/* gruvbox dark
+ * https://github.com/morhetz/gruvbox
+ * base16: https://github.com/dawikur/base16-gruvbox-scheme
+ */
+
+:root {
+	--base00: #282828;
+	--base01: #3c3836;
+	--base02: #504945;
+	--base03: #665c54;
+	--base04: #bdae93;
+	--base05: #d5c4a1;
+	--base06: #ebdbb2;
+	--base07: #fbf1c7;
+	--base08: #fb4934;
+	--base09: #fe8019;
+	--base0A: #fabd2f;
+	--base0B: #b8bb26;
+	--base0C: #8ec07c;
+	--base0D: #83a598;
+	--base0E: #d3869b;
+	--base0F: #d65d0e;
+}
diff --git a/static/css/palettes/gruvbox-light.css b/static/css/palettes/gruvbox-light.css
new file mode 100644
index 0000000..f786cf0
--- /dev/null
+++ b/static/css/palettes/gruvbox-light.css
@@ -0,0 +1,23 @@
+/* gruvbox light
+ * https://github.com/morhetz/gruvbox
+ * base16: https://github.com/dawikur/base16-gruvbox-scheme
+ */
+
+:root {
+	--base00: #fbf1c7;
+	--base01: #ebdbb2;
+	--base02: #d5c4a1;
+	--base03: #bdae93;
+	--base04: #665c54;
+	--base05: #504945;
+	--base06: #3c3836;
+	--base07: #282828;
+	--base08: #9d0006;
+	--base09: #af3a03;
+	--base0A: #b57614;
+	--base0B: #79740e;
+	--base0C: #427b58;
+	--base0D: #076678;
+	--base0E: #8f3f71;
+	--base0F: #d65d0e;
+}
diff --git a/static/css/risotto.css b/static/css/risotto.css
index 3c2969d..dcb5a96 100644
--- a/static/css/risotto.css
+++ b/static/css/risotto.css
@@ -1,3 +1,4 @@
+@import 'colours.css';
 @import 'typography.css';
 @import 'layout.css';
 @import 'header.css';
@@ -6,6 +7,6 @@
 @import 'footer.css';
 
 body {
-    background-color: var(--dark-bg);
+    background-color: var(--bg);
     color: var(--fg);
 }
diff --git a/static/css/typography.css b/static/css/typography.css
index abed6f4..11ef532 100644
--- a/static/css/typography.css
+++ b/static/css/typography.css
@@ -52,7 +52,7 @@ h3:before,
 h4:before, 
 h5:before, 
 h6:before {
-    color: var(--bright-bg);
+    color: var(--muted);
 }
 
 h1:first-child {
@@ -67,11 +67,11 @@ p {
 /* Links */
 
 a:link, a:visited {
-    color: var(--fg);
+    color: var(--link);
 }
 
 a:hover, a:active {
-    color: var(--bright-fg);
+    color: var(--hover);
 }
 
 /* Lists */
@@ -94,11 +94,11 @@ ol ol {
 
 ul li::marker {
     content: '∗\00A0';
-    color: var(--bright-bg);
+    color: var(--muted);
 }
 
 ol li::marker {
-    color: var(--bright-bg);
+    color: var(--muted);
 }
 
 dt {
@@ -129,7 +129,7 @@ blockquote::before {
     position: absolute;
     left: -1.5rem;
     content: ">";
-    color: var(--bright-bg);
+    color: var(--muted);
 }
 
 .twitter-tweet::before {
@@ -143,9 +143,9 @@ pre,
 code, 
 kbd,
 samp {
-    background: var(--dark-bg) !important;
+    background: var(--inner-bg) !important;
     font-family: var(--font-monospace);
-    color: var(--bright-bg);
+    color: var(--off-fg);
 }
 
 pre {
@@ -163,7 +163,7 @@ strong {
 /* Highlighting */
 ::selection,
 mark {
-    background-color: var(--highlight-bg);
+    background-color: var(--highlight);
     color: var(--bg);
 }
 
@@ -175,7 +175,7 @@ hr {
 
 hr:after {
     content: '---';
-    color: var(--bright-bg);
+    color: var(--muted);
 }
 
 

From 49554d3c65a929d0fd3bbaa7228d99f70a2b98b8 Mon Sep 17 00:00:00 2001
From: Joe Roe 
Date: Fri, 30 Sep 2022 13:07:31 +0200
Subject: [PATCH 18/19] Add hugo lock file to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2a8645f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.hugo_build.lock

From f5b07134a7d4c86d5b940e08b1598ee4af0aa727 Mon Sep 17 00:00:00 2001
From: Joe Roe 
Date: Fri, 30 Sep 2022 13:08:22 +0200
Subject: [PATCH 19/19] Change default palette to base16-dark

Even if the palette site parameter is not set.
---
 exampleSite/config.toml    | 2 +-
 layouts/partials/head.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 567dd17..b5bbcad 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -18,7 +18,7 @@ sectionPagesMenu = "main"
 noindex = false
 
 [params.theme]
-palette = "gruvbox-light"
+palette = "base16-dark"
 
 # Sidebar: about/bio
 [params.about]
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 900ccae..6ea6f1e 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -11,7 +11,7 @@
 
 
 
-
-
+
+