diff --git a/package-lock.json b/package-lock.json index 8af6ae1f..aa2ae0ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "20.7.1", + "version": "20.8.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "20.7.1", + "version": "20.8.0", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", diff --git a/package.json b/package.json index f5604b08..06b55bfb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coryd.dev", - "version": "20.7.1", - "description": "The source for my personal site. Built using 11ty.", + "version": "20.8.0", + "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "scripts": { "start": "eleventy --serve", diff --git a/src/_includes/partials/blocks/addon-links.liquid b/src/_includes/partials/blocks/addon-links.liquid new file mode 100644 index 00000000..56e33af6 --- /dev/null +++ b/src/_includes/partials/blocks/addon-links.liquid @@ -0,0 +1,8 @@ +
+ {%- if popularPosts.size > 0 -%} +
{% render "partials/blocks/popular-posts.liquid", popularPosts:popularPosts %}
+ {%- endif -%} + {%- if links.size > 0 -%} +
{% render "partials/blocks/recent-links.liquid", links:links %}
+ {%- endif -%} +
\ No newline at end of file diff --git a/src/_includes/partials/blocks/avatar.liquid b/src/_includes/partials/blocks/avatar.liquid new file mode 100644 index 00000000..e74146cc --- /dev/null +++ b/src/_includes/partials/blocks/avatar.liquid @@ -0,0 +1,22 @@ +
+
+ {{ alt }} +
+
\ No newline at end of file diff --git a/src/_includes/partials/widgets/badge-grid.liquid b/src/_includes/partials/blocks/badge-grid.liquid similarity index 100% rename from src/_includes/partials/widgets/badge-grid.liquid rename to src/_includes/partials/blocks/badge-grid.liquid diff --git a/src/_includes/partials/banners/error.liquid b/src/_includes/partials/blocks/banners/error.liquid similarity index 100% rename from src/_includes/partials/banners/error.liquid rename to src/_includes/partials/blocks/banners/error.liquid diff --git a/src/_includes/partials/banners/github.liquid b/src/_includes/partials/blocks/banners/github.liquid similarity index 100% rename from src/_includes/partials/banners/github.liquid rename to src/_includes/partials/blocks/banners/github.liquid diff --git a/src/_includes/partials/banners/npm.liquid b/src/_includes/partials/blocks/banners/npm.liquid similarity index 100% rename from src/_includes/partials/banners/npm.liquid rename to src/_includes/partials/blocks/banners/npm.liquid diff --git a/src/_includes/partials/banners/old-post.liquid b/src/_includes/partials/blocks/banners/old-post.liquid similarity index 100% rename from src/_includes/partials/banners/old-post.liquid rename to src/_includes/partials/blocks/banners/old-post.liquid diff --git a/src/_includes/partials/banners/rss.liquid b/src/_includes/partials/blocks/banners/rss.liquid similarity index 100% rename from src/_includes/partials/banners/rss.liquid rename to src/_includes/partials/blocks/banners/rss.liquid diff --git a/src/_includes/partials/banners/warning.liquid b/src/_includes/partials/blocks/banners/warning.liquid similarity index 100% rename from src/_includes/partials/banners/warning.liquid rename to src/_includes/partials/blocks/banners/warning.liquid diff --git a/src/_includes/partials/blocks/index.liquid b/src/_includes/partials/blocks/index.liquid index e14e9fc1..6185d2ca 100644 --- a/src/_includes/partials/blocks/index.liquid +++ b/src/_includes/partials/blocks/index.liquid @@ -1,12 +1,12 @@ {% for block in blocks %} {% if block.type == 'youtube_player' %} - {% render "partials/widgets/youtube-player.liquid", url:block.url %} + {% render "partials/blocks/youtube-player.liquid", url:block.url %} {% elsif block.type == 'github_banner' %} - {% render "partials/banners/github.liquid", url:block.url %} + {% render "partials/blocks/banners/github.liquid", url:block.url %} {% elsif block.type == 'npm_banner' %} - {% render "partials/banners/npm.liquid", url:block.url, command:block.command %} + {% render "partials/blocks/banners/npm.liquid", url:block.url, command:block.command %} {% elsif block.type == 'rss_banner' %} - {% render "partials/banners/rss.liquid", url:block.url, text:block.text %} + {% render "partials/blocks/banners/rss.liquid", url:block.url, text:block.text %} {% elsif block.type == 'hero' %} {% render "partials/blocks/hero.liquid", image:block.image.filename_disk, alt:block.alt_text %} {% elsif block.type == 'markdown' %} @@ -14,6 +14,6 @@ {% elsif block.type == 'divider' %} {{ block.markup | markdown }} {% elsif block.type == 'addon_links' %} - {% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} + {% render "partials/blocks/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} {% endif %} {% endfor %} \ No newline at end of file diff --git a/src/_includes/partials/widgets/now-playing.liquid b/src/_includes/partials/blocks/now-playing.liquid similarity index 100% rename from src/_includes/partials/widgets/now-playing.liquid rename to src/_includes/partials/blocks/now-playing.liquid diff --git a/src/_includes/partials/widgets/popular-posts.liquid b/src/_includes/partials/blocks/popular-posts.liquid similarity index 100% rename from src/_includes/partials/widgets/popular-posts.liquid rename to src/_includes/partials/blocks/popular-posts.liquid diff --git a/src/_includes/partials/widgets/recent-links.liquid b/src/_includes/partials/blocks/recent-links.liquid similarity index 100% rename from src/_includes/partials/widgets/recent-links.liquid rename to src/_includes/partials/blocks/recent-links.liquid diff --git a/src/_includes/partials/widgets/youtube-player.liquid b/src/_includes/partials/blocks/youtube-player.liquid similarity index 100% rename from src/_includes/partials/widgets/youtube-player.liquid rename to src/_includes/partials/blocks/youtube-player.liquid diff --git a/src/_includes/partials/home/status.liquid b/src/_includes/partials/home/status.liquid index e99a9d23..a81d5587 100644 --- a/src/_includes/partials/home/status.liquid +++ b/src/_includes/partials/home/status.liquid @@ -4,5 +4,5 @@

I'm a software developer based in Camarillo, California. I enjoy hanging out with my beautiful family and 3 rescue dogs, technology, automation, music, writing, reading, tv and movies. Lately I've been listening to a lot of {{ artist.title }}, reading {{ book.title }} and watching {{ show.name }}.

{{ status.emoji }} {{ status.content }}

- {% render "partials/widgets/now-playing.liquid" %} + {% render "partials/blocks/now-playing.liquid" %}
\ No newline at end of file diff --git a/src/_includes/partials/media/grid.liquid b/src/_includes/partials/media/grid.liquid index 401d2841..fd97b5d4 100644 --- a/src/_includes/partials/media/grid.liquid +++ b/src/_includes/partials/media/grid.liquid @@ -60,5 +60,5 @@ {% endfor %} {% unless hidePagination %} - {% render "partials/widgets/paginator.liquid", pagination:data %} + {% render "partials/nav/paginator.liquid", pagination:data %} {% endunless %} \ No newline at end of file diff --git a/src/_includes/partials/media/music/chart.liquid b/src/_includes/partials/media/music/chart.liquid index e6d8f45f..97de944a 100644 --- a/src/_includes/partials/media/music/chart.liquid +++ b/src/_includes/partials/media/music/chart.liquid @@ -29,5 +29,5 @@ {% unless count %} - {% render "partials/widgets/paginator.liquid", pagination:data %} + {% render "partials/nav/paginator.liquid", pagination:data %} {% endunless %} \ No newline at end of file diff --git a/src/_includes/partials/media/watching/grid.liquid b/src/_includes/partials/media/watching/grid.liquid index db39e879..837ba975 100644 --- a/src/_includes/partials/media/watching/grid.liquid +++ b/src/_includes/partials/media/watching/grid.liquid @@ -44,5 +44,5 @@ {% endfor %} {% unless hidePagination %} - {% render "partials/widgets/paginator.liquid", pagination:data %} + {% render "partials/nav/paginator.liquid", pagination:data %} {% endunless %} \ No newline at end of file diff --git a/src/_includes/partials/widgets/paginator.liquid b/src/_includes/partials/nav/paginator.liquid similarity index 100% rename from src/_includes/partials/widgets/paginator.liquid rename to src/_includes/partials/nav/paginator.liquid diff --git a/src/_includes/partials/widgets/addon-links.liquid b/src/_includes/partials/widgets/addon-links.liquid deleted file mode 100644 index e9100759..00000000 --- a/src/_includes/partials/widgets/addon-links.liquid +++ /dev/null @@ -1,8 +0,0 @@ -
- {%- if popularPosts.size > 0 -%} -
{% render "partials/widgets/popular-posts.liquid", popularPosts:popularPosts %}
- {%- endif -%} - {%- if links.size > 0 -%} -
{% render "partials/widgets/recent-links.liquid", links:links %}
- {%- endif -%} -
\ No newline at end of file diff --git a/src/_includes/webrings/css-joy.liquid b/src/_includes/webrings/css-joy.liquid index d74f5700..605dd02c 100644 --- a/src/_includes/webrings/css-joy.liquid +++ b/src/_includes/webrings/css-joy.liquid @@ -2,7 +2,7 @@

CSS JOY Webring

 -
+
{% tablericon "arrow-left" "Previous site" %} diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css index 6c5de90a..09fa358f 100644 --- a/src/assets/styles/base/index.css +++ b/src/assets/styles/base/index.css @@ -138,6 +138,13 @@ a { & svg { stroke: var(--accent-color); + + &[data-tablericon-name^="arrow-"]:hover, + &[data-tablericon-name^="arrow-"]:active, + &[data-tablericon-name^="arrow-"]:focus { + transform: rotate(0deg); + stroke: var(--accent-color-hover); + } } &.linked-header { @@ -161,6 +168,11 @@ a { } } +:is(a:hover, a:active, a:focus) svg[data-tablericon-name^="arrow-"] { + transform: rotate(0deg); + stroke: var(--accent-color-hover); +} + a:hover, a:focus, a:active, diff --git a/src/assets/styles/components/paginator.css b/src/assets/styles/components/paginator.css index 597d0889..c69b9789 100644 --- a/src/assets/styles/components/paginator.css +++ b/src/assets/styles/components/paginator.css @@ -9,22 +9,9 @@ & a { display: flex; - - & > svg { - stroke: var(--accent-color); - cursor: pointer; - } } - & :is(a:hover, a:active, a:focus) svg, - & a svg:hover, - & a svg:active, - & a svg:focus { - transform: rotate(0deg); - stroke: var(--accent-color-hover); - } - - & span.disabled svg { + & span.disabled svg[data-tablericon-name^="arrow-"] { cursor: not-allowed; stroke: color-mix(in srgb, var(--text-color), transparent 50%); stroke-width: var(--stroke-width-default); diff --git a/src/assets/styles/pages/webrings.css b/src/assets/styles/pages/webrings.css index a4708402..0082e152 100644 --- a/src/assets/styles/pages/webrings.css +++ b/src/assets/styles/pages/webrings.css @@ -1,7 +1,15 @@ .webring-wrapper { margin: var(--sizing-base) 0; - h3 { + & h3 { margin: var(--sizing-2xl) 0 var(--sizing-lg); } + + & .webring-navigation { + gap: var(--sizing-sm); + + & a { + display: flex; + } + } } \ No newline at end of file diff --git a/src/pages/main/about.md b/src/pages/main/about.md index a9cb32e9..eed06852 100644 --- a/src/pages/main/about.md +++ b/src/pages/main/about.md @@ -39,4 +39,4 @@ I tend to write about whatever strikes me, with a focus on development, technolo [You can also see what I'm doing now](/now), [take a look at the links I've shared recently](/links) or [check out the webrings I'm a member of](/webrings). -{% render "partials/widgets/badge-grid.liquid", badges: badges %} +{% render "partials/blocks/badge-grid.liquid", badges: badges %} diff --git a/src/pages/main/books/index.html b/src/pages/main/books/index.html index 6bbffdfc..f1273f60 100644 --- a/src/pages/main/books/index.html +++ b/src/pages/main/books/index.html @@ -11,7 +11,7 @@ schema: books

Currently reading

Here's what I'm reading at the moment. I've finished {{ currentBookCount }} books this year.

2024 / 2023 / 2022 / 2021 / 2020

-{% render "partials/banners/rss.liquid", url: "https://feedpress.me/coryd-books", text: "Subscribe to my books feed or follow along on this page" %} +{% render "partials/blocks/banners/rss.liquid", url: "https://feedpress.me/coryd-books", text: "Subscribe to my books feed or follow along on this page" %}
{% for book in bookData %} {% capture alt %}{{ book.title }} by {{ book.authors }}{% endcapture %} diff --git a/src/pages/main/links.html b/src/pages/main/links.html index be77c97b..3b1c01b8 100644 --- a/src/pages/main/links.html +++ b/src/pages/main/links.html @@ -9,7 +9,7 @@ permalink: "/links/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }} {% if pagination.pageNumber == 0 %}

Links

These are links I've liked or otherwise found interesting. They're all added manually, after having been read and, I suppose, properly considered. Authors are associated with domains using a simple key-value map.

-{% render "partials/banners/rss.liquid", url: "https://feedpress.me/coryd-links", text: "Subscribe to my links feed or follow along on this page" %} +{% render "partials/blocks/banners/rss.liquid", url: "https://feedpress.me/coryd-links", text: "Subscribe to my links feed or follow along on this page" %}
{% endif %}
@@ -22,4 +22,4 @@ permalink: "/links/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}
{% endfor %}
-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/nav/paginator.liquid", pagination:pagination %} \ No newline at end of file diff --git a/src/pages/main/music/index.html b/src/pages/main/music/index.html index e7d1ae6e..ba2f6231 100644 --- a/src/pages/main/music/index.html +++ b/src/pages/main/music/index.html @@ -13,7 +13,7 @@ schema: music-index

{{ title }}

I've listened to {{ music.week.artists.size }} artists, {{ music.week.albums.size }} albums and {{ music.week.totalTracks }} tracks this week. Most of that has been {{ music.week.genres | sortByPlaysDescending: "plays" | genreStrings: "genre" | mediaLinks: "genre", 5 }}.

See more of the artists, albums or tracks I've listened to this week. Or take a look at what I've listened to this month or over the last 3 months

-{% render "partials/widgets/now-playing.liquid" %} +{% render "partials/blocks/now-playing.liquid" %}

diff --git a/src/pages/main/posts/index.html b/src/pages/main/posts/index.html index 4ca2c86b..5e7f5ac1 100644 --- a/src/pages/main/posts/index.html +++ b/src/pages/main/posts/index.html @@ -25,4 +25,4 @@ permalink: "/posts/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }} {% endfor %}

-{% render "partials/widgets/paginator.liquid", pagination:pagination %} \ No newline at end of file +{% render "partials/nav/paginator.liquid", pagination:pagination %} \ No newline at end of file diff --git a/src/pages/main/posts/post.html b/src/pages/main/posts/post.html index 824599c7..44f709ad 100644 --- a/src/pages/main/posts/post.html +++ b/src/pages/main/posts/post.html @@ -18,7 +18,7 @@ schema: blog
- {% render "partials/banners/old-post.liquid", date:post.date %} + {% render "partials/blocks/banners/old-post.liquid", date:post.date %} {%- if post.image -%} -{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} \ No newline at end of file +{% render "partials/blocks/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} \ No newline at end of file diff --git a/src/pages/main/search.html b/src/pages/main/search.html index 1b838fe3..29e4834f 100644 --- a/src/pages/main/search.html +++ b/src/pages/main/search.html @@ -59,4 +59,4 @@ permalink: /search.html -{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} \ No newline at end of file +{% render "partials/blocks/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} \ No newline at end of file diff --git a/src/pages/main/watching/index.html b/src/pages/main/watching/index.html index e0c441e4..7f9eef6a 100644 --- a/src/pages/main/watching/index.html +++ b/src/pages/main/watching/index.html @@ -10,7 +10,7 @@ schema: watching

{{ title }}

{% render "partials/media/watching/hero.liquid" movie:featuredMovie %}

Here's all of the TV and movies I've been watching presented in what is (hopefully) an organized fashion.

-{% render "partials/banners/rss.liquid", url: "https://feedpress.me/coryd-movies", text: "Subscribe to my movies feed or follow along on this page" %} +{% render "partials/blocks/banners/rss.liquid", url: "https://feedpress.me/coryd-movies", text: "Subscribe to my movies feed or follow along on this page" %}

diff --git a/src/pages/main/watching/movie.html b/src/pages/main/watching/movie.html index 93264440..84a10ead 100644 --- a/src/pages/main/watching/movie.html +++ b/src/pages/main/watching/movie.html @@ -38,7 +38,7 @@ schema: movie

View on TMDB

{% if movie.review %} - {% render "partials/banners/warning.liquid", text: "There are probably spoilers after this banner — this is a warning about them." %} + {% render "partials/blocks/banners/warning.liquid", text: "There are probably spoilers after this banner — this is a warning about them." %} {{ movie.review | markdown }}
{% endif %}