From ae6ad1d66fbe181899e31bb9e15754de17064b27 Mon Sep 17 00:00:00 2001 From: Leilukin Date: Thu, 10 Apr 2025 01:51:31 +0800 Subject: [PATCH] Adjust Nunjucks template indentation --- src/_includes/asummersend/base.njk | 14 +- src/_includes/cassettebeasts/base.njk | 14 +- src/_includes/global/content.njk | 48 ++-- src/_includes/global/footer.njk | 56 ++--- src/_includes/global/hero.njk | 58 ++--- src/_includes/global/navbar.njk | 134 +++++------ src/_includes/global/pagination-oldnew.njk | 98 ++++---- src/_includes/global/shrineinfo.njk | 38 ++-- src/_includes/global/top-btn.njk | 62 ++--- src/_includes/main/changelogs.njk | 58 ++--- src/_includes/main/content-nav.njk | 12 +- src/_includes/main/hero.njk | 250 ++++++++++----------- src/_includes/main/support-me.njk | 16 +- src/_includes/pokemonoras/base.njk | 14 +- src/_includes/starwarskotor/base.njk | 14 +- src/blog/posts.njk | 6 +- src/slashes/footerlinks/sitemap.njk | 42 ++-- src/slashes/navbarlinks/blog.njk | 44 ++-- src/slashes/navbarlinks/guestbook.njk | 10 +- src/slashes/navbarlinks/shrines.njk | 24 +- 20 files changed, 505 insertions(+), 507 deletions(-) diff --git a/src/_includes/asummersend/base.njk b/src/_includes/asummersend/base.njk index 797b3183..76bf01ce 100644 --- a/src/_includes/asummersend/base.njk +++ b/src/_includes/asummersend/base.njk @@ -3,20 +3,20 @@ {% extends "global/baselayout.njk" %} {% block metaTitle %} - + {% endblock %} {% block pageTitle %} - {{ title + " | " if title }}A Summer’s End — Hong Kong 1986 Shrine | {{ sitemeta.siteName | safe }} +{{ title + " | " if title }}A Summer’s End — Hong Kong 1986 Shrine | {{ sitemeta.siteName | safe }} {% endblock %} {% block favicon %} - - - - + + + + {% endblock %} {% block hero %}{% include "asummersend/hero.njk" %}{% endblock %} {% block navbar %}{% include "asummersend/navbar.njk" %}{% endblock %} -{% block footer %}{% include "asummersend/footer.njk" %}{% endblock %} \ No newline at end of file +{% block footer %}{% include "asummersend/footer.njk" %}{% endblock %} diff --git a/src/_includes/cassettebeasts/base.njk b/src/_includes/cassettebeasts/base.njk index fa411f03..e9f2668d 100644 --- a/src/_includes/cassettebeasts/base.njk +++ b/src/_includes/cassettebeasts/base.njk @@ -3,20 +3,20 @@ {% extends "global/baselayout.njk" %} {% block metaTitle %} - + {% endblock %} {% block pageTitle %} - {{ title + " | " if title }}Cassette Beasts Shrine | {{ sitemeta.siteName | safe }} +{{ title + " | " if title }}Cassette Beasts Shrine | {{ sitemeta.siteName | safe }} {% endblock %} {% block favicon %} - - - - + + + + {% endblock %} {% block hero %}{% include "cassettebeasts/hero.njk" %}{% endblock %} {% block navbar %}{% include "cassettebeasts/navbar.njk" %}{% endblock %} -{% block footer %}{% include "cassettebeasts/footer.njk" %}{% endblock %} \ No newline at end of file +{% block footer %}{% include "cassettebeasts/footer.njk" %}{% endblock %} diff --git a/src/_includes/global/content.njk b/src/_includes/global/content.njk index c7e84a30..01e25c04 100644 --- a/src/_includes/global/content.njk +++ b/src/_includes/global/content.njk @@ -86,30 +86,30 @@ {%- css %} - .breadcrumbs { - margin-bottom: 0.7em; - display: flex; - gap: 0.5em; - flex-wrap: wrap; - justify-content: center; - } +.breadcrumbs { + margin-bottom: 0.7em; + display: flex; + gap: 0.5em; + flex-wrap: wrap; + justify-content: center; +} - .blog__post--pagination { - padding-top: 1em; - margin-block-start: 2.5em; - border-top: 0.1em solid var(--clr-title-border); - } +.blog__post--pagination { + padding-top: 1em; + margin-block-start: 2.5em; + border-top: 0.1em solid var(--clr-title-border); +} - .blog__post--nextprev { - list-style-type: ""; - padding: 0; - margin: 0; - display: grid; - gap: 0.7em; - grid-template-columns: repeat(2, 1fr); - grid-template-areas: 'prev next'; - } +.blog__post--nextprev { + list-style-type: ""; + padding: 0; + margin: 0; + display: grid; + gap: 0.7em; + grid-template-columns: repeat(2, 1fr); + grid-template-areas: 'prev next'; +} - .blog__post--prev { grid-area: prev; } - .blog__post--next { grid-area: next; } -{% endcss %} \ No newline at end of file +.blog__post--prev { grid-area: prev; } +.blog__post--next { grid-area: next; } +{% endcss %} diff --git a/src/_includes/global/footer.njk b/src/_includes/global/footer.njk index 2792e680..a150eeb1 100644 --- a/src/_includes/global/footer.njk +++ b/src/_includes/global/footer.njk @@ -5,17 +5,17 @@

