From 03f5c1ada497ff2f4b3be11a1e8030ddd4c1bfdf Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 29 Jun 2024 10:24:29 -0700 Subject: [PATCH 01/44] Rename the design-system submodule -> base --- .gitmodules | 6 +++--- hugo.yaml | 9 ++++++--- themes/{design-system => base} | 0 3 files changed, 9 insertions(+), 6 deletions(-) rename themes/{design-system => base} (100%) diff --git a/.gitmodules b/.gitmodules index 68868ef..c499ac4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "themes/design-system"] - path = themes/design-system - url = nutmeg.erynwells.me:git/hugo-erynwells-design-system.git [submodule "themes/blog"] path = themes/blog url = nutmeg.erynwells.me:git/hugo-theme-erynwells-blog.git +[submodule "themes/base"] + path = themes/base + url = nutmeg.erynwells.me:git/hugo-theme-erynwells-base.git diff --git a/hugo.yaml b/hugo.yaml index bc21195..cdc35de 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -3,9 +3,12 @@ languageCode: en-us title: Test Site theme: - - design-system - blog + - base -modules: +module: + hugoVersion: + extended: false + min: "0.116.0" imports: - - path: "design-system" + - path: base diff --git a/themes/design-system b/themes/base similarity index 100% rename from themes/design-system rename to themes/base From 2466dd8f38101cb5979e76bf3f706f1cbe77d16e Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 29 Jun 2024 10:25:17 -0700 Subject: [PATCH 02/44] Fill in the details to make this site deployable to nutmeg.erynwells.me/sandbox --- Makefile | 22 ++++++++++++++++++++++ hugo.yaml | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..dcd4d74 --- /dev/null +++ b/Makefile @@ -0,0 +1,22 @@ +# Eryn Wells + +DEPLOY_USER=eryn +DEPLOY_HOSTNAME=nutmeg.erynwells.me +DEPLOY_PATH=/srv/www/nutmeg.erynwells.me/html/sandbox +DEPLOY_LOCATION=$(DEPLOY_USER)@$(DEPLOY_HOSTNAME):$(DEPLOY_PATH) + +HOSTNAME=$(shell hostname -s) + +.PHONY: site deploy clean + +site: + @echo "Building site" + hugo -D + +deploy: site + @echo "Deploying to $(DEPLOY_LOCATION)" + rsync -avz --no-times --no-perms --delete public/ $(DEPLOY_LOCATION) + git tag -f deploy-$(shell date +%Y-%m-%d) + +clean: + rm -rf public/ diff --git a/hugo.yaml b/hugo.yaml index cdc35de..d5c2850 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -1,6 +1,6 @@ -baseURL: https://example.org/ +baseURL: "https://nutmeg.erynwells.me/sandbox" languageCode: en-us -title: Test Site +title: Eryn Wells theme: - blog From 42f07cbfb7a5107e454b975aadce635eecdb196c Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Wed, 3 Jul 2024 07:46:04 -0700 Subject: [PATCH 03/44] Base: Update base submodule commit --- themes/base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base b/themes/base index 11a6774..e86e2d8 160000 --- a/themes/base +++ b/themes/base @@ -1 +1 @@ -Subproject commit 11a677476ba29416d08c0311079510c8ac339b24 +Subproject commit e86e2d85b4e16cec72a61e470d474e2cb1862944 From 20da003dc15a5ea3825f18dfb5b2bb83d9aed5eb Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 6 Jul 2024 10:22:46 -0700 Subject: [PATCH 04/44] Move the figures test to tests/ --- content/{ => tests}/figures/ggb.jpeg | Bin content/{ => tests}/figures/index.md | 6 ------ 2 files changed, 6 deletions(-) rename content/{ => tests}/figures/ggb.jpeg (100%) rename content/{ => tests}/figures/index.md (98%) diff --git a/content/figures/ggb.jpeg b/content/tests/figures/ggb.jpeg similarity index 100% rename from content/figures/ggb.jpeg rename to content/tests/figures/ggb.jpeg diff --git a/content/figures/index.md b/content/tests/figures/index.md similarity index 98% rename from content/figures/index.md rename to content/tests/figures/index.md index 5b3954d..8be8f83 100644 --- a/content/figures/index.md +++ b/content/tests/figures/index.md @@ -64,9 +64,3 @@ ultricies leo integer malesuada nunc vel risus commodo viverra. Vitae suscipit tellus mauris a diam maecenas. Duis convallis convallis tellus id interdum velit laoreet id. Hac habitasse platea dictumst vestibulum rhoncus. Ac orci phasellus egestas tellus. - -## Heading 2 - -### Heading 3 - -#### Heading 4 From ce89d8f418b4bf525c61ccbb90614c069cf3547e Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 6 Jul 2024 10:23:33 -0700 Subject: [PATCH 05/44] hugo.yaml: Move theme section to the bottom --- hugo.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hugo.yaml b/hugo.yaml index d5c2850..9ce13fc 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -2,9 +2,6 @@ baseURL: "https://nutmeg.erynwells.me/sandbox" languageCode: en-us title: Eryn Wells -theme: - - blog - - base module: hugoVersion: @@ -12,3 +9,7 @@ module: min: "0.116.0" imports: - path: base + +theme: + - blog + - base From 1a0c484a7b8c8b83eac21f79d4f30b3256f77ccc Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 6 Jul 2024 10:23:49 -0700 Subject: [PATCH 06/44] hugo.yaml: Bring markup config here from themes/base --- hugo.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hugo.yaml b/hugo.yaml index 9ce13fc..92711ca 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -2,6 +2,13 @@ baseURL: "https://nutmeg.erynwells.me/sandbox" languageCode: en-us title: Eryn Wells +markup: + goldmark: + parser: + wrapStandAloneImageWithinParagraph: false + highlight: + noClasses: false + module: hugoVersion: From a0515e9688b2b89d246c20308deb7a241eb077ab Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 6 Jul 2024 10:24:09 -0700 Subject: [PATCH 07/44] hugo.yaml: A menu for the whole site --- hugo.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hugo.yaml b/hugo.yaml index 92711ca..2ff2749 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -9,6 +9,14 @@ markup: highlight: noClasses: false +menus: + main: + - name: Blog + pageRef: "/blog" + weight: 20 + - name: Tests + pageRef: "/tests" + weight: 30 module: hugoVersion: From 8a67d46efdf8c3239519a1d7862c28264f32e4d4 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 6 Jul 2024 10:24:22 -0700 Subject: [PATCH 08/44] hugo.yaml: Permalinks for the two main sections --- hugo.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hugo.yaml b/hugo.yaml index 2ff2749..5558189 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -25,6 +25,14 @@ module: imports: - path: base +permalinks: + page: + blog: "/blog/:year/:month/:slug/" + tests: "/tests/:slug/" + section: + blog: "/blog/" + tests: "/tests/" + theme: - blog - base From b2e531ee81dcc2cd3ae773865ac4aebd285e19eb Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 6 Jul 2024 10:24:38 -0700 Subject: [PATCH 09/44] hugo.yaml: Add the blog module and set up mounts --- hugo.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hugo.yaml b/hugo.yaml index 5558189..0cdeae6 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -24,6 +24,16 @@ module: min: "0.116.0" imports: - path: base + - path: blog + mounts: + - source: assets + target: assets/blog + - source: layouts/_default + target: layouts/blog + - source: layouts/shortcodes + target: layouts/shortcodes + - source: layouts/partials + target: layouts/partials permalinks: page: From 319ad8bf0538d7010f08cb26717164b900551c05 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 23 Jul 2024 09:14:02 -0700 Subject: [PATCH 10/44] Update base submodule --- themes/base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base b/themes/base index e86e2d8..b130db2 160000 --- a/themes/base +++ b/themes/base @@ -1 +1 @@ -Subproject commit e86e2d85b4e16cec72a61e470d474e2cb1862944 +Subproject commit b130db28e05bf288f32de648c207b05f8f65f0c3 From c7fd27046e80b8ac6a3bb5a180a0433ea1aec3cd Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 23 Jul 2024 09:14:29 -0700 Subject: [PATCH 11/44] Add and update a bunch of test pages and blog post examples --- content/_index.md | 15 ++++++ content/blog/_index.md | 7 ++- content/blog/test-post-2.md | 5 +- content/blog/test-post-3.md | 5 +- content/tests/_index.md | 5 +- content/tests/code.md | 27 +++++++---- content/tests/ellinika.md | 11 +++++ content/tests/figures/index.md | 64 ++++--------------------- content/tests/footnotes.md | 13 ++---- content/tests/headings-toc.md | 48 +++++++++++++++++++ content/tests/lists.md | 85 ++++++++++++++++++++++++++++++++++ content/tests/nihongo.md | 28 +++++++++++ content/tests/quotations.md | 3 +- 13 files changed, 230 insertions(+), 86 deletions(-) create mode 100644 content/_index.md create mode 100644 content/tests/ellinika.md create mode 100644 content/tests/headings-toc.md create mode 100644 content/tests/lists.md create mode 100644 content/tests/nihongo.md diff --git a/content/_index.md b/content/_index.md new file mode 100644 index 0000000..fbd1ffd --- /dev/null +++ b/content/_index.md @@ -0,0 +1,15 @@ +--- +title: "~eryn" +params: + renderHeadingAnchors: false +--- + +Welcome to my website. Here is my latest post: + +{{< latest-page-summary section="/blog" >}} + +## Test Pages + +The following is a list of all the test pages I've compiled. + +{{< pages-list section="/tests" style=bullets >}} diff --git a/content/blog/_index.md b/content/blog/_index.md index cee47fd..2a740f0 100644 --- a/content/blog/_index.md +++ b/content/blog/_index.md @@ -1,7 +1,6 @@ --- -title: Posts +title: Blog --- -Sometimes I write things. - -{{< blog/recent-posts >}} +Sometimes I write things about stuff, and I want to keep a nice list of posts +for people to peruse. diff --git a/content/blog/test-post-2.md b/content/blog/test-post-2.md index 74f7efc..3990c2e 100644 --- a/content/blog/test-post-2.md +++ b/content/blog/test-post-2.md @@ -1,5 +1,6 @@ --- title: 'Test Post 2' +description: Sed felis eget velit aliquet sagittis id. date: 2024-06-18T13:27:25-07:00 params: subtitle: Subtitle @@ -8,10 +9,6 @@ categories: Politics tags: [Un, Deux, Trois] --- -Sed felis eget velit aliquet sagittis id. - - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Sed felis eget velit aliquet sagittis id. Blandit aliquam etiam erat velit scelerisque in. Blandit turpis diff --git a/content/blog/test-post-3.md b/content/blog/test-post-3.md index 116995f..4e7245c 100644 --- a/content/blog/test-post-3.md +++ b/content/blog/test-post-3.md @@ -1,13 +1,14 @@ --- title: 'Test Post 3' +description: + Posuere morbi leo urna molestie at elementum eu facilisis. Dui nunc mattis enim + ut tellus. date: 2024-06-21T11:15:31-07:00 draft: true categories: Hobbies tags: [Uno, Dos, Tres] --- -Posuere morbi leo urna molestie at elementum eu facilisis. Dui nunc mattis enim -ut tellus. diff --git a/content/tests/_index.md b/content/tests/_index.md index 14e3443..d9c99d9 100644 --- a/content/tests/_index.md +++ b/content/tests/_index.md @@ -1,5 +1,6 @@ --- title: Test Pages +linkTitle: Tests +params: + subtitle: A collection of pages to exercise various page elements. --- - -This is a collection of pages that exercise various features of Hugo. diff --git a/content/tests/code.md b/content/tests/code.md index 2a97bf2..0ea8c45 100644 --- a/content/tests/code.md +++ b/content/tests/code.md @@ -1,17 +1,28 @@ --- -title: Code +linkTitle: Code Blocks +title: Code Blocks & Highlighting description: Testing code blocks in the context of paragraphs, and syntax highlighting of the same. +params: + subtitle: Code blocks are complex and have a styling all their own. --- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut venenatis tellus in metus -vulputate eu scelerisque felis imperdiet. Consequat semper viverra nam libero -justo. Sit amet massa vitae tortor condimentum lacinia quis vel. Massa massa -ultricies mi quis hendrerit dolor magna eget. Est sit amet facilisis magna etiam -tempor orci eu lobortis. Cursus turpis massa tincidunt dui ut ornare. Elit -pellentesque habitant morbi tristique senectus. Morbi blandit cursus risus at -ultrices mi tempus imperdiet nulla. Odio pellentesque diam volutpat commodo sed -egestas egestas fringilla phasellus. Cursus vitae congue mauris rhoncus. +vulputate eu scelerisque felis imperdiet. + +```rust +fn main() { + println!("Hello world!"); +} +``` + +Consequat semper viverra nam libero justo. Sit amet massa vitae tortor +condimentum lacinia quis vel. Massa massa ultricies mi quis hendrerit dolor +magna eget. Est sit amet facilisis magna etiam tempor orci eu lobortis. Cursus +turpis massa tincidunt dui ut ornare. Elit pellentesque habitant morbi tristique +senectus. Morbi blandit cursus risus at ultrices mi tempus imperdiet nulla. Odio +pellentesque diam volutpat commodo sed egestas egestas fringilla phasellus. +Cursus vitae congue mauris rhoncus. ```c send(to, from, count) diff --git a/content/tests/ellinika.md b/content/tests/ellinika.md new file mode 100644 index 0000000..5104811 --- /dev/null +++ b/content/tests/ellinika.md @@ -0,0 +1,11 @@ +--- +title: Greek Text Layout +description: Τις ελέφαντας είναι ρος. +slug: ellinika +--- + +I took a trip to Greece in 2022, and before that trip I studied Greek. I wrote +some content on my blog in Greek, so I would like to ensure that it looks all +right. + +Οι γατες τον Δελφών. diff --git a/content/tests/figures/index.md b/content/tests/figures/index.md index 8be8f83..824c254 100644 --- a/content/tests/figures/index.md +++ b/content/tests/figures/index.md @@ -1,66 +1,18 @@ --- -title: Lorem Ipsum -params: - subtitle: sed adipiscing diam donec +title: Figures +description: Sed adipiscing diam donec --- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut venenatis tellus in metus vulputate eu scelerisque felis imperdiet. Consequat semper viverra nam libero justo. Sit amet massa vitae tortor condimentum lacinia quis vel. Massa massa -ultricies mi quis hendrerit dolor magna eget. Est sit amet facilisis magna etiam -tempor orci eu lobortis. Cursus turpis massa tincidunt dui ut ornare. Elit -pellentesque habitant morbi tristique senectus. Morbi blandit cursus risus at -ultrices mi tempus imperdiet nulla. Odio pellentesque diam volutpat commodo sed -egestas egestas fringilla phasellus. Cursus vitae congue mauris rhoncus. - -## Nulla at Volutpat - -Cras tincidunt lobortis feugiat vivamus at augue eget arcu dictum. Fermentum et -sollicitudin ac orci phasellus egestas tellus rutrum tellus. Fermentum leo vel -orci porta non pulvinar neque laoreet. Proin libero nunc consequat interdum -varius sit amet mattis vulputate. Semper viverra nam libero justo laoreet sit. -Consequat id porta nibh venenatis cras sed felis. Ultrices eros in cursus turpis -massa. Dictum non consectetur a erat. Cras sed felis eget velit. Quam adipiscing -vitae proin sagittis nisl rhoncus mattis rhoncus. Amet justo donec enim diam -vulputate ut pharetra sit amet. Velit sed ullamcorper morbi tincidunt ornare -massa. Posuere sollicitudin aliquam ultrices sagittis. Tortor id aliquet lectus -proin nibh nisl condimentum. Enim lobortis scelerisque fermentum dui faucibus -in. Diam in arcu cursus euismod quis viverra. Tellus in metus vulputate eu. -Nullam ac tortor vitae purus faucibus ornare. Justo laoreet sit amet cursus sit -amet dictum sit. - -## Nibh Mauris Cursus Mattis Molestie - -Lacus vestibulum sed arcu non odio euismod lacinia at. Tempus egestas sed sed -risus pretium. Pharetra massa massa ultricies mi quis hendrerit dolor magna -eget. Et malesuada fames ac turpis egestas integer eget. Feugiat pretium nibh -ipsum consequat nisl vel pretium lectus quam. Cras ornare arcu dui vivamus arcu. -Amet venenatis urna cursus eget nunc scelerisque viverra mauris. Diam phasellus -vestibulum lorem sed risus ultricies tristique nulla aliquet. Enim ut sem -viverra aliquet eget sit. Mi sit amet mauris commodo. Amet facilisis magna etiam -tempor orci eu. In hac habitasse platea dictumst vestibulum. Sapien et ligula -ullamcorper malesuada proin libero. Quis blandit turpis cursus in hac habitasse. -In ante metus dictum at tempor commodo ullamcorper. +ultricies mi quis hendrerit dolor magna eget. ![the graceful arches of the Golden Gate Bridge partially obscured by fog](ggb.jpeg "The Golden Gate Bridge from Crissy Field") -Id nibh tortor id aliquet lectus proin. Fringilla est ullamcorper eget nulla -facilisi. Curabitur vitae nunc sed velit dignissim sodales. Magna fringilla urna -porttitor rhoncus dolor purus non enim. Odio ut sem nulla pharetra diam sit -amet. Amet facilisis magna etiam tempor orci eu lobortis elementum nibh. Quis -ipsum suspendisse ultrices gravida dictum fusce. Dictum fusce ut placerat orci -nulla pellentesque. Sodales neque sodales ut etiam sit amet nisl purus in. Augue -interdum velit euismod in pellentesque massa placerat duis ultricies. - -Sit amet commodo nulla facilisi nullam vehicula. Laoreet suspendisse interdum -consectetur libero. Libero id faucibus nisl tincidunt eget. Consectetur a erat -nam at lectus urna duis. Et netus et malesuada fames ac turpis egestas maecenas. -Id donec ultrices tincidunt arcu. Urna duis convallis convallis tellus id -interdum velit laoreet. Ut etiam sit amet nisl purus in mollis. Tempor commodo -ullamcorper a lacus vestibulum sed arcu non odio. Risus quis varius quam quisque -id diam. Malesuada proin libero nunc consequat interdum varius sit. Vitae -ultricies leo integer malesuada nunc vel risus commodo viverra. Vitae suscipit -tellus mauris a diam maecenas. Duis convallis convallis tellus id interdum velit -laoreet id. Hac habitasse platea dictumst vestibulum rhoncus. Ac orci phasellus -egestas tellus. +Est sit amet facilisis magna etiam tempor orci eu lobortis. Cursus turpis massa +tincidunt dui ut ornare. Elit pellentesque habitant morbi tristique senectus. +Morbi blandit cursus risus at ultrices mi tempus imperdiet nulla. Odio +pellentesque diam volutpat commodo sed egestas egestas fringilla phasellus. +Cursus vitae congue mauris rhoncus. diff --git a/content/tests/footnotes.md b/content/tests/footnotes.md index 8374a53..c2dc3c1 100644 --- a/content/tests/footnotes.md +++ b/content/tests/footnotes.md @@ -1,20 +1,17 @@ --- title: Footnotes +description: How do footnotes look? --- -Hugo supports footnotes via the `[^1]` syntax. This page tests their layout. - - +Goldmark, Hugo's Markdown renderer, supports footnotes via the `[^1]` syntax. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae justo eget magna fermentum -iaculis eu. Pellentesque habitant morbi tristique senectus et netus et malesuada -fames. Non quam lacus suspendisse faucibus. Non enim praesent elementum -facilisis. Porta lorem mollis aliquam ut porttitor leo a diam.[^1] +iaculis eu.[^1] Elementum nisi quis eleifend quam adipiscing. Cursus sit amet dictum sit amet -justo donec. Faucibus interdum posuere lorem ipsum dolor. Urna cursus eget nunc -scelerisque viverra mauris in aliquam.[^2] Morbi leo urna molestie at. Nec +justo donec. Faucibus interdum posuere lorem ipsum dolor.[^2] Urna cursus eget nunc +scelerisque viverra mauris in aliquam. Morbi leo urna molestie at. Nec ullamcorper sit amet risus nullam eget felis eget. Tortor vitae purus faucibus ornare suspendisse. diff --git a/content/tests/headings-toc.md b/content/tests/headings-toc.md new file mode 100644 index 0000000..1e0110e --- /dev/null +++ b/content/tests/headings-toc.md @@ -0,0 +1,48 @@ +--- +title: Headings & Tables of Contents +description: A tree of headings and a table of contents. +params: + renderTableOfContents: true +--- + +## Heading 1 + +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor +incididunt ut labore et dolore magna aliqua. Tincidunt vitae semper quis lectus +nulla at volutpat diam ut. + +### Heading 1A + +Amet nisl suscipit adipiscing bibendum est ultricies integer quis. Ut sem +viverra aliquet eget sit amet tellus cras adipiscing. + +### Heading 1B + +Sed augue lacus viverra vitae. Porta lorem mollis aliquam ut porttitor. Ac odio +tempor orci dapibus ultrices. Aliquam purus sit amet luctus venenatis lectus. +Cras ornare arcu dui vivamus arcu felis bibendum ut. Non sodales neque sodales +ut etiam sit amet nisl purus. Enim facilisis gravida neque convallis a cras +semper auctor neque. + +## Heading 2 + +Dui faucibus in ornare quam viverra orci sagittis. + +### Heading 2A + +Feugiat scelerisque varius morbi enim nunc faucibus a pellentesque. Faucibus a +pellentesque sit amet. + +#### Heading 2AA + +Sagittis purus sit amet volutpat consequat mauris. Diam donec adipiscing +tristique risus nec feugiat in fermentum. Ipsum suspendisse ultrices gravida +dictum fusce ut placerat orci nulla. + +### Heading 2B + +Nec nam aliquam sem et tortor consequat. Malesuada fames ac turpis egestas sed +tempus urna et. Dignissim enim sit amet venenatis urna cursus eget nunc. Nibh +sit amet commodo nulla facilisi nullam vehicula ipsum. Id velit ut tortor +pretium viverra. Magna sit amet purus gravida quis. Elit duis tristique +sollicitudin nibh sit amet. diff --git a/content/tests/lists.md b/content/tests/lists.md new file mode 100644 index 0000000..7e9988d --- /dev/null +++ b/content/tests/lists.md @@ -0,0 +1,85 @@ +--- +title: 'Lists' +description: Exercise `
    `, `
      `, and `
      `. +--- + +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor +incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis +nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. + +## Unordered + +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu +fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum. + +* Consectetur adipiscing elit pellentesque habitant morbi tristique senectus et netus. +* Sit amet nisl suscipit adipiscing bibendum est ultricies integer. +* Ac ut consequat semper viverra nam. +* Auctor elit sed vulputate mi sit amet mauris commodo. + +Lectus quam id leo in vitae turpis massa sed. Risus quis varius quam quisque. +Nec feugiat nisl pretium fusce. Leo integer malesuada nunc vel risus commodo +viverra maecenas. Lacinia quis vel eros donec ac odio. + +## Ordered + +Amet consectetur adipiscing elit pellentesque habitant morbi tristique senectus +et. Egestas egestas fringilla phasellus faucibus scelerisque eleifend donec. +Pellentesque habitant morbi tristique senectus et netus et. + +1. Massa ultricies mi quis hendrerit. +1. Morbi quis commodo odio aenean. +1. Eu augue ut lectus arcu bibendum at varius vel pharetra. +1. Fusce ut placerat orci nulla pellentesque. +1. Massa ultricies mi quis hendrerit. +1. Morbi quis commodo odio aenean. +1. Eu augue ut lectus arcu bibendum at varius vel pharetra. +1. Fusce ut placerat orci nulla pellentesque. +1. Massa ultricies mi quis hendrerit. +1. Morbi quis commodo odio aenean. + +Morbi tempus iaculis urna id. Urna nunc id cursus metus. Mi eget mauris pharetra +et ultrices neque ornare. Vestibulum rhoncus est pellentesque elit ullamcorper +dignissim. + +1. Semper eget duis at tellus at urna condimentum. +1. Risus at ultrices mi tempus imperdiet nulla malesuada pellentesque. +1. Bibendum arcu vitae elementum curabitur. +1. Faucibus a pellentesque sit amet porttitor. +{start="1000"} + +Odio morbi quis commodo odio aenean sed adipiscing diam. Sit amet consectetur +adipiscing elit. Sit amet nulla facilisi morbi tempus. Pellentesque elit eget +gravida cum sociis natoque penatibus et magnis. Vestibulum mattis ullamcorper +velit sed ullamcorper morbi tincidunt. Sem integer vitae justo eget magna +fermentum iaculis eu non. Euismod nisi porta lorem mollis aliquam ut porttitor +leo. Massa tincidunt nunc pulvinar sapien et ligula ullamcorper. Feugiat nisl +pretium fusce id velit ut tortor. A erat nam at lectus urna duis convallis +convallis. Ultrices eros in cursus turpis. Non enim praesent elementum facilisis +leo vel fringilla est ullamcorper. Nibh ipsum consequat nisl vel pretium lectus +quam id. Aliquam sem et tortor consequat. + +## Definition + +Adipiscing elit ut aliquam purus sit amet luctus. Condimentum mattis +pellentesque id nibh tortor id aliquet lectus. Urna cursus eget nunc +scelerisque. Suscipit tellus mauris a diam. + +Eu consequat +: ac felis donec et odio + +Praesent tristique +: magna sit amet + +Vestibulum +: lorem sed risus ultricies tristique nulla aliquet + +Aliquam faucibus purus +: in massa tempor nec feugiat. Velit dignissim sodales ut eu sem. + +Magna fermentum iaculis eu non diam. Velit egestas dui id ornare arcu odio ut. Aliquet enim tortor at auctor urna nunc +id cursus metus. Egestas integer eget aliquet nibh praesent tristique magna. Ut diam quam nulla porttitor massa id neque +aliquam. Turpis massa tincidunt dui ut ornare. Sit amet nisl purus in mollis nunc sed. Pharetra vel turpis nunc eget. In +aliquam sem fringilla ut morbi tincidunt augue interdum velit. Velit dignissim sodales ut eu sem integer vitae. Ut etiam +sit amet nisl purus in mollis. diff --git a/content/tests/nihongo.md b/content/tests/nihongo.md new file mode 100644 index 0000000..8554c4e --- /dev/null +++ b/content/tests/nihongo.md @@ -0,0 +1,28 @@ +--- +linkTitle: Japanese +title: Japanese Text Layout +description: これは日本語のテストです。 +slug: nihongo +--- + +Sometimes I post content in Japanese, or that has a mix of Japanese and English. + +## Ruby + +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor +incididunt ut labore et dolore magna aliqua. Ut venenatis tellus in metus +vulputate eu scelerisque felis imperdiet. This is some Japanese text with +English ruby: +{{< ruby ja >}}明日{{< ruby/t en tomorrow >}}{{< /ruby >}}. +Consequat semper viverra nam libero justo. Sit amet massa vitae tortor +condimentum lacinia quis vel. Massa massa ultricies mi quis hendrerit dolor +magna eget. + +Cras tincidunt lobortis feugiat vivamus at augue eget arcu dictum. Fermentum et +sollicitudin ac orci phasellus egestas tellus rutrum tellus. Fermentum leo vel +orci porta non pulvinar neque laoreet. Proin libero nunc consequat interdum +varius sit amet mattis vulputate. Here's some Japanese kanji with some +furigana: +{{< ruby ja >}}日本{{< ruby/t "にほん" >}}語{{< ruby/t "ご" >}}{{< /ruby >}}. +Semper viverra nam libero justo laoreet sit. Consequat id porta nibh venenatis +cras sed felis. Ultrices eros in cursus turpis massa. diff --git a/content/tests/quotations.md b/content/tests/quotations.md index 87c7c13..da59ddd 100644 --- a/content/tests/quotations.md +++ b/content/tests/quotations.md @@ -1,7 +1,6 @@ --- title: Quotations -params: - subtitle: Testing quotations of all kinds +description: Testing block quotes and inline quotations. --- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor From 7e2c4f21eea4aeb00a0a3962e500630f36262df1 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 23 Jul 2024 09:15:00 -0700 Subject: [PATCH 12/44] hugo.yaml: Allow specifying block and title attributes in Markdown --- hugo.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hugo.yaml b/hugo.yaml index 0cdeae6..03eac1a 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -5,6 +5,9 @@ title: Eryn Wells markup: goldmark: parser: + attribute: + block: true + title: true wrapStandAloneImageWithinParagraph: false highlight: noClasses: false From 94bfd4fac02aa309f77093380aaf21521524dddc Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 23 Jul 2024 09:15:13 -0700 Subject: [PATCH 13/44] hugo.yaml: Rename the site to ~eryn --- hugo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugo.yaml b/hugo.yaml index 03eac1a..e95940d 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -1,6 +1,6 @@ baseURL: "https://nutmeg.erynwells.me/sandbox" languageCode: en-us -title: Eryn Wells +title: ~eryn markup: goldmark: From 2ef2160c8dba314bc0010209bda8fdd88bb72ed4 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 23 Jul 2024 09:15:27 -0700 Subject: [PATCH 14/44] Add a
      element to the home template --- layouts/_default/home.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/layouts/_default/home.html b/layouts/_default/home.html index a0f2f41..0101f75 100644 --- a/layouts/_default/home.html +++ b/layouts/_default/home.html @@ -1,3 +1,5 @@ {{ define "main" }} -

      Hello world!

      +
      + {{ .Content }} +
      {{ end }} From 4eaefddf2ea28a0a1f00493a8a3ffa00124ff51b Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Tue, 23 Jul 2024 09:21:22 -0700 Subject: [PATCH 15/44] Update the blog submodule --- themes/blog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/blog b/themes/blog index ff5c53d..64c05b7 160000 --- a/themes/blog +++ b/themes/blog @@ -1 +1 @@ -Subproject commit ff5c53dec5db7531487dc13f5f2291722ee5de4e +Subproject commit 64c05b792e9bc81eb602ec5967402b169c7596bd From c9897f52b1265201d41146423ce2949e3e75a934 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 25 Jul 2024 09:56:37 -0700 Subject: [PATCH 16/44] Update base repo --- themes/base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base b/themes/base index b130db2..1fd1eb9 160000 --- a/themes/base +++ b/themes/base @@ -1 +1 @@ -Subproject commit b130db28e05bf288f32de648c207b05f8f65f0c3 +Subproject commit 1fd1eb9bfd854d28c0aa06e84597d6c500ac4db3 From 5eeef9e738ddfb5a88ec82a374bef72a9f2ef8b2 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 25 Jul 2024 10:13:16 -0700 Subject: [PATCH 17/44] base: Update submodule --- themes/base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base b/themes/base index 1fd1eb9..8d1ce02 160000 --- a/themes/base +++ b/themes/base @@ -1 +1 @@ -Subproject commit 1fd1eb9bfd854d28c0aa06e84597d6c500ac4db3 +Subproject commit 8d1ce0208a61558ca68b903febd153b8b78cbb7a From 48427b914e27ef8c16ff43dc3c63e4b32d03095c Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 25 Jul 2024 10:21:46 -0700 Subject: [PATCH 18/44] base: Update submodule --- themes/base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base b/themes/base index 8d1ce02..fa1c957 160000 --- a/themes/base +++ b/themes/base @@ -1 +1 @@ -Subproject commit 8d1ce0208a61558ca68b903febd153b8b78cbb7a +Subproject commit fa1c957b7c5705cf209203bd1ff6cd3ee3f1ff09 From 86932d1232cdfa534bc9745ddd4d4e817e91f890 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 25 Jul 2024 13:14:13 -0700 Subject: [PATCH 19/44] base: Update submodule --- themes/base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base b/themes/base index fa1c957..c1456a6 160000 --- a/themes/base +++ b/themes/base @@ -1 +1 @@ -Subproject commit fa1c957b7c5705cf209203bd1ff6cd3ee3f1ff09 +Subproject commit c1456a6ee2bf0a83ce53763b7adfdf9875656aa0 From 9d11fc134927e1e46463a39606b35a9442465784 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 25 Jul 2024 13:24:41 -0700 Subject: [PATCH 20/44] base: Update submodule --- themes/base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base b/themes/base index c1456a6..000353f 160000 --- a/themes/base +++ b/themes/base @@ -1 +1 @@ -Subproject commit c1456a6ee2bf0a83ce53763b7adfdf9875656aa0 +Subproject commit 000353f3392390b70d3f5911942b1448f7dc83cc From c247e0b1f7dd7c5c49a32bef68982acd960e100c Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 27 Jul 2024 09:27:43 -0700 Subject: [PATCH 21/44] Add a heading to the Greek test --- content/tests/ellinika.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/tests/ellinika.md b/content/tests/ellinika.md index 5104811..b4d9fef 100644 --- a/content/tests/ellinika.md +++ b/content/tests/ellinika.md @@ -8,4 +8,6 @@ I took a trip to Greece in 2022, and before that trip I studied Greek. I wrote some content on my blog in Greek, so I would like to ensure that it looks all right. -Οι γατες τον Δελφών. +## Οι Γατες + +There are so many cats around Greece. From 20465efe46c858e6839e6c72ad7f8f77b8a16204 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 27 Jul 2024 23:01:52 -0700 Subject: [PATCH 22/44] Tests: Make Duff's Device modern C --- content/tests/code.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/content/tests/code.md b/content/tests/code.md index 0ea8c45..049c005 100644 --- a/content/tests/code.md +++ b/content/tests/code.md @@ -25,10 +25,11 @@ pellentesque diam volutpat commodo sed egestas egestas fringilla phasellus. Cursus vitae congue mauris rhoncus. ```c -send(to, from, count) -register short *to, *from; -register count; -{ +send( + register short *to, + register short *from, + register count +) { register n = (count + 7) / 8; switch (count % 8) { case 0: do { *to = *from++; From 983ded50c3f9ba9fb7ceabc7cd99f6088ebe0d80 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 27 Jul 2024 23:02:01 -0700 Subject: [PATCH 23/44] base: Update submodule --- themes/base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base b/themes/base index 000353f..8a00cc6 160000 --- a/themes/base +++ b/themes/base @@ -1 +1 @@ -Subproject commit 000353f3392390b70d3f5911942b1448f7dc83cc +Subproject commit 8a00cc6de91fc206ec8a1f1577ee831af6318f06 From bc113fdd3ba0ba4472af96c8f905b823d8c981a3 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 27 Jul 2024 23:02:33 -0700 Subject: [PATCH 24/44] blog: Update submodule --- themes/blog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/blog b/themes/blog index 64c05b7..b20cc3b 160000 --- a/themes/blog +++ b/themes/blog @@ -1 +1 @@ -Subproject commit 64c05b792e9bc81eb602ec5967402b169c7596bd +Subproject commit b20cc3b15c0594e6500b22e7bfa25d57effd754b From 92bd9a5d07dcfa5b23cd36ebe2a48e0600113426 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sun, 28 Jul 2024 09:00:43 -0700 Subject: [PATCH 25/44] Meta: Add the commandbar theme --- hugo.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hugo.yaml b/hugo.yaml index e95940d..5da4f96 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -37,6 +37,12 @@ module: target: layouts/shortcodes - source: layouts/partials target: layouts/partials + - path: commandbar + mounts: + - source: assets/js + target: assets/js/commandbar + - source: layouts/partials + target: layouts/partials/commandbar permalinks: page: @@ -47,5 +53,6 @@ permalinks: tests: "/tests/" theme: + - commandbar - blog - base From 5bd4242122284c372f98b76797f949980d2dcf39 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 1 Aug 2024 08:56:00 -0700 Subject: [PATCH 26/44] commandbar: Update submodule --- themes/commandbar | 1 + 1 file changed, 1 insertion(+) create mode 160000 themes/commandbar diff --git a/themes/commandbar b/themes/commandbar new file mode 160000 index 0000000..468fb0f --- /dev/null +++ b/themes/commandbar @@ -0,0 +1 @@ +Subproject commit 468fb0f77b926c2e725a4b9638cc67c2b338ea4f From 0c3ba7e07f5439a083c1d9f2bf777526ccaf01e7 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Fri, 2 Aug 2024 16:13:18 -0700 Subject: [PATCH 27/44] base: Update submodule --- themes/base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/base b/themes/base index 8a00cc6..c97b249 160000 --- a/themes/base +++ b/themes/base @@ -1 +1 @@ -Subproject commit 8a00cc6de91fc206ec8a1f1577ee831af6318f06 +Subproject commit c97b24977dac8387cc96ac767c25e57b80676c15 From 5a91e093eda6f0118953505237863637a1c058cd Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Wed, 7 Aug 2024 07:45:52 -1000 Subject: [PATCH 28/44] blog: Remove submodule Contents of this module were folded into the base theme. --- hugo.yaml | 11 ----------- themes/blog | 1 - 2 files changed, 12 deletions(-) delete mode 160000 themes/blog diff --git a/hugo.yaml b/hugo.yaml index 5da4f96..4b31f91 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -27,16 +27,6 @@ module: min: "0.116.0" imports: - path: base - - path: blog - mounts: - - source: assets - target: assets/blog - - source: layouts/_default - target: layouts/blog - - source: layouts/shortcodes - target: layouts/shortcodes - - source: layouts/partials - target: layouts/partials - path: commandbar mounts: - source: assets/js @@ -54,5 +44,4 @@ permalinks: theme: - commandbar - - blog - base diff --git a/themes/blog b/themes/blog deleted file mode 160000 index b20cc3b..0000000 --- a/themes/blog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b20cc3b15c0594e6500b22e7bfa25d57effd754b From 48e3564a201870b925266f022da3b8b5b63e3940 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Wed, 7 Aug 2024 08:24:20 -1000 Subject: [PATCH 29/44] Meta: Update go module identifier to point to github --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 08e973a..7e5a32c 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module erynwells.me/test-site/v2 +module github.com/erynofwales/hugo-test-site/v2 -go 1.22.4 +go 1.22.5 From 5663fc5ac7510fc8a5f62ec83d13a0de4fc99fad Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Wed, 7 Aug 2024 08:24:37 -1000 Subject: [PATCH 30/44] Meta: Replace theme submodules with go module paths --- hugo.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hugo.yaml b/hugo.yaml index 4b31f91..a8ff2f6 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -26,13 +26,8 @@ module: extended: false min: "0.116.0" imports: - - path: base - - path: commandbar - mounts: - - source: assets/js - target: assets/js/commandbar - - source: layouts/partials - target: layouts/partials/commandbar + - path: github.com/erynofwales/hugo-theme-termlite + - path: github.com/erynofwales/hugo-commandbar permalinks: page: @@ -44,4 +39,4 @@ permalinks: theme: - commandbar - - base + - termlite From 65c596267647ed061b05f0be8513c3af6f99ba85 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Wed, 7 Aug 2024 08:25:02 -1000 Subject: [PATCH 31/44] commandbar: Remove submodule --- themes/commandbar | 1 - 1 file changed, 1 deletion(-) delete mode 160000 themes/commandbar diff --git a/themes/commandbar b/themes/commandbar deleted file mode 160000 index 468fb0f..0000000 --- a/themes/commandbar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 468fb0f77b926c2e725a4b9638cc67c2b338ea4f From 8125f9035c09473319b366e1aa85ce6cbf74f967 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Wed, 7 Aug 2024 08:40:23 -1000 Subject: [PATCH 32/44] base: Remove the submodule --- themes/base | 1 - 1 file changed, 1 deletion(-) delete mode 160000 themes/base diff --git a/themes/base b/themes/base deleted file mode 160000 index c97b249..0000000 --- a/themes/base +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c97b24977dac8387cc96ac767c25e57b80676c15 From f97e815e06a44a1099ff830cca0ac8e3b7eb2e2e Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Wed, 7 Aug 2024 08:41:32 -1000 Subject: [PATCH 33/44] Meta: Move all theme dependencies to module imports --- go.mod | 6 ++++++ go.sum | 10 ++++++++++ hugo.yaml | 8 ++------ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 go.sum diff --git a/go.mod b/go.mod index 7e5a32c..2230194 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,9 @@ module github.com/erynofwales/hugo-test-site/v2 go 1.22.5 + +require ( + github.com/erynofwales/hugo-commandbar/v2 v2.0.0-20240807181222-5d2b0e1883cd // indirect + github.com/erynofwales/hugo-resource-builders/v2 v2.0.0-20240807181356-8ae8136b8a70 // indirect + github.com/erynofwales/hugo-theme-termlite/v2 v2.0.0-20240807183649-c348571be6af // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..dc848a6 --- /dev/null +++ b/go.sum @@ -0,0 +1,10 @@ +github.com/erynofwales/hugo-commandbar/v2 v2.0.0-20240807181222-5d2b0e1883cd h1:BMaSDj5tVXlTglL0pJCk3RvjhKLuWSrLHC8nHuxKqKI= +github.com/erynofwales/hugo-commandbar/v2 v2.0.0-20240807181222-5d2b0e1883cd/go.mod h1:RYcxU4aU5m7u+phpIezmicHPRO6lcc/wUwDyYgMm59U= +github.com/erynofwales/hugo-resource-builders/v2 v2.0.0-20240803231744-42f70cc8fb1d h1:m/HK/5sbD+hLfW61dXNL0py93dBKy3kKf40zw4Fpnlo= +github.com/erynofwales/hugo-resource-builders/v2 v2.0.0-20240803231744-42f70cc8fb1d/go.mod h1:5sWk4NdGyGeXVA88py/84BRcoULSMI3/OnqlziPg9AE= +github.com/erynofwales/hugo-resource-builders/v2 v2.0.0-20240807181356-8ae8136b8a70 h1:T5hZlCOxwAzJ/okWc+CIJl58o6xfzLbzkrcpsEiUd9k= +github.com/erynofwales/hugo-resource-builders/v2 v2.0.0-20240807181356-8ae8136b8a70/go.mod h1:5sWk4NdGyGeXVA88py/84BRcoULSMI3/OnqlziPg9AE= +github.com/erynofwales/hugo-theme-termlite/v2 v2.0.0-20240807183033-64d002ded2d2 h1:AjjcCp1V33ava85yxQ/9B6ySZvIJAbDnZtgsv/CFlHA= +github.com/erynofwales/hugo-theme-termlite/v2 v2.0.0-20240807183033-64d002ded2d2/go.mod h1:8d/b0caCkqtULYGIuv8gwLAFrZd8DyQillIoi+P2vSM= +github.com/erynofwales/hugo-theme-termlite/v2 v2.0.0-20240807183649-c348571be6af h1:M+u/Jm1tppXvzJa/0O+T43noVpoLc8OO708v2L6EcKY= +github.com/erynofwales/hugo-theme-termlite/v2 v2.0.0-20240807183649-c348571be6af/go.mod h1:8d/b0caCkqtULYGIuv8gwLAFrZd8DyQillIoi+P2vSM= diff --git a/hugo.yaml b/hugo.yaml index a8ff2f6..4c9e01d 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -26,8 +26,8 @@ module: extended: false min: "0.116.0" imports: - - path: github.com/erynofwales/hugo-theme-termlite - - path: github.com/erynofwales/hugo-commandbar + - path: github.com/erynofwales/hugo-theme-termlite/v2 + - path: github.com/erynofwales/hugo-commandbar/v2 permalinks: page: @@ -36,7 +36,3 @@ permalinks: section: blog: "/blog/" tests: "/tests/" - -theme: - - commandbar - - termlite From 1b189ce7004db7e32ab3c37ae8bfe5255998971a Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Wed, 7 Aug 2024 09:20:01 -1000 Subject: [PATCH 34/44] Meta: A Code workspace --- TestSite.code-workspace | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 TestSite.code-workspace diff --git a/TestSite.code-workspace b/TestSite.code-workspace new file mode 100644 index 0000000..5709732 --- /dev/null +++ b/TestSite.code-workspace @@ -0,0 +1,8 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": {} +} From 98d0173df781f5816402b2adc1febaeb511f671d Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 8 Aug 2024 09:58:49 -1000 Subject: [PATCH 35/44] Meta: Add replacements to make local development of these modules easier --- .gitmodules | 9 +++++++++ hugo.yaml | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/.gitmodules b/.gitmodules index c499ac4..4b5fead 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,12 @@ [submodule "themes/base"] path = themes/base url = nutmeg.erynwells.me:git/hugo-theme-erynwells-base.git +[submodule "themes/termlite"] + path = themes/termlite + url = git@github.com:erynofwales/hugo-theme-termlite.git +[submodule "themes/commandbar"] + path = themes/commandbar + url = git@github.com:erynofwales/hugo-commandbar.git +[submodule "themes/resourceBuilders"] + path = themes/resourceBuilders + url = git@github.com:erynofwales/hugo-resource-builders.git diff --git a/hugo.yaml b/hugo.yaml index 4c9e01d..f10b8cb 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -25,6 +25,10 @@ module: hugoVersion: extended: false min: "0.116.0" + replacements: >- + github.com/erynofwales/hugo-theme-termlite/v2 -> termlite, + github.com/erynofwales/hugo-commandbar/v2 -> commandbar, + github.com/erynofwales/hugo-resource-builders/v2 -> resourceBuilders imports: - path: github.com/erynofwales/hugo-theme-termlite/v2 - path: github.com/erynofwales/hugo-commandbar/v2 From 1ef94e9b9b4840b08a79328aa5fac38ff541937e Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 8 Aug 2024 09:59:06 -1000 Subject: [PATCH 36/44] Meta: Update submodule commits --- themes/commandbar | 1 + themes/resourceBuilders | 1 + themes/termlite | 1 + 3 files changed, 3 insertions(+) create mode 160000 themes/commandbar create mode 160000 themes/resourceBuilders create mode 160000 themes/termlite diff --git a/themes/commandbar b/themes/commandbar new file mode 160000 index 0000000..68a477b --- /dev/null +++ b/themes/commandbar @@ -0,0 +1 @@ +Subproject commit 68a477bc113f71b8914fdf68c2adbf9d751933aa diff --git a/themes/resourceBuilders b/themes/resourceBuilders new file mode 160000 index 0000000..23f31c4 --- /dev/null +++ b/themes/resourceBuilders @@ -0,0 +1 @@ +Subproject commit 23f31c4c10c107151a39cb1d5b4f68d7dabdbe8f diff --git a/themes/termlite b/themes/termlite new file mode 160000 index 0000000..23c0ad3 --- /dev/null +++ b/themes/termlite @@ -0,0 +1 @@ +Subproject commit 23c0ad3fa8f60d94b0771450e922369d7b1494d9 From 84d3b107f3e610287d02ffcc91f6bd927379fd8a Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 8 Aug 2024 10:16:29 -1000 Subject: [PATCH 37/44] Meta: Update resourceBuilders submodule --- themes/resourceBuilders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/resourceBuilders b/themes/resourceBuilders index 23f31c4..cd156d2 160000 --- a/themes/resourceBuilders +++ b/themes/resourceBuilders @@ -1 +1 @@ -Subproject commit 23f31c4c10c107151a39cb1d5b4f68d7dabdbe8f +Subproject commit cd156d2b6d73b3e37be15153b356ed9b404ee9f9 From ce58387b3c0b2dfb0c6e72d805cd2b0f2f9c8d03 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 8 Aug 2024 10:20:51 -1000 Subject: [PATCH 38/44] i18n: Localized names for categories and tags --- i18n/en.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 i18n/en.yaml diff --git a/i18n/en.yaml b/i18n/en.yaml new file mode 100644 index 0000000..fd07ae1 --- /dev/null +++ b/i18n/en.yaml @@ -0,0 +1,6 @@ +categories: + one: category + other: categories +tags: + one: tag + other: tags From de6342b05c070f51e1385f4f61bfb695ab886755 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 8 Aug 2024 10:23:20 -1000 Subject: [PATCH 39/44] Meta: Update termlite submodule --- themes/termlite | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/termlite b/themes/termlite index 23c0ad3..f353336 160000 --- a/themes/termlite +++ b/themes/termlite @@ -1 +1 @@ -Subproject commit 23c0ad3fa8f60d94b0771450e922369d7b1494d9 +Subproject commit f353336c9ed98cb8e0d2df9b8c3103146705f0ff From efd5f8991d3811da73145b628ce717ef1e90ccc2 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 8 Aug 2024 10:23:43 -1000 Subject: [PATCH 40/44] JS: Add a setOption handler that can toggle the bg/background option --- assets/js/commands.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 assets/js/commands.js diff --git a/assets/js/commands.js b/assets/js/commands.js new file mode 100644 index 0000000..80de2aa --- /dev/null +++ b/assets/js/commands.js @@ -0,0 +1,16 @@ +document.addEventListener("DOMContentLoaded", () => { + const commandBar = document.querySelector("command-bar"); + + commandBar.addEventListener("setOption", event => { + console.log("SetOption", event); + switch (event.option) { + case "bg": + case "background": + const value = event.newValue; + if (value === "dark" || value === "light") { + document.querySelector(":root").setAttribute("color-scheme", value); + } + break; + } + }); +}); From 9a09600c37ea6672bfe36acc55722544d3972e78 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 8 Aug 2024 10:24:16 -1000 Subject: [PATCH 41/44] Layouts: A base template override that includes the commandbar scripts --- layouts/_default/baseof.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 layouts/_default/baseof.html diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html new file mode 100644 index 0000000..348a453 --- /dev/null +++ b/layouts/_default/baseof.html @@ -0,0 +1,25 @@ + + + + {{ partial "base/head.html" . }} + {{ block "head_css" . }}{{ end }} + + +
      + {{ partial "site/header.html" . }} +
      +
      + {{ block "main" . }}{{ end }} +
      + {{ partial "site/footer.html" . }} +
      +
      + + {{ partial "commandbar/template.html" . }} + {{ partial "commandbar/script.html" }} + {{ partial "resource_builders/script.html" (dict "resource" "js/commands.js") }} + {{ if .HasShortcode "railroad-diagram" }} + {{ partial "resource_builders/script.html" (dict "resource" "js/railroad/railroad.js")}} + {{ end }} + + From d15195f5417b8d3f71a4495e0c8f621e91baa7fd Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Mon, 7 Oct 2024 20:54:54 -0700 Subject: [PATCH 42/44] Add a list test where the
    • changes its own value --- content/tests/lists.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/content/tests/lists.md b/content/tests/lists.md index 7e9988d..13356f2 100644 --- a/content/tests/lists.md +++ b/content/tests/lists.md @@ -49,16 +49,18 @@ dignissim. 1. Faucibus a pellentesque sit amet porttitor. {start="1000"} -Odio morbi quis commodo odio aenean sed adipiscing diam. Sit amet consectetur -adipiscing elit. Sit amet nulla facilisi morbi tempus. Pellentesque elit eget -gravida cum sociis natoque penatibus et magnis. Vestibulum mattis ullamcorper -velit sed ullamcorper morbi tincidunt. Sem integer vitae justo eget magna -fermentum iaculis eu non. Euismod nisi porta lorem mollis aliquam ut porttitor -leo. Massa tincidunt nunc pulvinar sapien et ligula ullamcorper. Feugiat nisl -pretium fusce id velit ut tortor. A erat nam at lectus urna duis convallis -convallis. Ultrices eros in cursus turpis. Non enim praesent elementum facilisis -leo vel fringilla est ullamcorper. Nibh ipsum consequat nisl vel pretium lectus -quam id. Aliquam sem et tortor consequat. +Here's one that has list items that change their value. + +1. Odio morbi quis commodo odio aenean sed adipiscing diam. +1. Sit amet consectetur adipiscing elit. +1. Sit amet nulla facilisi morbi tempus. +1. Pellentesque elit eget gravida cum sociis natoque penatibus et magnis. + +Vestibulum mattis ullamcorper velit sed ullamcorper morbi tincidunt. Sem integer vitae justo eget magna fermentum +iaculis eu non. Euismod nisi porta lorem mollis aliquam ut porttitor leo. Massa tincidunt nunc pulvinar sapien et ligula +ullamcorper. Feugiat nisl pretium fusce id velit ut tortor. A erat nam at lectus urna duis convallis convallis. Ultrices +eros in cursus turpis. Non enim praesent elementum facilisis leo vel fringilla est ullamcorper. Nibh ipsum consequat +nisl vel pretium lectus quam id. Aliquam sem et tortor consequat. ## Definition From 2b2d75c7fd07ab4ca54d9ebcabb53e89733cb0b8 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Mon, 7 Oct 2024 20:55:24 -0700 Subject: [PATCH 43/44] resourceBuilders: Update submodule --- themes/resourceBuilders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/resourceBuilders b/themes/resourceBuilders index cd156d2..b9aa2d4 160000 --- a/themes/resourceBuilders +++ b/themes/resourceBuilders @@ -1 +1 @@ -Subproject commit cd156d2b6d73b3e37be15153b356ed9b404ee9f9 +Subproject commit b9aa2d4201d986b841ff8abf97eb72b5492fa8de From e21d28ea7946f4dc725fed6790a64d87f4c3b94b Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Mon, 7 Oct 2024 21:02:48 -0700 Subject: [PATCH 44/44] termlite: Update submodule --- themes/termlite | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/termlite b/themes/termlite index f353336..f078b30 160000 --- a/themes/termlite +++ b/themes/termlite @@ -1 +1 @@ -Subproject commit f353336c9ed98cb8e0d2df9b8c3103146705f0ff +Subproject commit f078b30866f483df92992a220d45862f0df7efd0