This commit is contained in:
Laker Turner 2025-04-23 21:09:04 +01:00
parent 541afe60d9
commit ae64b5d76a
No known key found for this signature in database
8 changed files with 92 additions and 59 deletions

View file

@ -2,7 +2,7 @@
import { isBirthday } from "~/lib/fun"; import { isBirthday } from "~/lib/fun";
--- ---
<footer class="mt-12 text-sm text-light-tx-2 dark:text-dark-tx-2"> <footer class="mt-12 mb-4 text-sm text-light-tx-2 dark:text-dark-tx-2">
<p>© {new Date().getFullYear()} Ivy Turner</p> <p>© {new Date().getFullYear()} Ivy Turner</p>
<p> <p>
<a class="underline" href="https://github.com/ivyturner/trellis"> <a class="underline" href="https://github.com/ivyturner/trellis">

View file

@ -8,7 +8,7 @@ const headerLinks = [
{ {
label: "/now", label: "/now",
href: "/now", href: "/now",
icon: "fa-solid fa-calendar-days" icon: "fa-solid fa-calendar-days",
}, },
{ {
label: "Projects", label: "Projects",
@ -30,6 +30,11 @@ const headerLinks = [
href: "/contact", href: "/contact",
icon: "fa-solid fa-envelope", icon: "fa-solid fa-envelope",
}, },
{
label: "More",
href: "/more",
icon: "fa-solid fa-arrow-right",
},
]; ];
--- ---
@ -40,9 +45,7 @@ const headerLinks = [
<i class={`${link.icon} mr-0.5 text-sm`} /> <i class={`${link.icon} mr-0.5 text-sm`} />
<a <a
href={link.href} href={link.href}
aria-current={Astro.url.pathname === link.href ? "page" : undefined} aria-current={Astro.url.pathname === link.href ? "page" : undefined}
class="underline decoration-wavy underline-offset-4 decoration-1.5 class="underline decoration-wavy underline-offset-4 decoration-1.5
decoration-light-pu dark:decoration-dark-pu" decoration-light-pu dark:decoration-dark-pu"
> >

View file

@ -2,6 +2,8 @@
--- ---
<div class="prose dark:prose-invert prose-p:text-light-tx dark:prose-p:text-dark-tx prose-h3:mt-1 prose-a:decoration-dotted prose-a:underline-offset-4 prose-a:decoration-2 prose-a:underline prose-a:decoration-light-pu dark:prose-a:decoration-dark-pu prose-ul:list-disc"> <div
<slot /> class="prose dark:prose-invert prose-p:text-light-tx dark:prose-p:text-dark-tx prose-h3:mt-1 prose-a:decoration-dotted prose-a:text-light-tx dark:prose-a:text-dark-tx prose-a:underline-offset-4 prose-a:decoration-2 prose-a:underline prose-a:decoration-light-pu dark:prose-a:decoration-dark-pu prose-ul:list-disc prose-strong:text-light-tx dark:prose-strong:text-dark-tx"
>
<slot />
</div> </div>

View file

@ -9,13 +9,17 @@ const { title, description, icon, date } = Astro.props;
<i class={`${icon} text-xl mr-2 text-light-pu dark:text-dark-pu`}></i> <i class={`${icon} text-xl mr-2 text-light-pu dark:text-dark-pu`}></i>
{title} {title}
</h2> </h2>
<p class="mt-2 text-sm text-light-tx-2 dark:text-dark-tx-2">{description}</p> <p
class="text-sm text-light-tx-2 dark:text-dark-tx-2 border-l-2 border-light-pu dark:border-dark-pu pl-4 mt-2"
>
{description}
</p>
{ {
() => { () => {
if (date) { if (date) {
return ( return (
<p class="mt-2 text-sm text-light-tx-2 dark:text-dark-tx-2"> <p class="mt-2 text-sm text-light-tx-2 dark:text-dark-tx-2">
<Date date={date} /> <Date date={date} />
</p> </p>
); );
} }

View file

@ -4,4 +4,4 @@ icon: fa-solid fa-music
exturl: https://www.last.fm/music/Fontaines+D.C./_/Before+You+I+Just+Forget exturl: https://www.last.fm/music/Fontaines+D.C./_/Before+You+I+Just+Forget
--- ---
Loved [Before You I Just Forget](https://www.last.fm/music/Fontaines+D.C./_/Before+You+I+Just+Forget) by [Fontaines D.C.](https://www.last.fm/music/Fontaines+D.C.) on [last.fm](https://last.fm/user/lxjv Loved [Before You I Just Forget](https://www.last.fm/music/Fontaines+D.C./_/Before+You+I+Just+Forget) by [Fontaines D.C.](https://www.last.fm/music/Fontaines+D.C.) on [last.fm](https://last.fm/user/lxjv)

View file

@ -18,47 +18,50 @@ const { title, exturl, icon, date } = Astro.props;
<Base title={noteTitleConstructor(title, date)}> <Base title={noteTitleConstructor(title, date)}>
<Header /> <Header />
<div
<h2 class="text-xl font-bold mt-6"> class="bg-light-bg-2 dark:bg-dark-bg-2 w-fit p-4 pt-0.5 rounded-br-3xl rounded-tl-3xl"
<i class={`${icon} mr-1`}></i> >
{ <h2 class="text-xl font-bold mt-6">
() => { <i class={`${icon} mr-1 tx-light-pu dark:text-dark-pu`}></i>
if (title) { {
return ( () => {
<span class="font-bold"> if (title) {
A note titled {title} (<Date showTime date={date} />) return (
</span> <span class="font-bold">
); A note titled {title} (<Date showTime date={date} />)
} else { </span>
return ( );
<span class="font-bold"> } else {
A note from return (
<Date showTime date={date} /> <span class="font-bold">
</span> A note from
); <Date showTime date={date} />
</span>
);
}
} }
} }
} </h2>
</h2> <>
<> <p class="ml-4 mt-3 mb-3">
<p class="ml-4 mt-3 mb-3"> {
{ exturl && (
exturl && ( <StyledLink
<StyledLink href={exturl}
href={exturl} icon="fa-solid fa-arrow-up-right-from-square"
icon="fa-solid fa-arrow-up-right-from-square" >
> {exturl}
{exturl} </StyledLink>
</StyledLink> )
) }
} </p>
</p> <Prose>
<Prose> <slot />
<slot /> </Prose>
</Prose> </>
</> <hr class="w-[500px]" />
<hr class="w-[500px]" /> <StyledLink href="/notes" icon="fa-solid fa-arrow-left">
<StyledLink href="/notes" icon="fa-solid fa-arrow-left"> See more notes
See more notes </StyledLink>
</StyledLink> </div>
</Base> </Base>

View file

@ -4,13 +4,9 @@ import BlogPostList from "~/components/lists/BlogPostList.astro";
--- ---
<Page <Page
title="Blog thing yes yes" title="Blog"
description="A list of all my blog posts." description="writing"
icon="fa-solid fa-star" icon="fa-solid fa-star"
> >
<p class="mb-6">
My personal blog is <a class="link" href="https://concorde.blog">Concorde</a
>, but here's where the technical stuff goes.
</p>
<BlogPostList /> <BlogPostList />
</Page> </Page>

View file

@ -1,7 +1,15 @@
--- ---
import Page from "~/layouts/Page.astro"; import Page from "~/layouts/Page.astro";
const meta = [
{
title: "Colophon",
link: "colophon",
desc: "How the site gets made",
icon: "fa-solid fa-wrench",
colour: "bl", // currently unused, cause i can't be bothered
},
];
--- ---
<Page <Page
@ -10,5 +18,22 @@ import Page from "~/layouts/Page.astro";
icon="fa-solid fa-user" icon="fa-solid fa-user"
date="2025-03-13" date="2025-03-13"
> >
<h3 class="text-lg font-bold mb-2">/meta</h3>
<ul>
<ul>
{
meta.map((item) => (
<li>
<h4 class="font-bold">
<i class={`${item.icon} mr-2 text-light-pu dark:text-dark-pu`} />
<a href={"/meta/" + item.link}>{item.title}</a>
</h4>
<blockquote class="border-l-2 border-light-pu dark:border-dark-pu pl-4 mt-2 text-light-tx-2 dark:text-dark-tx-2">
{item.desc}
</blockquote>
</li>
))
}
</ul>
</ul>
</Page> </Page>