{%- block footerContent %} - {{ footerContent }} +{{ footerContent }} {% endblock -%} {%- if tags and tags.includes("shrine pages") %} - + {%- endif -%}

@@ -28,26 +28,26 @@ {%- css %} - :root { --footer-gap: 0.5em; } +:root { --footer-gap: 0.5em; } - .footer { - margin-top: auto; - width: 100%; - background: var(--clr-main-footer-bg); - padding: 1.5rem 1rem clamp(1.5rem, calc(100% - 1.5rem), 3.5rem); - text-align: center; - display: grid; - gap: var(--footer-gap); - } +.footer { + margin-top: auto; + width: 100%; + background: var(--clr-main-footer-bg); + padding: 1.5rem 1rem clamp(1.5rem, calc(100% - 1.5rem), 3.5rem); + text-align: center; + display: grid; + gap: var(--footer-gap); +} - .footer__links, - .footer__shrines { - display: flex; - flex-wrap: wrap; - justify-content: center; - column-gap: var(--footer-gap); - } +.footer__links, +.footer__shrines { + display: flex; + flex-wrap: wrap; + justify-content: center; + column-gap: var(--footer-gap); +} - .footer__links { justify-self: center; } - .footer__shrines { align-self: center; } -{% endcss %} \ No newline at end of file +.footer__links { justify-self: center; } +.footer__shrines { align-self: center; } +{% endcss %} diff --git a/src/_includes/global/hero.njk b/src/_includes/global/hero.njk index e35ce20d..dcf8bec7 100644 --- a/src/_includes/global/hero.njk +++ b/src/_includes/global/hero.njk @@ -8,39 +8,39 @@ {%- css %} - .hero { - width: 100%; - background-color: var(--clr-hero-bg); - display: flex; - flex-direction: column; - justify-content: center; - text-align: center; - } +.hero { + width: 100%; + background-color: var(--clr-hero-bg); + display: flex; + flex-direction: column; + justify-content: center; + text-align: center; +} - .hero__top-bar { - background: var(--clr-navbar-bg); - width: 100%; - padding: 0.5em 0.7em; - } +.hero__top-bar { + background: var(--clr-navbar-bg); + width: 100%; + padding: 0.5em 0.7em; +} - .hero__img { - display: grid; - place-content: center; - } +.hero__img { + display: grid; + place-content: center; +} - .hero img { - object-fit: contain; - overflow: hidden; - max-height: 16rem; - } +.hero img { + object-fit: contain; + overflow: hidden; + max-height: 16rem; +} {% endcss %} {%- js %} - const hero = document.querySelector(".hero"); - const heroTopBarEl = document.querySelector(".hero__top-bar"); - const headerImgEl = document.querySelector(".hero__img"); +const hero = document.querySelector(".hero"); +const heroTopBarEl = document.querySelector(".hero__top-bar"); +const headerImgEl = document.querySelector(".hero__img"); - {% block eventScript %} - {{ eventScript }} - {% endblock %} -{% endjs %} \ No newline at end of file +{% block eventScript %} +{{ eventScript }} +{% endblock %} +{% endjs %} diff --git a/src/_includes/global/navbar.njk b/src/_includes/global/navbar.njk index f3d29647..817fbd6d 100644 --- a/src/_includes/global/navbar.njk +++ b/src/_includes/global/navbar.njk @@ -24,82 +24,82 @@ {%- css %} - .navbar { - background: var(--clr-navbar-bg); - width: 100%; - z-index: 998; - position: sticky; - top: 0; - padding: 0.6em; - } +.navbar { + background: var(--clr-navbar-bg); + width: 100%; + z-index: 998; + position: sticky; + top: 0; + padding: 0.6em; +} - .navbar__menu { - list-style-type: ""; - margin: 0; - padding: 0; - display: flex; - gap: 1em; - flex-wrap: wrap; - text-align: center; - } +.navbar__menu { + list-style-type: ""; + margin: 0; + padding: 0; + display: flex; + gap: 1em; + flex-wrap: wrap; + text-align: center; +} - .navbar__menu a { - color: var(--clr-navbar-link); - text-decoration: none; - font-weight: 700; - display: inline-block; - } +.navbar__menu a { + color: var(--clr-navbar-link); + text-decoration: none; + font-weight: 700; + display: inline-block; +} - .navbar__menu a:hover { color: var(--clr-link-hover); } - .navbar__menu a:focus { outline-offset: 0.2em; } +.navbar__menu a:hover { color: var(--clr-link-hover); } +.navbar__menu a:focus { outline-offset: 0.2em; } - .navbar__links { - display: flex; - flex-wrap: wrap; - justify-content: space-evenly; - gap: 0.5em; - } +.navbar__links { + display: flex; + flex-wrap: wrap; + justify-content: space-evenly; + gap: 0.5em; +} - .navbar__toggle { - background-color: inherit; - color: var(--clr-navbar-link); - border: none; - padding: 0; - font-size: 1.25rem; - font-weight: 700; - display: none; - align-items: center; - gap: 0.3em; - } +.navbar__toggle { + background-color: inherit; + color: var(--clr-navbar-link); + border: none; + padding: 0; + font-size: 1.25rem; + font-weight: 700; + display: none; + align-items: center; + gap: 0.3em; +} - .navbar__toggle svg { fill: currentColor; } +.navbar__toggle svg { fill: currentColor; } - .navbar__toggle:focus, - .navbar__menu a:focus { outline-offset: 0.1em; } - .navbar__toggle:focus, - .navbar__menu a:focus { outline: 0.15em solid var(--clr-navbar-link); } +.navbar__toggle:focus, +.navbar__menu a:focus { outline-offset: 0.1em; } +.navbar__toggle:focus, +.navbar__menu a:focus { outline: 0.15em solid var(--clr-navbar-link); } - .navbar__popover { - background: var(--clr-navbar-bg); - border: 0.15em solid var(--clr-navbar-link); - padding: 1.5em; - max-width: 85%; - } +.navbar__popover { + background: var(--clr-navbar-bg); + border: 0.15em solid var(--clr-navbar-link); + padding: 1.5em; + max-width: 85%; +} - .navbar__popover::backdrop { - background-color: black; - opacity: 0.5; - } +.navbar__popover::backdrop { + background-color: black; + opacity: 0.5; +} - @supports selector([popover]) { - .navbar__toggle { display: flex; } - .navbar__links { display: none; } - } +@supports selector([popover]) { + .navbar__toggle { display: flex; } + .navbar__links { display: none; } +} - /* Tablet screen size */ - @media only screen and (min-width: 43.75rem) { - .navbar { padding: 1em 0.6em; } - .navbar__toggle, .navbar__popover { display: none; } - .navbar__links { display: flex; } - } +/* Tablet screen size */ +@media only screen and (min-width: 43.75rem) { + .navbar { padding: 1em 0.6em; } + .navbar__toggle, .navbar__popover { display: none; } + .navbar__links { display: flex; } +} {% endcss %} diff --git a/src/_includes/global/pagination-oldnew.njk b/src/_includes/global/pagination-oldnew.njk index 09f53902..14a6cfdd 100644 --- a/src/_includes/global/pagination-oldnew.njk +++ b/src/_includes/global/pagination-oldnew.njk @@ -19,80 +19,80 @@ Newer{% endset %}

