From 9e42d91a07df23c90b2c27f9fe150d22dda4756a Mon Sep 17 00:00:00 2001 From: haetae Date: Thu, 27 Mar 2025 03:26:15 -0400 Subject: [PATCH] fix up blog + fic layouts --- public/pretty-feed-v3.xsl | 82 ------------------------------ src/assets/left-active.png | Bin 0 -> 254 bytes src/assets/left-hover.png | Bin 0 -> 252 bytes src/assets/left-normal.png | Bin 0 -> 252 bytes src/assets/right-active.png | Bin 0 -> 255 bytes src/assets/right-hover.png | Bin 0 -> 255 bytes src/assets/right-normal.png | Bin 0 -> 255 bytes src/layouts/Blog.astro | 15 +++--- src/layouts/Chapter.astro | 2 +- src/pages/blog/[...id].astro | 39 +++++++++++--- src/pages/blog/rss.xml.ts | 1 - src/pages/fics/[ficId]/rss.xml.ts | 1 - 12 files changed, 42 insertions(+), 98 deletions(-) delete mode 100644 public/pretty-feed-v3.xsl create mode 100644 src/assets/left-active.png create mode 100644 src/assets/left-hover.png create mode 100644 src/assets/left-normal.png create mode 100644 src/assets/right-active.png create mode 100644 src/assets/right-hover.png create mode 100644 src/assets/right-normal.png diff --git a/public/pretty-feed-v3.xsl b/public/pretty-feed-v3.xsl deleted file mode 100644 index b8f0063..0000000 --- a/public/pretty-feed-v3.xsl +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - <xsl:value-of select="/rss/channel/title"/> Web Feed - - - - - - -
-
-

- - - - - - - - - - - - - - - - - - - Web Feed Preview -

-

-

- - - - - Visit Website → - -
-

Recent Items

- -
-

- - - - - - -

