diff --git a/package-lock.json b/package-lock.json index 99242410..2808f619 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "2.1.3", + "version": "2.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "2.1.3", + "version": "2.2.0", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.6.0", @@ -756,9 +756,9 @@ } }, "node_modules/acorn": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz", - "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true, "license": "MIT", "bin": { diff --git a/package.json b/package.json index c8981123..d72efff3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "2.1.3", + "version": "2.2.0", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "engines": { diff --git a/queries/views/media/books.psql b/queries/views/media/books.psql index 456361fc..cb396a34 100644 --- a/queries/views/media/books.psql +++ b/queries/views/media/books.psql @@ -71,7 +71,7 @@ WHERE LEFT JOIN books rb ON rbk.related_books_id = rb.id WHERE rbk.books_id = b.id) AS related_books, -json_build_object('title', CONCAT(b.title, ' by ', b.author), 'image', CONCAT('/', df.filename_disk), 'url', b.slug, 'alt', CONCAT(b.title, ' by ', b.author), 'subtext', CASE WHEN b.star_rating IS NOT NULL THEN +json_build_object('title', CONCAT(b.title, ' by ', b.author), 'image', CONCAT('/', df.filename_disk), 'url', b.slug, 'alt', CONCAT('Book cover from ', b.title, ' by ', b.author), 'subtext', CASE WHEN b.star_rating IS NOT NULL THEN b.star_rating ELSE NULL diff --git a/queries/views/media/movies.psql b/queries/views/media/movies.psql index b7ce4df5..372f03b7 100644 --- a/queries/views/media/movies.psql +++ b/queries/views/media/movies.psql @@ -14,7 +14,7 @@ SELECT m.slug AS url, CONCAT('/', df.filename_disk) AS image, CONCAT('/', df2.filename_disk) AS backdrop, - json_build_object('title', m.title, 'url', m.slug, 'image', CONCAT('/', df.filename_disk), 'backdrop', CONCAT('/', df2.filename_disk), 'alt', CONCAT(m.title, ' (', m.year, ')'), 'subtext', CASE WHEN m.star_rating IS NOT NULL THEN + json_build_object('title', m.title, 'url', m.slug, 'image', CONCAT('/', df.filename_disk), 'backdrop', CONCAT('/', df2.filename_disk), 'alt', CONCAT('Poster from ', m.title, ' (', m.year, ')'), 'subtext', CASE WHEN m.star_rating IS NOT NULL THEN CONCAT(m.star_rating, ' (', m.year, ')') ELSE CONCAT('(', m.year, ')') diff --git a/queries/views/media/shows.psql b/queries/views/media/shows.psql index 401763e1..b71c550a 100644 --- a/queries/views/media/shows.psql +++ b/queries/views/media/shows.psql @@ -11,7 +11,7 @@ SELECT s.slug AS url, CONCAT('/', df_art.filename_disk) AS image, CONCAT('/', df_backdrop.filename_disk) AS backdrop, - json_build_object('title', s.title, 'image', CONCAT('/', df_art.filename_disk), 'backdrop', CONCAT('/', df_backdrop.filename_disk), 'url', s.slug, 'alt', CONCAT(s.title, ' (', s.year, ')'), 'subtext', COALESCE(( + json_build_object('title', s.title, 'image', CONCAT('/', df_art.filename_disk), 'backdrop', CONCAT('/', df_backdrop.filename_disk), 'url', s.slug, 'alt', CONCAT('Poster from ', s.title, ' (', s.year, ')'), 'subtext', COALESCE(( SELECT CASE WHEN e1.last_watched_at >= NOW() - INTERVAL '90 days' THEN CONCAT('S', e1.season_number, 'E', e1.episode_number) diff --git a/src/assets/styles/defaults/vars.css b/src/assets/styles/defaults/vars.css index 728a65cb..7d905511 100644 --- a/src/assets/styles/defaults/vars.css +++ b/src/assets/styles/defaults/vars.css @@ -7,7 +7,7 @@ --blue-500: #2553e6; --blue-600: #1e42c7; - --gray-100: #f6f7f8; + --gray-100: #f9fafb; --gray-200: #eceef1; --gray-300: #dfe3e8; --gray-400: #959eae; @@ -15,10 +15,7 @@ --gray-600: #626d7f; --gray-700: #545e71; --gray-800: #4a5365; - --gray-900: #1a1d22; - - --white: #fff; - --black: #000; + --gray-900: #14161a; --gray-lighter: light-dark(var(--gray-200), var(--gray-700)); --gray-light: light-dark(var(--gray-300), var(--gray-600)); @@ -26,8 +23,8 @@ --gray-dark: light-dark(var(--gray-800), var(--gray-300)); /* base theme */ - --color-lightest: var(--white); - --color-darkest: var(--black); + --color-lightest: var(--gray-100); + --color-darkest: var(--gray-900); --text-color: light-dark(var(--color-darkest), var(--color-lightest)); --background-color: light-dark(var(--color-lightest), var(--color-darkest)); --text-color-inverted: light-dark( @@ -155,7 +152,7 @@ --inline-margin-bottom: -5px; /* shadows */ - --box-shadow-media: inset 0 -85px 60px -40px var(--black); + --box-shadow-media: inset 0 -85px 60px -40px var(--gray-900); --box-shadow-text-toggle: inset 0 -120px 60px -60px var(--background-color); --text-shadow-default: rgba(0, 0, 0, 0.7) 0px 0px 10px; diff --git a/src/includes/nav/link.liquid b/src/includes/nav/link.liquid index 812ba8d5..91455721 100644 --- a/src/includes/nav/link.liquid +++ b/src/includes/nav/link.liquid @@ -1,7 +1,10 @@ {%- assign categoryUrl = link.permalink | downcase -%} {%- assign isHttp = categoryUrl contains "http" -%} {%- if categoryUrl | isLinkActive: page.url -%} - + {%- if link.icon -%} {% tablericon link.icon %} {{ link.title }} @@ -14,6 +17,7 @@ class="{% if link.icon %}{{ link.icon | downcase }} icon {% endif %}{{ link.class }}" href="{{ categoryUrl }}" {% if isHttp -%} rel="me" {%- endif %} + title="{{ link.title }}" aria-label="{{ link.title }}" > {%- if link.icon -%}