From 59fcb996eb8b0526bb5ac9e015799ced6645db60 Mon Sep 17 00:00:00 2001 From: Leilukin Date: Mon, 5 May 2025 19:17:19 +0800 Subject: [PATCH] Set main layout for main site pages --- src/_includes/layouts/links.vto | 2 +- src/_includes/partials/changelogs.vto | 2 +- src/articles/articles.11tydata.js | 2 +- src/blog/blog.11tydata.js | 3 +++ src/blog/posts.vto | 1 - src/blog/posts/posts.11tydata.js | 1 - src/links/pages/pages.11tydata.js | 2 +- src/projects/projects.11tydata.js | 2 +- src/slashes/navbarlinks/about.md | 33 ++++++++++++++------------- src/slashes/slashes.11tydata.js | 2 +- 10 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 src/blog/blog.11tydata.js diff --git a/src/_includes/layouts/links.vto b/src/_includes/layouts/links.vto index c6f3fc1f..b388b49f 100644 --- a/src/_includes/layouts/links.vto +++ b/src/_includes/layouts/links.vto @@ -1,5 +1,5 @@ --- -layout: layouts/base +layout: layouts/main articleElement: true isContentDivided: true --- diff --git a/src/_includes/partials/changelogs.vto b/src/_includes/partials/changelogs.vto index cc9d33fc..b22e6e3e 100644 --- a/src/_includes/partials/changelogs.vto +++ b/src/_includes/partials/changelogs.vto @@ -1,5 +1,5 @@ --- -layout: layouts/base +layout: layouts/main articleElement: true --- diff --git a/src/articles/articles.11tydata.js b/src/articles/articles.11tydata.js index cb121220..cfe03166 100644 --- a/src/articles/articles.11tydata.js +++ b/src/articles/articles.11tydata.js @@ -1,6 +1,6 @@ export default { tags: ["articles", "contents", "feed items"], - layout: "layouts/base", + layout: "layouts/main", permalink: "/articles/{{ page.fileSlug }}/", isArticle: true, eleventyComputed: { diff --git a/src/blog/blog.11tydata.js b/src/blog/blog.11tydata.js new file mode 100644 index 00000000..e0d37c8e --- /dev/null +++ b/src/blog/blog.11tydata.js @@ -0,0 +1,3 @@ +export default { + layout: "layouts/main", +} diff --git a/src/blog/posts.vto b/src/blog/posts.vto index a03f8470..331e08e3 100644 --- a/src/blog/posts.vto +++ b/src/blog/posts.vto @@ -1,6 +1,5 @@ --- title: Blog Archive -layout: layouts/base tags: blog pages eleventyComputed: desc: Archive of blog posts on {{ sitemeta.siteName }} diff --git a/src/blog/posts/posts.11tydata.js b/src/blog/posts/posts.11tydata.js index 10a6fbce..b12ddcc3 100644 --- a/src/blog/posts/posts.11tydata.js +++ b/src/blog/posts/posts.11tydata.js @@ -1,5 +1,4 @@ export default { - layout: "layouts/base", tags: ["posts", "contents", "feed items"], isArticle: true, eleventyComputed: { diff --git a/src/links/pages/pages.11tydata.js b/src/links/pages/pages.11tydata.js index ed0aa0b5..adeb7192 100644 --- a/src/links/pages/pages.11tydata.js +++ b/src/links/pages/pages.11tydata.js @@ -1,5 +1,5 @@ export default { - layout: "layouts/base", + layout: "layouts/main", permalink: "/links/{{ page.fileSlug }}/", hasBreadcrumbs: true, eleventyComputed: { diff --git a/src/projects/projects.11tydata.js b/src/projects/projects.11tydata.js index 585f71ae..847111eb 100644 --- a/src/projects/projects.11tydata.js +++ b/src/projects/projects.11tydata.js @@ -1,6 +1,6 @@ export default { tags: "project pages", - layout: "layouts/base", + layout: "layouts/main", hasBreadcrumbs: true, eleventyComputed: { eleventyNavigation: { diff --git a/src/slashes/navbarlinks/about.md b/src/slashes/navbarlinks/about.md index a61868a2..fd1a04e9 100644 --- a/src/slashes/navbarlinks/about.md +++ b/src/slashes/navbarlinks/about.md @@ -8,7 +8,7 @@ eleventyNavigation: order: 2 --- -{% container "article", "content__section" %} +{{ container "section", "content__section" }} ## About the Website {{ sitemeta.siteName }} is a literal queer-coded website (as in, this website is coded by a queer person) that serves as a personal hub for my interests and self-expression. @@ -33,23 +33,16 @@ More information about this site can be found on the following pages: ### Link to This Site -{% include "components/my-button.vto" %} -{% /container %} +{{ include "components/my-button.vto" }} +{{ /container }} -{% container "article", "content__section" %} +{{ container "section", "content__section" }} ## About the Webmaster -{% imgFigure "/assets/leilukin/leilukin-bee.avif", "Leilukin bee avatar", "avatar" %} +{{ imgFigure "/assets/leilukin/leilukin-bee.avif", "Leilukin bee avatar", "avatar" }} [Image description: Digital illustration of a bee wearing red glasses with an oval-shaped body and wings on a light green background. Leilukin's signature is at the bottom right of the bee. Description ends] -{% endimgFigure %} +{{ /imgFigure }} -{%- css %} -.avatar img { - border-radius: 50%; - width: 15rem; - margin: 0.5em auto; -} -{% endcss %} You can call me {{ sitemeta.siteAuthor.name }}. I am a Malaysian Chinese, queer, non-binary lesbian on the asexual and aromantic spectrum born in the early 90s. My pronouns are they/them and she/her in English, [他]{lang="zh"} and [她]{lang="zh"} in Chinese. I am a web deevloper with 8 years of experience in the graphic design field. @@ -63,7 +56,7 @@ Leilukin is not my real name, but it is an internet pseudonym that I have used s ### Contact Me -The best way to contact me is via email: [{{ sitemeta.siteAuthor.emailEncoded | safe }}]({{ sitemeta.siteAuthor.emailDecoyUrl }}){rel="nofollow, noindex"}. Using [plain text email](https://useplaintext.email/) is encouraged. +The best way to contact me is via email: [{{ sitemeta.siteAuthor.emailEncoded }}]({{ sitemeta.siteAuthor.emailDecoyUrl }}){rel="nofollow, noindex"}. Using [plain text email](https://useplaintext.email/) is encouraged. Other online platforms you can find me on: @@ -76,5 +69,13 @@ Other online platforms you can find me on: ### Support Me -{% include "main/support-me.html" %} -{% /container %} +{{ include "components/support-me.vto" }} +{{ /container }} + +{{- css }} +.avatar img { + border-radius: 50%; + width: 15rem; + margin: 0.5em auto; +} +{{ endcss }} diff --git a/src/slashes/slashes.11tydata.js b/src/slashes/slashes.11tydata.js index e2f2c678..c5d03b8b 100644 --- a/src/slashes/slashes.11tydata.js +++ b/src/slashes/slashes.11tydata.js @@ -1,6 +1,6 @@ export default { tags: "pages", - layout: "layouts/base", + layout: "layouts/main", permalink: "/{{ page.fileSlug }}/", eleventyComputed: { eleventyNavigation: {