- - Published: - -
- -
- - - - diff --git a/src/assets/left-active.png b/src/assets/left-active.png new file mode 100644 index 0000000000000000000000000000000000000000..6a2c79133a219712683ecb4ec481c6dfdbdea2bf GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Z!3HF4IP0bWDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5he4R}c>anMpx|Ur7sn6}@3&`aIS(iZv?p#}b4V*9Q8X-3 zbWH-QcEm%ih=W|_b$pJlGvfc}9^!s9xBte|lbbnZV)Sw&B$IM)Z+_-1Sla*q literal 0 HcmV?d00001 diff --git a/src/assets/left-hover.png b/src/assets/left-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..ebdc0365477d76edf90142e80d18fc0086b65b02 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Z!3HF4IP0bWDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5he4R}c>anMpx{JL7sn6}@3&WSc^ec2jumc-ILMW@u}O4= zL+fe~V%1vEf7>#C#-}3r)Zh6%&G+5Un4DQ@-rVYYx+_}d5ntq^5(kMEiEidcHuj2= z)1F!Wx!~?AFthM|O&BldCDyqU(_ZwMI9jrVI(zUsWeEf|Pmr4Oy8RxrlO6L(_dae_ rPNoM;oK1anMpx{JL7sn6}@3&X-c^ec2+7qn;4|0WVU=m%C zz^WDSP%EI3>&5xEbLwZzE09mEHa~XovtV-j$}edfHe^Ot_6FTkkYDjefK4;K(BYX! zc}M#trKR#!D>*kUzHK$HwoT$?Q=f-%iR-KdQcZTw9=uLj0zu6aq(WY|&tn!!Vtv#v tBd%h|^nk^%X`zWtS+Rxl-k%PsjO^KE9#fh2NC6$k;OXk;vd$@?2>{*2Q^)`S literal 0 HcmV?d00001 diff --git a/src/assets/right-active.png b/src/assets/right-active.png new file mode 100644 index 0000000000000000000000000000000000000000..3ee4c5ce435778ac72aaba57741abc165d31702a GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Z!3HF4IP0bWDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5he4R}c>anMpx_iw7sn6}@3$8MIS(iZG$d|bb4V*9QFP4) zuGI;w+7So2!ZsZ0E#_EmVN<%H-S>y%yC>BF4anMpx_iw7sn6}@3&V1c^ec28WJ}}9OOz{*d)5f zfmJJ@kt<{YQ`L^*_C<3ZJmb#!|Lon9>JN^L=~5{fzB;##wa;Tg?Cf literal 0 HcmV?d00001 diff --git a/src/assets/right-normal.png b/src/assets/right-normal.png new file mode 100644 index 0000000000000000000000000000000000000000..4166c4689d17bd75921f15fa52c440d743044155 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Z!3HF4IP0bWDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5he4R}c>anMpx_iw7sn6}@3&V1c^ec28WODo4|0VqU=m&9 zz^WC{$Q81HscJ`Y`=U7yo^|K^fA;Q4^@oFueG;i}a%c2<^Xsawv6Me2pi{%~hT&q_ z?)i>8o}|tFztAhk!$-?CearC+qSsiaZb*C4QR;X>Ti|Z}@7@ -
+
@@ -143,6 +143,7 @@ dayjs.extend(utc); --border-4: #88aabb; --border-5: #99bbcc; --border-6: #bbccdd; + color: #000; } h1 { font: bold 1rem var(--arial-font); } h2 { @@ -315,12 +316,15 @@ dayjs.extend(utc); .content { position: relative; + background-attachment: local; background-image: linear-gradient(to right, var(--bg-0) 5px, transparent 2px), linear-gradient(var(--bg-4) 2px, transparent 2px); background-size: 10px 1lh; - background-position-y: 1.9lh; - margin: 0 1rem 2rem; - padding: 2rem 1rem 0; + background-position-y: calc(2lh - 2px); + margin: 2rem 1rem; + padding: 0 1rem; line-height: 2; + max-height: 38em; + overflow-y: auto; margin-trim: block; p { margin-block: 1lh; } @@ -347,8 +351,7 @@ dayjs.extend(utc); display: grid; place-content: center; grid-area: 1 / 1 / -1; - padding-top: -2px; - padding-left: 2px; + padding: 0 4px 0 8px; height: 100%; border-top: 2px solid var(--border-1); border-right: 2px solid var(--border-4); diff --git a/src/layouts/Chapter.astro b/src/layouts/Chapter.astro index 534fcb6..594768b 100644 --- a/src/layouts/Chapter.astro +++ b/src/layouts/Chapter.astro @@ -7,7 +7,7 @@ interface Props { title: string; ficTitle: string; date: Date; - notes?: any; + notes?: string; lastModified?: Date; } diff --git a/src/pages/blog/[...id].astro b/src/pages/blog/[...id].astro index 417295f..f4f9988 100644 --- a/src/pages/blog/[...id].astro +++ b/src/pages/blog/[...id].astro @@ -2,6 +2,12 @@ import Blog from '@/layouts/Blog.astro'; import type { GetStaticPaths } from 'astro'; import { getCollection, render } from 'astro:content'; +import leftNormal from "@/assets/left-normal.png"; +import leftHover from "@/assets/left-hover.png"; +import leftActive from "@/assets/left-active.png"; +import rightNormal from "@/assets/right-normal.png"; +import rightHover from "@/assets/right-hover.png"; +import rightActive from "@/assets/right-active.png"; export const getStaticPaths = (async () => { const blog = await getCollection("blog"); @@ -26,39 +32,58 @@ const next = current === 0 ? undefined : blog[current - 1]; {(previous || next) && ( )} - \ No newline at end of file diff --git a/src/pages/blog/rss.xml.ts b/src/pages/blog/rss.xml.ts index d615448..8310208 100644 --- a/src/pages/blog/rss.xml.ts +++ b/src/pages/blog/rss.xml.ts @@ -18,6 +18,5 @@ export const GET: APIRoute = async (context) => { }), ...entry.data, })), - stylesheet: "/pretty-feed-v3.xsl", }); } \ No newline at end of file diff --git a/src/pages/fics/[ficId]/rss.xml.ts b/src/pages/fics/[ficId]/rss.xml.ts index cb0ac43..f3c4a05 100644 --- a/src/pages/fics/[ficId]/rss.xml.ts +++ b/src/pages/fics/[ficId]/rss.xml.ts @@ -27,7 +27,6 @@ export const GET: APIRoute = async (context) => { }), categories: fic?.data.series.concat(fic.data.title), })), - stylesheet: "/pretty-feed-v3.xsl", }); };