{%- css %} - .pagination__wrapper { - display: grid; - place-content: center; - margin-top: 3em; - } +.pagination__wrapper { + display: grid; + place-content: center; + margin-top: 3em; +} - .pagination { - list-style-type: ""; - padding: 0; - margin: 0; - display: flex; - gap: 0.5em; - flex-wrap: wrap; - justify-content: center; - } +.pagination { + list-style-type: ""; + padding: 0; + margin: 0; + display: flex; + gap: 0.5em; + flex-wrap: wrap; + justify-content: center; +} - .pagination li { - text-align: center; - padding: 0.3em 0.7em; - color: var(--clr-title-border); - background-color: var(--clr-code-bg); - } +.pagination li { + text-align: center; + padding: 0.3em 0.7em; + color: var(--clr-title-border); + background-color: var(--clr-code-bg); +} - .pagination li:has(a) { background-color: var(--clr-title-border); } - .pagination li:has(a):hover { background-color: var(--clr-link-hover); } +.pagination li:has(a) { background-color: var(--clr-title-border); } +.pagination li:has(a):hover { background-color: var(--clr-link-hover); } - .pagination li:has(a):focus-within { - outline: 0.2em solid var(--clr-title-border); - outline-offset: 0.15em; - } +.pagination li:has(a):focus-within { + outline: 0.2em solid var(--clr-title-border); + outline-offset: 0.15em; +} - .pagination li a { - color: var(--clr-link-btn-hover); - text-decoration: none; - } +.pagination li a { + color: var(--clr-link-btn-hover); + text-decoration: none; +} - .pagination li a:focus { outline: none; } -{% endcss %} \ No newline at end of file +.pagination li a:focus { outline: none; } +{% endcss %} diff --git a/src/_includes/global/shrineinfo.njk b/src/_includes/global/shrineinfo.njk index 6991f2f0..4605be2c 100644 --- a/src/_includes/global/shrineinfo.njk +++ b/src/_includes/global/shrineinfo.njk @@ -14,26 +14,26 @@ {%- css %} - .right-sidebar { - background-color: var(--clr-content-bg); - font-size: clamp(0.9rem, 0.9rem + 3vw, 1rem); - } +.right-sidebar { + background-color: var(--clr-content-bg); + font-size: clamp(0.9rem, 0.9rem + 3vw, 1rem); +} - .shrine__info { - padding: 1rem; - max-height: var(--ht-sticky-sidebar); - overflow-x: auto; - } +.shrine__info { + padding: 1rem; + max-height: var(--ht-sticky-sidebar); + overflow-x: auto; +} - .shrine__info h2 { - font-size: clamp(1.5rem, 1rem + 3vw, 1.7rem); - margin-bottom: 0.2em; - } +.shrine__info h2 { + font-size: clamp(1.5rem, 1rem + 3vw, 1.7rem); + margin-bottom: 0.2em; +} - .shrine__info h3 { - font-size: clamp(1.3rem, 1rem + 3vw, 1.5rem); - margin-top: 1em; - } +.shrine__info h3 { + font-size: clamp(1.3rem, 1rem + 3vw, 1.5rem); + margin-top: 1em; +} - .shrine__info ul { margin-top: 0.5em; } -{% endcss %} \ No newline at end of file +.shrine__info ul { margin-top: 0.5em; } +{% endcss %} diff --git a/src/_includes/global/top-btn.njk b/src/_includes/global/top-btn.njk index 888afa56..6a50d2b2 100644 --- a/src/_includes/global/top-btn.njk +++ b/src/_includes/global/top-btn.njk @@ -6,38 +6,38 @@ {%- css %} - .top-btn, - .top-btn:hover { - color: var(--clr-top-btn-txt); - text-decoration: none; - font-weight: 700; - } +.top-btn, +.top-btn:hover { + color: var(--clr-top-btn-txt); + text-decoration: none; + font-weight: 700; +} - .top-btn { - position: fixed; - bottom: 0.5rem; - right: 0.5rem; - z-index: 999; +.top-btn { + position: fixed; + bottom: 0.5rem; + right: 0.5rem; + z-index: 999; - background-color: var(--clr-top-btn-bg); - display: flex; - align-items: center; - border-radius: 50em; - padding: 0.3em 0.5em; - gap: 0.2em; - } + background-color: var(--clr-top-btn-bg); + display: flex; + align-items: center; + border-radius: 50em; + padding: 0.3em 0.5em; + gap: 0.2em; +} - .top-btn:focus { - outline: 0.25em solid var(--clr-top-btn-bg); - outline-offset: 0.15em; - } +.top-btn:focus { + outline: 0.25em solid var(--clr-top-btn-bg); + outline-offset: 0.15em; +} - .top-btn__arrow { - display: inline-block; - width: 1em; - aspect-ratio: 1 / 1; - stroke-width: 0; - stroke: currentColor; - fill: currentColor; - } -{% endcss %} \ No newline at end of file +.top-btn__arrow { + display: inline-block; + width: 1em; + aspect-ratio: 1 / 1; + stroke-width: 0; + stroke: currentColor; + fill: currentColor; +} +{% endcss %} diff --git a/src/_includes/main/changelogs.njk b/src/_includes/main/changelogs.njk index 3958edaf..3e4da0f7 100644 --- a/src/_includes/main/changelogs.njk +++ b/src/_includes/main/changelogs.njk @@ -27,36 +27,36 @@ articleElement: true {{ content | safe }} {%- css %} - .changelog__nav, - .changelog__nav--links { - display: flex; - align-items: center; - justify-content: center; - flex-wrap: wrap; - } +.changelog__nav, +.changelog__nav--links { + display: flex; + align-items: center; + justify-content: center; + flex-wrap: wrap; +} +.changelog__nav { + flex-direction: column; + gap: 0.2em; + align-self: center; + font-weight: 700; + gap: 0.5em; +} + +.changelog__nav--links li { + text-align: center; + align-self: center; +} + +.changelog__nav--links [aria-current="page"] { + text-decoration: none; + color: var(--clr-bold-txt); +} + +@media (min-width: 640px) { .changelog__nav { - flex-direction: column; - gap: 0.2em; - align-self: center; - font-weight: 700; - gap: 0.5em; - } - - .changelog__nav--links li { - text-align: center; - align-self: center; - } - - .changelog__nav--links [aria-current="page"] { - text-decoration: none; - color: var(--clr-bold-txt); - } - - @media (min-width: 640px) { - .changelog__nav { - flex-direction: row; - gap: 1em; - } + flex-direction: row; + gap: 1em; } +} {% endcss %} diff --git a/src/_includes/main/content-nav.njk b/src/_includes/main/content-nav.njk index ae6e71b5..2823d4ed 100644 --- a/src/_includes/main/content-nav.njk +++ b/src/_includes/main/content-nav.njk @@ -14,12 +14,10 @@ {%- css %} - .content__nav { - padding: 1.2em clamp(1em, 5%, 1.5em); - background-color: var(--clr-content-bg); - } +.content__nav { + padding: 1.2em clamp(1em, 5%, 1.5em); + background-color: var(--clr-content-bg); +} - .content__nav--title { - font-size: 1.7rem; - } +.content__nav--title { font-size: 1.7rem; } {% endcss %} diff --git a/src/_includes/main/hero.njk b/src/_includes/main/hero.njk index 125c4931..6e79d65e 100644 --- a/src/_includes/main/hero.njk +++ b/src/_includes/main/hero.njk @@ -11,131 +11,131 @@ drop-shadow(0.1rem 0.1rem 0.2rem rgba(30, 30, 30, 0.8)) {%- css %}.hero img { filter: {{ heroDropShadow }}; }{% endcss %} {% block eventScript %} - const todayEvent = getTodayEvent(); +const todayEvent = getTodayEvent(); - if (todayEvent) { - heroTopBarEl.classList.remove('hidden'); - heroTopBarEl.innerHTML = todayEvent.blurb; +if (todayEvent) { + heroTopBarEl.classList.remove('hidden'); + heroTopBarEl.innerHTML = todayEvent.blurb; - if (todayEvent.class) { - headerImgEl.classList.add(todayEvent.class); + if (todayEvent.class) { + headerImgEl.classList.add(todayEvent.class); + } +} + +function getTodayEvent() { + const date = new Date(); + const month = date.getMonth() + 1; + const day = date.getDate(); + const year = date.getFullYear(); + const weekOfMonth = Math.ceil(day / 7); + + const leilukinsHubLaunchDate = new Date("2022-09-11").getFullYear(); + const siteAnniversary = year - leilukinsHubLaunchDate; + + if (month === 3 && day === 1) + return { + blurb: `Today is Zero Discrimination Day`, + class: "flag-progress-intersex", + }; + else if (month === 3 && day === 8) + return { + blurb: `Today is International Women's Day`, + class: "symbol-venus", + }; + else if (month === 3 && day === 31) + return { + blurb: `Today is Trans Day of Visibility`, + class: "flag-trans", + }; + else if (month === 4 && day === 6) + return { + blurb: `Today is International Asexuality Day`, + class: "flag-ace", + }; + else if (month === 4 && day === 26) + return { + blurb: `Today is Lesbian Visibility Day`, + class: "flag-lesbian", + }; + else if (month === 4 && weekOfMonth === 4) + return { + blurb: `This week is Lesbian Visibility Week`, + class: "flag-lesbian", + }; + else if (month === 5 && day === 17) + return { + blurb: `Today is International Day Against Homophobia, Biphobia and Transphobia`, + class: "flag-progress", + }; + else if (month === 5 && day === 19) + return { + blurb: `Today is Agender Pride Day`, + class: "flag-agender", + }; + else if (month === 5 && day === 25) + return { + blurb: `Today is Pansexual and Panromantic Awareness and Visibility Day`, + class: "flag-pan", + }; + else if (month === 6) + return { + blurb: `Happy Pride Month!`, + class: "flag-progress-intersex", + }; + else if (month === 7 && day === 14) + return { + blurb: `Today is Non-Binary People's Day`, + class: "flag-non-binary", + }; + else if (month === 7 && day === 28) + return { + blurb: `Today is Leilukin's Birthday` + }; + else if (month === 7) + return{ + blurb: `Happy Disability Pride Month!`, + class: "flag-disability" } - } - - function getTodayEvent() { - const date = new Date(); - const month = date.getMonth() + 1; - const day = date.getDate(); - const year = date.getFullYear(); - const weekOfMonth = Math.ceil(day / 7); - - const leilukinsHubLaunchDate = new Date("2022-09-11").getFullYear(); - const siteAnniversary = year - leilukinsHubLaunchDate; - - if (month === 3 && day === 1) - return { - blurb: `Today is Zero Discrimination Day`, - class: "flag-progress-intersex", - }; - else if (month === 3 && day === 8) - return { - blurb: `Today is International Women's Day`, - class: "symbol-venus", - }; - else if (month === 3 && day === 31) - return { - blurb: `Today is Trans Day of Visibility`, - class: "flag-trans", - }; - else if (month === 4 && day === 6) - return { - blurb: `Today is International Asexuality Day`, - class: "flag-ace", - }; - else if (month === 4 && day === 26) - return { - blurb: `Today is Lesbian Visibility Day`, - class: "flag-lesbian", - }; - else if (month === 4 && weekOfMonth === 4) - return { - blurb: `This week is Lesbian Visibility Week`, - class: "flag-lesbian", - }; - else if (month === 5 && day === 17) - return { - blurb: `Today is International Day Against Homophobia, Biphobia and Transphobia`, - class: "flag-progress", - }; - else if (month === 5 && day === 19) - return { - blurb: `Today is Agender Pride Day`, - class: "flag-agender", - }; - else if (month === 5 && day === 25) - return { - blurb: `Today is Pansexual and Panromantic Awareness and Visibility Day`, - class: "flag-pan", - }; - else if (month === 6) - return { - blurb: `Happy Pride Month!`, - class: "flag-progress-intersex", - }; - else if (month === 7 && day === 14) - return { - blurb: `Today is Non-Binary People's Day`, - class: "flag-non-binary", - }; - else if (month === 7 && day === 28) - return { - blurb: `Today is Leilukin's Birthday` - }; - else if (month === 7) - return{ - blurb: `Happy Disability Pride Month!`, - class: "flag-disability" - } - else if (month === 8 && day === 25) - return { - blurb: `Today is Aromantic Spectrum Visibility Day`, - class: "flag-aro", - }; - else if (month === 9 && day === 11) - return { - blurb: `Today is the ${siteAnniversary}-year anniversary of the launch of {{ sitemeta.siteName }}` - }; - else if (month === 9 && day === 23) - return { - blurb: `Today is Bi Visibility Day`, - class: "flag-bi", - }; - else if (month === 10 && day === 8) - return { - blurb: `Today is International Lesbian Day`, - class: "flag-lesbian", - }; - else if (month === 10 && day === 11) - return { - blurb: `Today is National Coming Out Day`, - class: "flag-rainbow", - }; - else if (month === 10 && day === 17) - return { - blurb: `Today is the start of Genderfluid Visibility Week`, - class: "flag-genderfluid", - }; - else if (month === 10 && day === 26) - return { - blurb: `Today is Intersex Awareness Day`, - class: "flag-intersex", - }; - else if (month === 11 && day === 13) - return { - blurb: `Today is the start of Transgender Awareness Week`, - class: "flag-trans", - }; - else - return null; - } -{% endblock %} \ No newline at end of file + else if (month === 8 && day === 25) + return { + blurb: `Today is Aromantic Spectrum Visibility Day`, + class: "flag-aro", + }; + else if (month === 9 && day === 11) + return { + blurb: `Today is the ${siteAnniversary}-year anniversary of the launch of {{ sitemeta.siteName }}` + }; + else if (month === 9 && day === 23) + return { + blurb: `Today is Bi Visibility Day`, + class: "flag-bi", + }; + else if (month === 10 && day === 8) + return { + blurb: `Today is International Lesbian Day`, + class: "flag-lesbian", + }; + else if (month === 10 && day === 11) + return { + blurb: `Today is National Coming Out Day`, + class: "flag-rainbow", + }; + else if (month === 10 && day === 17) + return { + blurb: `Today is the start of Genderfluid Visibility Week`, + class: "flag-genderfluid", + }; + else if (month === 10 && day === 26) + return { + blurb: `Today is Intersex Awareness Day`, + class: "flag-intersex", + }; + else if (month === 11 && day === 13) + return { + blurb: `Today is the start of Transgender Awareness Week`, + class: "flag-trans", + }; + else + return null; +} +{% endblock %} diff --git a/src/_includes/main/support-me.njk b/src/_includes/main/support-me.njk index 5ad1cfbb..231409fd 100644 --- a/src/_includes/main/support-me.njk +++ b/src/_includes/main/support-me.njk @@ -5,11 +5,11 @@ {%- css %} - .support-me { - display: flex; - flex-wrap: wrap; - gap: 1em; - align-items: center; - margin-top: 0.7em; - } -{% endcss %} \ No newline at end of file +.support-me { + display: flex; + flex-wrap: wrap; + gap: 1em; + align-items: center; + margin-top: 0.7em; +} +{% endcss %} diff --git a/src/_includes/pokemonoras/base.njk b/src/_includes/pokemonoras/base.njk index 6a199786..c5d635f2 100644 --- a/src/_includes/pokemonoras/base.njk +++ b/src/_includes/pokemonoras/base.njk @@ -3,20 +3,20 @@ {% extends "global/baselayout.njk" %} {% block metaTitle %} - + {% endblock %} {% block pageTitle %} - {{ title + " | " if title }}Pokémon Omega Ruby and Alpha Sapphire Shrine | {{ sitemeta.siteName | safe }} +{{ title + " | " if title }}Pokémon Omega Ruby and Alpha Sapphire Shrine | {{ sitemeta.siteName | safe }} {% endblock %} {% block favicon %} - - - - + + + + {% endblock %} {% block hero %}{% include "pokemonoras/hero.njk" %}{% endblock %} {% block navbar %}{% include "pokemonoras/navbar.njk" %}{% endblock %} -{% block footer %}{% include "pokemonoras/footer.njk" %}{% endblock %} \ No newline at end of file +{% block footer %}{% include "pokemonoras/footer.njk" %}{% endblock %} diff --git a/src/_includes/starwarskotor/base.njk b/src/_includes/starwarskotor/base.njk index 31c226f0..d7da52a1 100644 --- a/src/_includes/starwarskotor/base.njk +++ b/src/_includes/starwarskotor/base.njk @@ -3,20 +3,20 @@ {% extends "global/baselayout.njk" %} {% block metaTitle %} - + {% endblock %} {% block pageTitle %} - {{ title + " | " if title }}Star Wars: Knights of the Old Republic Shrine | {{ sitemeta.siteName | safe }} +{{ title + " | " if title }}Star Wars: Knights of the Old Republic Shrine | {{ sitemeta.siteName | safe }} {% endblock %} {% block favicon %} - - - - + + + + {% endblock %} {% block hero %}{% include "starwarskotor/hero.njk" %}{% endblock %} {% block navbar %}{% include "starwarskotor/navbar.njk" %}{% endblock %} -{% block footer %}{% include "starwarskotor/footer.njk" %}{% endblock %} \ No newline at end of file +{% block footer %}{% include "starwarskotor/footer.njk" %}{% endblock %} diff --git a/src/blog/posts.njk b/src/blog/posts.njk index 258448d1..7ff513b0 100644 --- a/src/blog/posts.njk +++ b/src/blog/posts.njk @@ -14,10 +14,10 @@ eleventyNavigation:

  • - {% if post.data.title %}{{ post.data.articleTitle }} - {% else %} + {% if post.data.title %}{{ post.data.articleTitle }} + {% else %} {{ post.url }} - {% endif %} + {% endif %}

    diff --git a/src/slashes/footerlinks/sitemap.njk b/src/slashes/footerlinks/sitemap.njk index eb296247..6aabf75f 100644 --- a/src/slashes/footerlinks/sitemap.njk +++ b/src/slashes/footerlinks/sitemap.njk @@ -20,28 +20,28 @@ eleventyComputed: {{ collections.all | eleventyNavigation | eleventyNavigationToHtml(navigationOptions) | safe }} {%- css %} - main ul { - display: grid; - gap: 0.5rem; - margin-top: 0.3em; - } +main ul { + display: grid; + gap: 0.5rem; + margin-top: 0.3em; +} - .sitemap { - margin: 1em 0; - padding: 0 0 0 1em; - list-style-type: ""; - } +.sitemap { + margin: 1em 0; + padding: 0 0 0 1em; + list-style-type: ""; +} - .sitemap a:focus { outline: 0.15rem solid var(--clr-link); } +.sitemap a:focus { outline: 0.15rem solid var(--clr-link); } - .sitemap li { - padding-left: 0.5em; - align-items: start; - } +.sitemap li { + padding-left: 0.5em; + align-items: start; +} - .sitemap li::marker { content: "▶"; } - .sitemap ul { padding-left: 1em; } - .sitemap ul li::marker { content: "★"; } - .sitemap ul ul li::marker { content: "♥"; } - .sitemap ul ul ul li::marker { content: "❣"; } -{% endcss %} \ No newline at end of file +.sitemap li::marker { content: "▶"; } +.sitemap ul { padding-left: 1em; } +.sitemap ul li::marker { content: "★"; } +.sitemap ul ul li::marker { content: "♥"; } +.sitemap ul ul ul li::marker { content: "❣"; } +{% endcss %} diff --git a/src/slashes/navbarlinks/blog.njk b/src/slashes/navbarlinks/blog.njk index 134cafee..1f994507 100644 --- a/src/slashes/navbarlinks/blog.njk +++ b/src/slashes/navbarlinks/blog.njk @@ -44,31 +44,31 @@ eleventyComputed: {%- css %} - .blog__posts, .blog__post { display: grid; } +.blog__posts, .blog__post { display: grid; } - .blog__posts { - list-style-type: none; - padding: 0; - margin: 1.5em 0 0 0; - } +.blog__posts { + list-style-type: none; + padding: 0; + margin: 1.5em 0 0 0; +} - .blog__post { - --bdr-blogpost: 0.2em solid var(--clr-quote-border); - gap: 0.6em; - padding: 1.5em 0; - border-bottom: var(--bdr-blogpost); - } +.blog__post { + --bdr-blogpost: 0.2em solid var(--clr-quote-border); + gap: 0.6em; + padding: 1.5em 0; + border-bottom: var(--bdr-blogpost); +} - .blog__post:first-of-type { border-top: var(--bdr-blogpost); } +.blog__post:first-of-type { border-top: var(--bdr-blogpost); } - .blog__post--title { - font-size: clamp(1.55rem, 1rem + 3vw, 1.8rem); - line-height: 1.3; - margin-bottom: 0 !important; - } +.blog__post--title { + font-size: clamp(1.55rem, 1rem + 3vw, 1.8rem); + line-height: 1.3; + margin-bottom: 0 !important; +} - .blog__post--time { - color: var(--clr-sub-heading); - font-weight: 700; - } +.blog__post--time { + color: var(--clr-sub-heading); + font-weight: 700; +} {% endcss %} diff --git a/src/slashes/navbarlinks/guestbook.njk b/src/slashes/navbarlinks/guestbook.njk index c2cf6519..54e4afa2 100644 --- a/src/slashes/navbarlinks/guestbook.njk +++ b/src/slashes/navbarlinks/guestbook.njk @@ -43,8 +43,8 @@ eleventyComputed: {%- css %} - .gb__messages--title { - text-align: center; - margin-bottom: 0.5em; - } -{% endcss %} \ No newline at end of file +.gb__messages--title { + text-align: center; + margin-bottom: 0.5em; +} +{% endcss %} diff --git a/src/slashes/navbarlinks/shrines.njk b/src/slashes/navbarlinks/shrines.njk index 25073c27..7331f341 100644 --- a/src/slashes/navbarlinks/shrines.njk +++ b/src/slashes/navbarlinks/shrines.njk @@ -34,16 +34,16 @@ eleventyComputed: {%- css %} - .shrine-index { - display: grid; - gap: 2em; - list-style-type: ""; - padding: 0; - margin: 2em 0 0; - } +.shrine-index { + display: grid; + gap: 2em; + list-style-type: ""; + padding: 0; + margin: 2em 0 0; +} - .shrine-index li { - display: grid; - gap: 0.7em; - } -{% endcss %} \ No newline at end of file +.shrine-index li { + display: grid; + gap: 0.7em; +} +{% endcss %}