diff --git a/package-lock.json b/package-lock.json index 914e757b..85d05499 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "21.4.1", + "version": "21.4.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "21.4.1", + "version": "21.4.2", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", diff --git a/package.json b/package.json index 6e408498..b71a17ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "21.4.1", + "version": "21.4.2", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "scripts": { diff --git a/src/includes/main.liquid b/src/includes/main.liquid index cd4b4e55..ae4f62be 100644 --- a/src/includes/main.liquid +++ b/src/includes/main.liquid @@ -2,11 +2,11 @@ layout: base --- {%- capture updateTime -%} - {% if updated == "now" %} + {%- if updated == "now" -%} {{ 'now' | date: "%B %-d, %l:%M %P", "America/Los_Angeles" }} - {% elsif page.updated %} + {%- elsif page.updated -%} {{ page.updated | date: "%B %-d, %l:%M %P", "America/Los_Angeles" }} - {% endif %} + {%- endif -%} {%- endcapture -%}
{{ content }}
diff --git a/src/includes/partials/blocks/badge-grid.liquid b/src/includes/partials/blocks/badge-grid.liquid index d00db057..748875c0 100644 --- a/src/includes/partials/blocks/badge-grid.liquid +++ b/src/includes/partials/blocks/badge-grid.liquid @@ -1,5 +1,5 @@
- {% for badge in badges limit: 8 %} + {%- for badge in badges limit: 8 -%} - {% endfor %} + {%- endfor -%}
\ No newline at end of file diff --git a/src/includes/partials/blocks/banners/old-post.liquid b/src/includes/partials/blocks/banners/old-post.liquid index bcb9ece2..072593cc 100644 --- a/src/includes/partials/blocks/banners/old-post.liquid +++ b/src/includes/partials/blocks/banners/old-post.liquid @@ -1,6 +1,6 @@ -{% assign isOldPost = date | oldPost %} -{% if isOldPost %} +{%- assign isOldPost = date | oldPost -%} +{%- if isOldPost -%} -{% endif %} \ No newline at end of file +{%- endif -%} \ No newline at end of file diff --git a/src/includes/partials/blocks/index.liquid b/src/includes/partials/blocks/index.liquid index 6185d2ca..86c2d557 100644 --- a/src/includes/partials/blocks/index.liquid +++ b/src/includes/partials/blocks/index.liquid @@ -1,19 +1,19 @@ -{% for block in blocks %} - {% if block.type == 'youtube_player' %} +{%- for block in blocks -%} + {%- if block.type == 'youtube_player' -%} {% render "partials/blocks/youtube-player.liquid", url:block.url %} - {% elsif block.type == 'github_banner' %} + {%- elsif block.type == 'github_banner' -%} {% render "partials/blocks/banners/github.liquid", url:block.url %} - {% elsif block.type == 'npm_banner' %} + {%- elsif block.type == 'npm_banner' -%} {% render "partials/blocks/banners/npm.liquid", url:block.url, command:block.command %} - {% elsif block.type == 'rss_banner' %} + {%- elsif block.type == 'rss_banner' -%} {% render "partials/blocks/banners/rss.liquid", url:block.url, text:block.text %} - {% elsif block.type == 'hero' %} + {%- elsif block.type == 'hero' -%} {% render "partials/blocks/hero.liquid", image:block.image.filename_disk, alt:block.alt_text %} - {% elsif block.type == 'markdown' %} + {%- elsif block.type == 'markdown' -%} {{ block.text | markdown }} - {% elsif block.type == 'divider' %} + {%- elsif block.type == 'divider' -%} {{ block.markup | markdown }} - {% elsif block.type == 'addon_links' %} + {%- elsif block.type == 'addon_links' -%} {% render "partials/blocks/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} - {% endif %} -{% endfor %} \ No newline at end of file + {%- endif -%} +{%- endfor -%} \ No newline at end of file diff --git a/src/includes/partials/blocks/modal.liquid b/src/includes/partials/blocks/modal.liquid index 4199f8bd..c16a9911 100644 --- a/src/includes/partials/blocks/modal.liquid +++ b/src/includes/partials/blocks/modal.liquid @@ -1,13 +1,13 @@ -{% capture js %} +{%- capture js -%} {% render "../../../assets/scripts/modal.js" %} -{% endcapture %} +{%- endcapture -%} {%- capture labelContent -%} - {% if icon %} + {%- if icon -%} {% tablericon icon label %} - {% elsif label %} + {%- elsif label -%} {{ label }} - {% endif %} + {%- endif -%} {%- endcapture -%} {% assign modalId = id | default: "modal-controls" %} diff --git a/src/includes/partials/blocks/popular-posts.liquid b/src/includes/partials/blocks/popular-posts.liquid index 94c385fa..bb79aea6 100644 --- a/src/includes/partials/blocks/popular-posts.liquid +++ b/src/includes/partials/blocks/popular-posts.liquid @@ -1,15 +1,15 @@ -{% if popularPosts.size > 0 %} +{%- if popularPosts.size > 0 -%}

{% tablericon "flame" "Popular" %} Popular posts

-{% endif %} \ No newline at end of file +{%- endif -%} \ No newline at end of file diff --git a/src/includes/partials/blocks/recent-links.liquid b/src/includes/partials/blocks/recent-links.liquid index f3018075..8bc3b76d 100644 --- a/src/includes/partials/blocks/recent-links.liquid +++ b/src/includes/partials/blocks/recent-links.liquid @@ -1,16 +1,16 @@ -{% if links.size > 0 %} +{%- if links.size > 0 -%} -{% endif %} +{%- endif -%} diff --git a/src/includes/partials/feeds/rss.liquid b/src/includes/partials/feeds/rss.liquid index 522a126c..ee6a2f76 100644 --- a/src/includes/partials/feeds/rss.liquid +++ b/src/includes/partials/feeds/rss.liquid @@ -15,7 +15,7 @@ 144 {% for entry in entries limit: 20 -%} - {% assign rating = entry.rating %} + {%- assign rating = entry.rating -%} {%- capture entryTitle -%} {{ entry.title | escape }} {%- if entry.authors %} via {{ entry.authors.name }}{%- endif -%} diff --git a/src/includes/partials/footer.liquid b/src/includes/partials/footer.liquid index bdd0834e..89e52b40 100644 --- a/src/includes/partials/footer.liquid +++ b/src/includes/partials/footer.liquid @@ -1,16 +1,16 @@ - {% if updated %} + {%- if updated -%}

This page was last updated on {{ updated | strip }}.

- {% endif %} + {%- endif -%} \ No newline at end of file diff --git a/src/includes/partials/header.liquid b/src/includes/partials/header.liquid index a7f7d89f..e75c7343 100644 --- a/src/includes/partials/header.liquid +++ b/src/includes/partials/header.liquid @@ -1,10 +1,10 @@

- {% if page.url != '/' %} + {%- if page.url != '/' -%} {{ globals.site_name }} - {% else %} + {%- else -%} {{ globals.site_name }} - {% endif %} + {%- endif -%}

{% render "partials/nav/menu.liquid", page:page, nav:nav %}
\ No newline at end of file diff --git a/src/includes/partials/home/posts.liquid b/src/includes/partials/home/posts.liquid index 8b336f7f..daff141f 100644 --- a/src/includes/partials/home/posts.liquid +++ b/src/includes/partials/home/posts.liquid @@ -6,7 +6,7 @@ {{ title }}
- {% for post in posts %} + {%- for post in posts -%}
{% tablericon "calendar-month" "Date" %} @@ -21,8 +21,8 @@ {{ post.description | markdown | truncate: 300 }}
- {% endfor %} - {% if postType != 'featured' %} + {%- endfor -%} + {%- if postType != 'featured' -%} View all posts {% tablericon "arrow-right" "View all posts" %} - {% endif %} + {%- endif -%} \ No newline at end of file diff --git a/src/includes/partials/media/grid.liquid b/src/includes/partials/media/grid.liquid index fd97b5d4..cf5dc58a 100644 --- a/src/includes/partials/media/grid.liquid +++ b/src/includes/partials/media/grid.liquid @@ -1,22 +1,23 @@ -{% assign hidePagination = count or data.pages.size <= 1 %} -{% assign media = data.items | default: data | normalizeMedia %} -
- {% for item in media limit: count | default: media.size %} - {% assign alt = item.alt | strip | escape %} +{%- assign hidePagination = count or data.pages.size <= 1 -%} +{%- assign media = data.items | default: data | normalizeMedia -%} +
+ {%- for item in media limit: count | default: media.size -%} + {%- capture alt -%}{{ item.title | escape }} ({{ item.year }}){% endcapture %} + {%- assign alt = item.alt | strip | escape -%}
- {% if item.title %} + {%- if item.title -%}
{{ item.title }}
- {% endif %} - {% if item.plays %} + {%- endif -%} + {%- if item.plays -%}
{{ item.plays }} plays
- {% elsif item.subtext %} + {%- elsif item.subtext -%}
{{ item.subtext }}
- {% endif %} + {%- endif -%}
- {% assign loadingStrategy = loading | default: 'lazy' %} - {% if shape == 'square' %} + {%- assign loadingStrategy = loading | default: 'lazy' -%} + {%- if shape == 'square' -%} - {% else %} + {%- else -%} - {% endif %} + {%- endif -%}
- {% endfor %} + {%- endfor -%}
-{% unless hidePagination %} +{%- unless hidePagination -%} {% render "partials/nav/paginator.liquid", pagination:data %} -{% endunless %} \ No newline at end of file +{%- 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 97de944a..d942781b 100644 --- a/src/includes/partials/media/music/chart.liquid +++ b/src/includes/partials/media/music/chart.liquid @@ -1,7 +1,7 @@
- {% assign items = data.items | default: data %} + {%- assign items = data.items | default: data -%}
    - {% for item in items limit: count | default: items.size %} + {%- for item in items limit: count | default: items.size -%} {%- assign playTotal = playTotal | default: mostPlayed -%} {%- assign percentage = item.plays | calculatePlayPercentage: playTotal -%}
  1. @@ -11,13 +11,13 @@
    {{ item.title }}
    - {% capture playsLabel %} - {% if item.plays > 1 %} + {%- capture playsLabel -%} + {%- if item.plays > 1 -%} plays - {% else %} + {%- else -%} play - {% endif %} - {% endcapture %} + {%- endif -%} + {%- endcapture -%}
    {{ item.artist }}
    {{ item.plays }} {{ playsLabel }}
@@ -25,9 +25,9 @@ {% render "partials/media/progress-bar.liquid", percentage:percentage %}
- {% endfor %} + {%- endfor -%} -{% unless count %} +{%- unless count -%} {% render "partials/nav/paginator.liquid", pagination:data %} -{% endunless %} \ No newline at end of file +{%- endunless -%} \ No newline at end of file diff --git a/src/includes/partials/media/music/recent.liquid b/src/includes/partials/media/music/recent.liquid index 993e32da..3099f8b4 100644 --- a/src/includes/partials/media/music/recent.liquid +++ b/src/includes/partials/media/music/recent.liquid @@ -1,6 +1,6 @@
- {% for item in data limit: 10 %} - {% capture alt %}{{ item.title | escape }} by {{ item.artist }}{% endcapture %} + {%- for item in data limit: 10 -%} + {%- capture alt -%}{{ item.title | escape }} by {{ item.artist }}{%- endcapture -%}
- {% endfor %} + {%- endfor -%}
\ No newline at end of file diff --git a/src/includes/partials/media/progress-bar.liquid b/src/includes/partials/media/progress-bar.liquid index 02a9c8a3..476b107f 100644 --- a/src/includes/partials/media/progress-bar.liquid +++ b/src/includes/partials/media/progress-bar.liquid @@ -1,5 +1,5 @@ -{% if percentage %} +{%- if percentage -%}
-{% endif %} \ No newline at end of file +{%- endif -%} \ 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 673ab399..5af817a9 100644 --- a/src/includes/partials/media/watching/grid.liquid +++ b/src/includes/partials/media/watching/grid.liquid @@ -1,27 +1,25 @@ -{% assign hidePagination = count or data.pages.size <= 1 %} +{%- assign hidePagination = count or data.pages.size <= 1 -%}
- {% assign items = data.items | default: mediaItems %} - {% for item in items limit: count %} - {% capture alt %}{{ item.title | escape }} ({{ item.year }}){% endcapture %} + {%- assign items = data.items | default: mediaItems -%} + {%- for item in items limit: count -%} + {%- capture alt -%}{{ item.title | escape }} ({{ item.year }}){% endcapture %}
- {% if item.type == 'movie' %} + {%- if item.type == 'movie' -%}
{{ item.title }}
{{ item.year }} - {% if item.rating %} + {%- if item.rating -%} ({{ item.rating }}) - {% endif %} + {%- endif -%}
- {% else %} + {%- else -%}
{{ item.name }}
{{ item.year }}
- {% endif %} + {%- endif -%}
- {%- capture loadingStrategy -%} - {%- if loading -%}{{ loading }}{%- else -%}lazy{%- endif -%} - {%- endcapture -%} + {%- assign loadingStrategy = loading | default: 'lazy' -%}
diff --git a/src/includes/partials/nav/link.liquid b/src/includes/partials/nav/link.liquid index 261984f6..01084186 100644 --- a/src/includes/partials/nav/link.liquid +++ b/src/includes/partials/nav/link.liquid @@ -1,20 +1,20 @@ {%- assign categoryUrl = url | downcase -%} -{% if categoryUrl | isLinkActive: page.url %} +{%- if categoryUrl | isLinkActive: page.url -%} - {% if icon %} + {%- if icon -%} {% tablericon icon title %} {{ title }} - {% else %} + {%- else -%} {{ title }} - {% endif %} + {%- endif -%} -{% else %} +{%- else -%} - {% if icon %} + {%- if icon -%} {% tablericon icon title %} {{ title }} - {% else %} + {%- else -%} {{ title }} - {% endif %} + {%- endif -%} -{% endif %} \ No newline at end of file +{%- endif -%} \ No newline at end of file diff --git a/src/includes/partials/nav/menu.liquid b/src/includes/partials/nav/menu.liquid index 15adfb4b..b6e354ad 100644 --- a/src/includes/partials/nav/menu.liquid +++ b/src/includes/partials/nav/menu.liquid @@ -1,6 +1,6 @@ -{% capture js %} +{%- capture js -%} {% render "../../../assets/scripts/menu.js" %} -{% endcapture %} +{%- endcapture -%}
@@ -9,9 +9,9 @@ {% render "partials/nav/theme-toggle.liquid" %}
\ No newline at end of file diff --git a/src/includes/partials/nav/paginator.liquid b/src/includes/partials/nav/paginator.liquid index cd9fbbac..e02dcb6f 100644 --- a/src/includes/partials/nav/paginator.liquid +++ b/src/includes/partials/nav/paginator.liquid @@ -1,22 +1,22 @@ \ No newline at end of file diff --git a/src/pages/dynamic/music/artists/artist.html b/src/pages/dynamic/music/artists/artist.html index e5a64b1c..2dcd4c6f 100644 --- a/src/pages/dynamic/music/artists/artist.html +++ b/src/pages/dynamic/music/artists/artist.html @@ -11,9 +11,9 @@ schema: artist {%- capture alt -%} {{ artist.name }} / {{ artist.country }} {%- endcapture -%} -{% capture js %} +{%- capture js -%} {% render "../../../../assets/scripts/text-toggle.js" %} -{% endcapture %} +{%- endcapture -%} {% tablericon "arrow-left" "Go back to the music index page" %} Back to music diff --git a/src/pages/dynamic/music/genre.html b/src/pages/dynamic/music/genre.html index 666bddbb..d2950e33 100644 --- a/src/pages/dynamic/music/genre.html +++ b/src/pages/dynamic/music/genre.html @@ -16,9 +16,9 @@ schema: genre is {% endif %} {%- endcapture -%} -{% capture js %} +{%- capture js -%} {% render "../../../assets/scripts/text-toggle.js" %} -{% endcapture %} +{%- endcapture -%} {% tablericon "arrow-left" "Go back to the music index page" %} Back to music diff --git a/src/pages/dynamic/music/index.html b/src/pages/dynamic/music/index.html index daf8e1ca..05cda682 100644 --- a/src/pages/dynamic/music/index.html +++ b/src/pages/dynamic/music/index.html @@ -6,9 +6,9 @@ permalink: "/music/index.html" updated: "now" schema: music-index --- -{% capture js %} +{%- capture js -%} {% render "../../../assets/scripts/media-toggles.js" %} -{% endcapture %} +{%- endcapture -%}

{{ 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 }}.