From 7a4505ab78a5bbc1ebfbfab8a10d6db0a9176eb8 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Fri, 15 Nov 2024 19:20:56 -0800
Subject: [PATCH] chore: feed nav + footer
---
package.json | 2 +-
src/assets/styles/base/index.css | 8 +++----
src/assets/styles/{feed.xsl => feed.liquid} | 26 ++++++++++-----------
src/assets/styles/index.css | 1 -
src/assets/styles/pages/feeds.css | 9 -------
src/feeds/rss/all.liquid | 2 +-
src/feeds/rss/books.liquid | 2 +-
src/feeds/rss/links.liquid | 2 +-
src/feeds/rss/movies.liquid | 2 +-
src/feeds/rss/posts.liquid | 2 +-
10 files changed, 23 insertions(+), 33 deletions(-)
rename src/assets/styles/{feed.xsl => feed.liquid} (84%)
delete mode 100644 src/assets/styles/pages/feeds.css
diff --git a/package.json b/package.json
index 9b67b08e..8a5fb131 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "coryd.dev",
- "version": "3.3.1",
+ "version": "3.3.2",
"description": "The source for my personal site. Built using 11ty (and other tools).",
"type": "module",
"engines": {
diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css
index 3dece15c..d5505bd2 100644
--- a/src/assets/styles/base/index.css
+++ b/src/assets/styles/base/index.css
@@ -254,6 +254,10 @@ h1 {
h2 {
font-size: var(--font-size-xl);
+
+ &.page-header {
+ margin-top: 0;
+ }
}
h3 {
@@ -421,10 +425,6 @@ td:first-of-type,
/* layout */
.default-wrapper {
padding-top: var(--spacing-2xl);
-
- h2.page-title {
- margin-top: 0;
- }
}
.main-wrapper {
diff --git a/src/assets/styles/feed.xsl b/src/assets/styles/feed.liquid
similarity index 84%
rename from src/assets/styles/feed.xsl
rename to src/assets/styles/feed.liquid
index 7b3c2946..9168d6b9 100644
--- a/src/assets/styles/feed.xsl
+++ b/src/assets/styles/feed.liquid
@@ -1,3 +1,6 @@
+---
+permalink: /assets/styles/feed.xsl
+---
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:atom="http://www.w3.org/2005/Atom">
@@ -16,14 +19,11 @@
<body class="feed">
<div class="main-wrapper">
<main>
- <section class="main-title">
- <h1>
- <a href="/feeds" tabindex="0">
- <xsl:value-of select="/rss/channel/title" />
- </a>
- </h1>
- </section>
+ {% render "header.liquid", globals:globals, page:page, nav:nav %}
<div class="default-wrapper">
+ <h2 class="page-header">
+ <xsl:value-of select="/rss/channel/title" />
+ </h2>
<article class="intro">
<p>
<xsl:value-of select="/rss/channel/description" />
@@ -62,12 +62,12 @@
</section>
</div>
</main>
- <footer>
- <p>Subscribe by adding <code>
- <xsl:value-of select="rss/channel/atom:link/@href" />
- </code> to your
- feed reader of choice.</p>
- </footer>
+ {% render "footer.liquid",
+ page:page,
+ nav:nav,
+ updated:updated,
+ pageUpdated:page.updated
+ %}
</div>
</body>
</html>
diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css
index d46e5fad..38205f91 100644
--- a/src/assets/styles/index.css
+++ b/src/assets/styles/index.css
@@ -17,7 +17,6 @@
@import url("./pages/about.css") layer(page);
@import url("./pages/books.css") layer(page);
@import url("./pages/contact.css") layer(page);
-@import url("./pages/feeds.css") layer(page);
@import url("./pages/links.css") layer(page);
@import url("./pages/media.css") layer(page);
@import url("./pages/music.css") layer(page);
diff --git a/src/assets/styles/pages/feeds.css b/src/assets/styles/pages/feeds.css
deleted file mode 100644
index 8fb9006b..00000000
--- a/src/assets/styles/pages/feeds.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.feed {
- .main-title h1 {
- white-space: normal;
- }
-
- footer {
- border-top: var(--border-gray);
- }
-}
diff --git a/src/feeds/rss/all.liquid b/src/feeds/rss/all.liquid
index 27ea7072..27368e81 100644
--- a/src/feeds/rss/all.liquid
+++ b/src/feeds/rss/all.liquid
@@ -5,7 +5,7 @@ permalink: "/feeds/all"
---
{% render "feeds/rss.liquid"
permalink:"/feeds/all"
- title:"All / Cory Dransfeldt"
+ title:"All activity"
globals:globals
data:activity
%}
\ No newline at end of file
diff --git a/src/feeds/rss/books.liquid b/src/feeds/rss/books.liquid
index 55fa5697..d4925ce3 100644
--- a/src/feeds/rss/books.liquid
+++ b/src/feeds/rss/books.liquid
@@ -5,7 +5,7 @@ permalink: "/feeds/books"
---
{% render "feeds/rss.liquid"
permalink:"/feeds/books"
- title:"Books / Cory Dransfeldt"
+ title:"Books feed"
globals:globals
data:books.feed
utm_campaign:"books_feed"
diff --git a/src/feeds/rss/links.liquid b/src/feeds/rss/links.liquid
index 2ee1eade..41b71237 100644
--- a/src/feeds/rss/links.liquid
+++ b/src/feeds/rss/links.liquid
@@ -5,7 +5,7 @@ permalink: "/feeds/links"
---
{% render "feeds/rss.liquid"
permalink:"/feeds/links"
- title:"Links / Cory Dransfeldt"
+ title:"Links feed"
globals:globals
data:links
%}
\ No newline at end of file
diff --git a/src/feeds/rss/movies.liquid b/src/feeds/rss/movies.liquid
index ba146bbf..e8258269 100644
--- a/src/feeds/rss/movies.liquid
+++ b/src/feeds/rss/movies.liquid
@@ -5,7 +5,7 @@ permalink: "/feeds/movies"
---
{% render "feeds/rss.liquid"
permalink:"/feeds/movies"
- title:"Movies / Cory Dransfeldt"
+ title:"Movies feed"
globals:globals
data:movies.feed
utm_campaign:"movies_feed"
diff --git a/src/feeds/rss/posts.liquid b/src/feeds/rss/posts.liquid
index 58fca119..fa2a05eb 100644
--- a/src/feeds/rss/posts.liquid
+++ b/src/feeds/rss/posts.liquid
@@ -5,7 +5,7 @@ permalink: "/feeds/posts"
---
{% render "feeds/rss.liquid"
permalink:"/feeds/posts"
- title:"Posts / Cory Dransfeldt"
+ title:"Posts feed"
globals:globals
data:posts
utm_campaign:"posts_feed"