diff --git a/package-lock.json b/package-lock.json index 4f674e29..8a3c1c45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "1.8.3", + "version": "1.8.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "1.8.3", + "version": "1.8.4", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.5.0", diff --git a/package.json b/package.json index b0a778b9..11b0161d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "1.8.3", + "version": "1.8.4", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "engines": { diff --git a/src/assets/styles/components/paginator.css b/src/assets/styles/components/paginator.css index 487b7928..c4418d2b 100644 --- a/src/assets/styles/components/paginator.css +++ b/src/assets/styles/components/paginator.css @@ -18,7 +18,7 @@ margin: 0; } -.pagination span.disabled svg[data-tablericon-name^="arrow-"] { +.pagination a.disabled svg[data-tablericon-name^="arrow-"] { cursor: not-allowed; stroke: var(--gray-medium); stroke-width: var(--stroke-width-default); diff --git a/src/includes/base.liquid b/src/includes/base.liquid index 8f69ca9e..78c70c62 100644 --- a/src/includes/base.liquid +++ b/src/includes/base.liquid @@ -1,11 +1,9 @@ -{%- capture updateTime -%} - {%- if updated == "now" -%} - {{ 'now' | date: "%B %-d, %l:%M %P", "America/Los_Angeles" }} - {%- elsif page.updated -%} - {{ page.updated | date: "%B %-d, %l:%M %P", "America/Los_Angeles" }} - {%- endif -%} -{%- endcapture -%} - +{%- assign updateTime = "" -%} +{%- if updated == "now" -%} + {%- assign updateTime = 'now' | date: "%B %-d, %l:%M %P", "America/Los_Angeles" -%} +{%- elsif page.updated -%} + {%- assign updateTime = page.updated | date: "%B %-d, %l:%M %P", "America/Los_Angeles" -%} +{%- endif -%} diff --git a/src/includes/partials/blocks/associated-media.liquid b/src/includes/partials/blocks/associated-media.liquid index 24ea252d..91ecfbe0 100644 --- a/src/includes/partials/blocks/associated-media.liquid +++ b/src/includes/partials/blocks/associated-media.liquid @@ -1,5 +1,4 @@ {% assign media = artists | concat: books | concat: genres | concat: movies | concat: posts | concat: shows %} - {% if media.size > 0 %}
{% assign sections = @@ -10,14 +9,12 @@ "posts:article:article:Related post(s)," | append: "shows:device-tv-old:tv:Related show(s)" | split: "," %} - {% for section in sections %} {% assign parts = section | split: ":" %} {% assign key = parts[0] %} {% assign icon = parts[1] %} {% assign css_class = parts[2] %} {% assign label = parts[3] %} - {% case key %} {% when "artists" %} {% assign items = artists %} {% when "books" %} {% assign items = books %} @@ -26,7 +23,6 @@ {% when "posts" %} {% assign items = posts %} {% when "shows" %} {% assign items = shows %} {% endcase %} - {% if items and items.size > 0 %}

{% tablericon icon %} diff --git a/src/includes/partials/header.liquid b/src/includes/partials/header.liquid index 32399376..2bce00bb 100644 --- a/src/includes/partials/header.liquid +++ b/src/includes/partials/header.liquid @@ -1,9 +1,9 @@

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

{% render "partials/nav/menu.liquid", page:page, nav:nav %} diff --git a/src/includes/partials/metadata.liquid b/src/includes/partials/metadata.liquid index fbbba4ae..92d50a91 100644 --- a/src/includes/partials/metadata.liquid +++ b/src/includes/partials/metadata.liquid @@ -1,16 +1,17 @@ {%- assign fullUrl = globals.url | append: page.url -%} -{%- assign pageTitle = globals.site_name -%} -{%- assign pageDescription = globals.site_description -%} +{%- assign pageTitle = title | default: globals.site_name -%} +{%- assign pageDescription = page.description | default: description | default: globals.site_description -%} {%- assign ogImage = globals.cdn_url | append: globals.avatar -%} {%- case schema -%} {%- when 'blog' -%} {%- assign pageTitle = post.title -%} {%- assign pageDescription = post.description | markdown | strip_html | default: globals.site_description -%} - {%- when 'books' or 'books-year' -%} + {%- when 'books', 'books-year' -%} {%- assign featuredBook = books.all | filterBooksByStatus: 'started' | reverse | first -%} {%- assign ogImage = globals.cdn_url | append: featuredBook.grid.image -%} - {%- when 'books-year' -%} - {%- assign pageTitle = year.value | append: ' / Books / ' | append: globals.site_name -%} + {%- if schema == 'books-year' -%} + {%- assign pageTitle = year.value | append: ' / Books / ' | append: globals.site_name -%} + {%- endif -%} {%- when 'music' -%} {%- assign ogImage = globals.cdn_url | append: page.image -%} {%- when 'music-index' -%} @@ -20,28 +21,14 @@ {%- assign pageTitle = 'Music / ' | append: page.title | append: ' / ' | append: globals.site_name -%} {%- when 'page' -%} {%- assign pageTitle = page.title | append: ' / ' | append: globals.site_name -%} - {%- when 'watching' or 'favorite-movies' -%} + {%- when 'watching', 'favorite-movies' -%} {%- assign featuredMovie = movies.recentlyWatched | first -%} {%- assign ogImage = globals.cdn_url | append: featuredMovie.grid.backdrop -%} - {%- when 'watching-shows' or 'favorite-shows' -%} + {%- when 'watching-shows', 'favorite-shows' -%} {%- assign featuredShow = tv.recentlyWatched | first -%} {%- assign ogImage = globals.cdn_url | append: featuredShow.grid.backdrop -%} - {%- else -%} - {%- assign pageTitle = globals.site_name -%} {%- endcase -%} - -{% if title %} - {%- assign pageTitle = title | append: ' / ' | append: globals.site_name -%} -{% endif %} - -{%- if page.description -%} - {%- assign pageDescription = page.description -%} -{%- elsif description -%} - {%- assign pageDescription = description -%} -{%- endif -%} - {%- assign escapedPageDescription = pageDescription | escape -%} - {{ pageTitle }} diff --git a/src/includes/partials/nav/paginator.liquid b/src/includes/partials/nav/paginator.liquid index ce8e742c..a6f9d57c 100644 --- a/src/includes/partials/nav/paginator.liquid +++ b/src/includes/partials/nav/paginator.liquid @@ -1,33 +1,36 @@ \ No newline at end of file