Bring over improvements from badmanners.xyz
This commit is contained in:
parent
d022fab5d6
commit
c55c82633d
24 changed files with 542 additions and 444 deletions
|
|
@ -4,6 +4,10 @@ import BaseLayout from "./BaseLayout.astro";
|
|||
import Navigation from "../components/Navigation.astro";
|
||||
import logoBM from "../assets/images/logo_bm.png";
|
||||
import { t } from "../i18n";
|
||||
import IconHome from "../components/icons/IconHome.astro";
|
||||
import IconSquareRSS from "../components/icons/IconSquareRSS.astro";
|
||||
import IconSun from "../components/icons/IconSun.astro";
|
||||
import IconMoon from "../components/icons/IconMoon.astro";
|
||||
|
||||
type Props = {
|
||||
pageTitle: string;
|
||||
|
|
@ -28,16 +32,16 @@ const currentYear = new Date().getFullYear().toString();
|
|||
class="flex min-h-screen flex-col bg-stone-200 text-stone-800 md:flex-row dark:bg-stone-800 dark:text-stone-200 print:bg-none"
|
||||
>
|
||||
<div
|
||||
class="static mb-4 flex flex-col items-center bg-bm-300 pt-10 text-center text-stone-900 shadow-xl md:fixed md:inset-y-0 md:left-0 md:mb-0 md:w-60 md:pt-20 dark:bg-green-900 dark:text-stone-100 print:bg-none print:shadow-none"
|
||||
class="h-card static mb-4 flex flex-col items-center bg-bm-300 pt-10 text-center text-stone-900 shadow-xl md:fixed md:inset-y-0 md:left-0 md:mb-0 md:w-60 md:pt-20 dark:bg-green-900 dark:text-stone-100 print:bg-none print:shadow-none"
|
||||
>
|
||||
<img
|
||||
loading="eager"
|
||||
src={logo.src}
|
||||
alt="Logo for Bad Manners"
|
||||
class="my-4 w-full max-w-[192px] rounded-sm border-2 border-green-950 shadow-md"
|
||||
class="u-logo my-4 w-full max-w-[192px] rounded-sm border-2 border-green-950 shadow-md"
|
||||
width={192}
|
||||
/>
|
||||
<span class="my-2 text-2xl font-semibold">Bad Manners</span>
|
||||
<span class="p-name my-2 text-2xl font-semibold">Bad Manners</span>
|
||||
<Navigation />
|
||||
<div class="pt-4 text-center text-xs text-black dark:text-white">
|
||||
<span
|
||||
|
|
@ -54,28 +58,12 @@ const currentYear = new Date().getFullYear().toString();
|
|||
<a class="hover:underline focus:underline" href="/licenses.txt" target="_blank">Licenses</a>
|
||||
</div>
|
||||
<div class="mt-2 flex items-center gap-x-1 pb-10">
|
||||
<a class="text-link p-1" href="https://badmanners.xyz/" target="_blank" aria-labelledby="label-main-website">
|
||||
<svg
|
||||
style={{ width: "1.5rem", height: "1.5rem", fill: "currentColor" }}
|
||||
viewBox="0 0 576 512"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
d="M575.8 255.5c0 18-15 32.1-32 32.1h-32l.7 160.2c0 2.7-.2 5.4-.5 8.1V472c0 22.1-17.9 40-40 40H456c-1.1 0-2.2 0-3.3-.1c-1.4 .1-2.8 .1-4.2 .1H416 392c-22.1 0-40-17.9-40-40V448 384c0-17.7-14.3-32-32-32H256c-17.7 0-32 14.3-32 32v64 24c0 22.1-17.9 40-40 40H160 128.1c-1.5 0-3-.1-4.5-.2c-1.2 .1-2.4 .2-3.6 .2H104c-22.1 0-40-17.9-40-40V360c0-.9 0-1.9 .1-2.8V287.6H32c-18 0-32-14-32-32.1c0-9 3-17 10-24L266.4 8c7-7 15-8 22-8s15 2 21 7L564.8 231.5c8 7 12 15 11 24z"
|
||||
></path>
|
||||
</svg>
|
||||
<a class="u-url text-link p-1" href="https://badmanners.xyz/" target="_blank" aria-labelledby="label-main-website">
|
||||
<IconHome width="1.5rem" height="1.5rem" />
|
||||
<span id="label-main-website" class="sr-only">Main website</span>
|
||||
</a>
|
||||
<a class="text-link p-1" href="/feed.xml" target="_blank" aria-labelledby="label-rss-feed">
|
||||
<svg
|
||||
style={{ width: "1.5rem", height: "1.5rem", fill: "currentColor" }}
|
||||
viewBox="0 0 448 512"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM96 136c0-13.3 10.7-24 24-24c137 0 248 111 248 248c0 13.3-10.7 24-24 24s-24-10.7-24-24c0-110.5-89.5-200-200-200c-13.3 0-24-10.7-24-24zm0 96c0-13.3 10.7-24 24-24c83.9 0 152 68.1 152 152c0 13.3-10.7 24-24 24s-24-10.7-24-24c0-57.4-46.6-104-104-104c-13.3 0-24-10.7-24-24zm0 120a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z"
|
||||
></path>
|
||||
</svg>
|
||||
<IconSquareRSS width="1.5rem" height="1.5rem" />
|
||||
<span id="label-rss-feed" class="sr-only">RSS feed</span>
|
||||
</a>
|
||||
<button
|
||||
|
|
@ -84,26 +72,8 @@ const currentYear = new Date().getFullYear().toString();
|
|||
class="text-link p-1"
|
||||
aria-labelledby="label-toggle-dark-mode"
|
||||
>
|
||||
<svg
|
||||
style={{ width: "1.5rem", height: "1.5rem", fill: "currentColor" }}
|
||||
viewBox="0 0 512 512"
|
||||
class="hidden dark:block"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
d="M361.5 1.2c5 2.1 8.6 6.6 9.6 11.9L391 121l107.9 19.8c5.3 1 9.8 4.6 11.9 9.6s1.5 10.7-1.6 15.2L446.9 256l62.3 90.3c3.1 4.5 3.7 10.2 1.6 15.2s-6.6 8.6-11.9 9.6L391 391 371.1 498.9c-1 5.3-4.6 9.8-9.6 11.9s-10.7 1.5-15.2-1.6L256 446.9l-90.3 62.3c-4.5 3.1-10.2 3.7-15.2 1.6s-8.6-6.6-9.6-11.9L121 391 13.1 371.1c-5.3-1-9.8-4.6-11.9-9.6s-1.5-10.7 1.6-15.2L65.1 256 2.8 165.7c-3.1-4.5-3.7-10.2-1.6-15.2s6.6-8.6 11.9-9.6L121 121 140.9 13.1c1-5.3 4.6-9.8 9.6-11.9s10.7-1.5 15.2 1.6L256 65.1 346.3 2.8c4.5-3.1 10.2-3.7 15.2-1.6zM160 256a96 96 0 1 1 192 0 96 96 0 1 1 -192 0zm224 0a128 128 0 1 0 -256 0 128 128 0 1 0 256 0z"
|
||||
></path>
|
||||
</svg>
|
||||
<svg
|
||||
style={{ width: "1.5rem", height: "1.5rem", fill: "currentColor" }}
|
||||
viewBox="0 0 512 512"
|
||||
class="block dark:hidden"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
d="M223.5 32C100 32 0 132.3 0 256S100 480 223.5 480c60.6 0 115.5-24.2 155.8-63.4c5-4.9 6.3-12.5 3.1-18.7s-10.1-9.7-17-8.5c-9.8 1.7-19.8 2.6-30.1 2.6c-96.9 0-175.5-78.8-175.5-176c0-65.8 36-123.1 89.3-153.3c6.1-3.5 9.2-10.5 7.7-17.3s-7.3-11.9-14.3-12.5c-6.3-.5-12.6-.8-19-.8z"
|
||||
></path>
|
||||
</svg>
|
||||
<IconSun width="1.5rem" height="1.5rem" class="hidden dark:block" />
|
||||
<IconMoon width="1.5rem" height="1.5rem" class="block dark:hidden" />
|
||||
<span id="label-toggle-dark-mode" class="sr-only">{t("en", "published_content/toggle_dark_mode")}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,13 @@ import Prose from "../components/Prose.astro";
|
|||
import MastodonComments from "../components/MastodonComments.astro";
|
||||
import type { CopyrightedCharacters as CopyrightedCharactersType } from "../content/config";
|
||||
import { qualifyLocalURLsInMarkdown } from "../utils/qualify_local_urls_in_markdown";
|
||||
import IconSun from "../components/icons/IconSun.astro";
|
||||
import IconMoon from "../components/icons/IconMoon.astro";
|
||||
import IconInformation from "../components/icons/IconInformation.astro";
|
||||
import IconArrowBack from "../components/icons/IconArrowBack.astro";
|
||||
import IconChevronLeft from "../components/icons/IconChevronLeft.astro";
|
||||
import IconChevronRight from "../components/icons/IconChevronRight.astro";
|
||||
import IconArrowUp from "../components/icons/IconArrowUp.astro";
|
||||
|
||||
interface RelatedContent {
|
||||
link: string;
|
||||
|
|
@ -117,15 +124,7 @@ const thumbnail =
|
|||
class="text-link my-1 p-2"
|
||||
aria-labelledby="label-return-to"
|
||||
>
|
||||
<svg
|
||||
style={{ width: "1.25rem", height: "1.25rem", fill: "currentColor" }}
|
||||
viewBox="0 0 512 512"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
d="M48.5 224H40c-13.3 0-24-10.7-24-24V72c0-9.7 5.8-18.5 14.8-22.2s19.3-1.7 26.2 5.2L98.6 96.6c87.6-86.5 228.7-86.2 315.8 1c87.5 87.5 87.5 229.3 0 316.8s-229.3 87.5-316.8 0c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0c62.5 62.5 163.8 62.5 226.3 0s62.5-163.8 0-226.3c-62.2-62.2-162.7-62.5-225.3-1L185 183c6.9 6.9 8.9 17.2 5.2 26.2s-12.5 14.8-22.2 14.8H48.5z"
|
||||
></path>
|
||||
</svg>
|
||||
<IconArrowBack width="1.25rem" height="1.25rem" />
|
||||
<span class="sr-only" id="label-return-to"
|
||||
>{
|
||||
series ? t(props.lang, "published_content/return_to_series", series.data.name) : props.labelReturnTo.title
|
||||
|
|
@ -137,15 +136,7 @@ const thumbnail =
|
|||
class="text-link my-1 border-l border-stone-300 p-2 dark:border-stone-700"
|
||||
aria-labelledby="label-go-to-description"
|
||||
>
|
||||
<svg
|
||||
style={{ width: "1.25rem", height: "1.25rem", fill: "currentColor" }}
|
||||
viewBox="0 0 512 512"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM216 336h24V272H216c-13.3 0-24-10.7-24-24s10.7-24 24-24h48c13.3 0 24 10.7 24 24v88h8c13.3 0 24 10.7 24 24s-10.7 24-24 24H216c-13.3 0-24-10.7-24-24s10.7-24 24-24zm40-208a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"
|
||||
></path>
|
||||
</svg>
|
||||
<IconInformation width="1.25rem" height="1.25rem" />
|
||||
<span class="sr-only" id="label-go-to-description"
|
||||
>{t(props.lang, "published_content/go_to_description")}</span
|
||||
>
|
||||
|
|
@ -156,26 +147,8 @@ const thumbnail =
|
|||
class="text-link my-1 border-l border-stone-300 p-2 dark:border-stone-700"
|
||||
aria-labelledby="label-toggle-dark-mode"
|
||||
>
|
||||
<svg
|
||||
style={{ width: "1.25rem", height: "1.25rem", fill: "currentColor" }}
|
||||
viewBox="0 0 512 512"
|
||||
class="hidden dark:block"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
d="M361.5 1.2c5 2.1 8.6 6.6 9.6 11.9L391 121l107.9 19.8c5.3 1 9.8 4.6 11.9 9.6s1.5 10.7-1.6 15.2L446.9 256l62.3 90.3c3.1 4.5 3.7 10.2 1.6 15.2s-6.6 8.6-11.9 9.6L391 391 371.1 498.9c-1 5.3-4.6 9.8-9.6 11.9s-10.7 1.5-15.2-1.6L256 446.9l-90.3 62.3c-4.5 3.1-10.2 3.7-15.2 1.6s-8.6-6.6-9.6-11.9L121 391 13.1 371.1c-5.3-1-9.8-4.6-11.9-9.6s-1.5-10.7 1.6-15.2L65.1 256 2.8 165.7c-3.1-4.5-3.7-10.2-1.6-15.2s6.6-8.6 11.9-9.6L121 121 140.9 13.1c1-5.3 4.6-9.8 9.6-11.9s10.7-1.5 15.2 1.6L256 65.1 346.3 2.8c4.5-3.1 10.2-3.7 15.2-1.6zM160 256a96 96 0 1 1 192 0 96 96 0 1 1 -192 0zm224 0a128 128 0 1 0 -256 0 128 128 0 1 0 256 0z"
|
||||
></path>
|
||||
</svg>
|
||||
<svg
|
||||
style={{ width: "1.25rem", height: "1.25rem", fill: "currentColor" }}
|
||||
viewBox="0 0 512 512"
|
||||
class="block dark:hidden"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path
|
||||
d="M223.5 32C100 32 0 132.3 0 256S100 480 223.5 480c60.6 0 115.5-24.2 155.8-63.4c5-4.9 6.3-12.5 3.1-18.7s-10.1-9.7-17-8.5c-9.8 1.7-19.8 2.6-30.1 2.6c-96.9 0-175.5-78.8-175.5-176c0-65.8 36-123.1 89.3-153.3c6.1-3.5 9.2-10.5 7.7-17.3s-7.3-11.9-14.3-12.5c-6.3-.5-12.6-.8-19-.8z"
|
||||
></path>
|
||||
</svg>
|
||||
<IconSun width="1.25rem" height="1.25rem" class="hidden dark:block" />
|
||||
<IconMoon width="1.25rem" height="1.25rem" class="block dark:hidden" />
|
||||
<span class="sr-only" id="label-toggle-dark-mode">{t(props.lang, "published_content/toggle_dark_mode")}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
@ -195,14 +168,7 @@ const thumbnail =
|
|||
class="text-link flex items-center justify-center border-r border-stone-400 px-1 py-3 font-light underline dark:border-stone-600"
|
||||
aria-label={props.labelPreviousContent}
|
||||
>
|
||||
<svg
|
||||
style={{ width: "1.25rem", height: "1.25rem", fill: "currentColor" }}
|
||||
class="mr-1"
|
||||
viewBox="0 0 320 512"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path d="M9.4 233.4c-12.5 12.5-12.5 32.8 0 45.3l192 192c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L77.3 256 246.6 86.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0l-192 192z" />
|
||||
</svg>
|
||||
<IconChevronLeft width="1.25rem" height="1.25rem" />
|
||||
<span>{props.prev.title}</span>
|
||||
</a>
|
||||
) : (
|
||||
|
|
@ -215,14 +181,7 @@ const thumbnail =
|
|||
aria-label={props.labelNextContent}
|
||||
>
|
||||
<span>{props.next.title}</span>
|
||||
<svg
|
||||
style={{ width: "1.25rem", height: "1.25rem", fill: "currentColor" }}
|
||||
class="ml-1"
|
||||
viewBox="0 0 320 512"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path d="M310.6 233.4c12.5 12.5 12.5 32.8 0 45.3l-192 192c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L242.7 256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z" />
|
||||
</svg>
|
||||
<IconChevronRight width="1.25rem" height="1.25rem" />
|
||||
</a>
|
||||
) : (
|
||||
<div aria-hidden="true" />
|
||||
|
|
@ -327,17 +286,10 @@ const thumbnail =
|
|||
) : null
|
||||
}
|
||||
<div class="pr-3 text-right print:hidden">
|
||||
<a href="#top" class="text-link inline-flex items-center underline" aria-labelledby="label-to-top"
|
||||
><svg
|
||||
style={{ width: "1.25rem", height: "1.25rem", fill: "currentColor" }}
|
||||
class="mr-1"
|
||||
viewBox="0 0 384 512"
|
||||
aria-hidden="true"
|
||||
><path
|
||||
d="M214.6 41.4c-12.5-12.5-32.8-12.5-45.3 0l-160 160c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L160 141.2V448c0 17.7 14.3 32 32 32s32-14.3 32-32V141.2L329.4 246.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3l-160-160z"
|
||||
></path></svg
|
||||
><span id="label-to-top">{t(props.lang, "published_content/to_top")}</span></a
|
||||
>
|
||||
<a href="#top" class="text-link inline-flex items-center underline" aria-labelledby="label-to-top">
|
||||
<IconArrowUp width="1.25rem" height="1.25rem" />
|
||||
<span id="label-to-top">{t(props.lang, "published_content/to_top")}</span>
|
||||
</a>
|
||||
</div>
|
||||
{
|
||||
props.prev || props.next ? (
|
||||
|
|
@ -350,14 +302,7 @@ const thumbnail =
|
|||
class="text-link flex items-center justify-center border-r border-stone-400 px-1 py-3 font-light underline dark:border-stone-600"
|
||||
aria-label={props.labelPreviousContent}
|
||||
>
|
||||
<svg
|
||||
style={{ width: "1.25rem", height: "1.25rem", fill: "currentColor" }}
|
||||
class="mr-1"
|
||||
viewBox="0 0 320 512"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path d="M9.4 233.4c-12.5 12.5-12.5 32.8 0 45.3l192 192c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L77.3 256 246.6 86.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0l-192 192z" />
|
||||
</svg>
|
||||
<IconChevronLeft width="1.25rem" height="1.25rem" />
|
||||
<span>{props.prev.title}</span>
|
||||
</a>
|
||||
) : (
|
||||
|
|
@ -370,14 +315,7 @@ const thumbnail =
|
|||
aria-label={props.labelNextContent}
|
||||
>
|
||||
<span>{props.next.title}</span>
|
||||
<svg
|
||||
style={{ width: "1.25rem", height: "1.25rem", fill: "currentColor" }}
|
||||
class="ml-1"
|
||||
viewBox="0 0 320 512"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path d="M310.6 233.4c12.5 12.5 12.5 32.8 0 45.3l-192 192c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L242.7 256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z" />
|
||||
</svg>
|
||||
<IconChevronRight width="1.25rem" height="1.25rem" />
|
||||
</a>
|
||||
) : (
|
||||
<div />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue