From cc917e45c5eee62e7144f276268bd2e1ba0e8131 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <hi@coryd.dev>
Date: Thu, 3 Oct 2024 08:22:35 -0700
Subject: [PATCH] chore: cleanup

---
 package-lock.json                                | 12 ++++++------
 package.json                                     |  4 ++--
 src/assets/styles/base/index.css                 | 14 +++++++-------
 src/assets/styles/components/buttons.css         |  2 +-
 src/assets/styles/components/forms.css           |  4 ++++
 src/assets/styles/components/menu.css            |  4 ++++
 src/assets/styles/components/music-chart.css     |  4 ----
 src/assets/styles/defaults/vars.css              |  4 ++--
 src/includes/partials/media/music/chart.liquid   |  2 +-
 src/includes/partials/media/watching/hero.liquid |  2 --
 src/includes/partials/nav/link.liquid            |  2 +-
 src/includes/partials/nav/linked-icon.liquid     |  8 --------
 src/includes/partials/nav/paginator.liquid       | 10 ++--------
 src/includes/partials/nav/theme-toggle.liquid    |  2 +-
 src/pages/dynamic/blogroll.html                  |  8 ++++----
 src/pages/dynamic/books/book.html                |  4 ++--
 src/pages/dynamic/music/artists/artist.html      |  2 +-
 src/pages/dynamic/watching/movie.html            |  4 ++--
 src/pages/dynamic/watching/show.html             |  4 ++--
 19 files changed, 42 insertions(+), 54 deletions(-)
 delete mode 100644 src/includes/partials/nav/linked-icon.liquid

diff --git a/package-lock.json b/package-lock.json
index 08c96384..e9596aee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "1.0.4",
+      "version": "1.0.5",
       "license": "MIT",
       "dependencies": {
         "@cdransf/api-text": "^1.5.0",
@@ -39,7 +39,7 @@
         "postcss-import-ext-glob": "^2.1.1",
         "postcss-js": "^4.0.1",
         "rimraf": "^6.0.1",
-        "sanitize-html": "^2.13.0",
+        "sanitize-html": "^2.13.1",
         "slugify": "^1.6.6",
         "terser": "^5.34.1",
         "truncate-html": "^1.1.2"
@@ -4439,9 +4439,9 @@
       "license": "MIT"
     },
     "node_modules/sanitize-html": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.13.0.tgz",
-      "integrity": "sha512-Xff91Z+4Mz5QiNSLdLWwjgBDm5b1RU6xBT0+12rapjiaR7SwfRdjw8f+6Rir2MXKLrDicRFHdb51hGOAxmsUIA==",
+      "version": "2.13.1",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.13.1.tgz",
+      "integrity": "sha512-ZXtKq89oue4RP7abL9wp/9URJcqQNABB5GGJ2acW1sdO8JTVl92f4ygD7Yc9Ze09VAZhnt2zegeU0tbNsdcLYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index f093f542..6f1ebe49 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "scripts": {
@@ -52,7 +52,7 @@
     "postcss-import-ext-glob": "^2.1.1",
     "postcss-js": "^4.0.1",
     "rimraf": "^6.0.1",
-    "sanitize-html": "^2.13.0",
+    "sanitize-html": "^2.13.1",
     "slugify": "^1.6.6",
     "terser": "^5.34.1",
     "truncate-html": "^1.1.2"
diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css
index 0c3f7577..2d095fa1 100644
--- a/src/assets/styles/base/index.css
+++ b/src/assets/styles/base/index.css
@@ -18,27 +18,27 @@ body {
 }
 
 ::-moz-selection {
-  color: var(--color-lightest);
+  color: var(--text-color-inverted);
   background: var(--accent-color);
 }
 
 ::selection {
-  color: var(--color-lightest);
+  color: var(--text-color-inverted);
   background: var(--accent-color);
 }
 
 p {
   margin: var(--margin-vertical-base-horizontal-zero);
   overflow: visible;
+}
 
-  & a {
-    text-decoration: underline;
-    text-underline-offset: var(--spacing-xs);
-  }
+:is(p, ul, ol) a {
+  text-decoration: underline;
+  text-underline-offset: var(--spacing-xs);
 }
 
 .highlight-text {
-  color: var(--color-lightest);
+  color: var(--text-color-inverted);
   background-color: var(--accent-color);
   padding: var(--spacing-xs);
   border-radius: var(--border-radius-slight);
diff --git a/src/assets/styles/components/buttons.css b/src/assets/styles/components/buttons.css
index 5694f67a..c737d08c 100644
--- a/src/assets/styles/components/buttons.css
+++ b/src/assets/styles/components/buttons.css
@@ -19,7 +19,7 @@ button,
     font-weight: var(--font-weight-bold);
     line-height: var(--line-height-base);
     white-space: nowrap;
-    color: var(--color-lightest);
+    color: var(--text-color-inverted);
     background-color: var(--accent-color);
     appearance: none;
     transition-property: border;
diff --git a/src/assets/styles/components/forms.css b/src/assets/styles/components/forms.css
index 8d455b3b..190e777e 100644
--- a/src/assets/styles/components/forms.css
+++ b/src/assets/styles/components/forms.css
@@ -50,5 +50,9 @@ select {
 
   & li {
     margin: var(--spacing-sm) 0;
+
+    & a {
+      text-decoration: none;
+    }
   }
 }
\ No newline at end of file
diff --git a/src/assets/styles/components/menu.css b/src/assets/styles/components/menu.css
index 4de554e4..7060aeb1 100644
--- a/src/assets/styles/components/menu.css
+++ b/src/assets/styles/components/menu.css
@@ -15,6 +15,10 @@ menu {
       margin: 0;
       display: flex;
 
+      & a {
+        text-decoration: none;
+      }
+
       & .icon > svg,
       & .active > svg {
         display: block;
diff --git a/src/assets/styles/components/music-chart.css b/src/assets/styles/components/music-chart.css
index f310e786..cf5a572a 100644
--- a/src/assets/styles/components/music-chart.css
+++ b/src/assets/styles/components/music-chart.css
@@ -96,10 +96,6 @@
 
     & .title {
       font-weight: var(--font-weight-bold);
-
-      &.window {
-        margin-bottom: calc(var(--spacing-sm) * -1);
-      }
     }
 
     & .title,
diff --git a/src/assets/styles/defaults/vars.css b/src/assets/styles/defaults/vars.css
index 81183f31..7a9ad5d7 100644
--- a/src/assets/styles/defaults/vars.css
+++ b/src/assets/styles/defaults/vars.css
@@ -54,9 +54,9 @@
   --books-light: #1a7b1a;
   --collected-light: #9a501a;
   --concerts-light: #cb426e;
-  --country-light: #1a908d;
+  --country-light: #146a67;
   --error-light: #b81f1f;
-  --favorite-light: #cc5490;
+  --favorite-light: #b03c72;
   --link-light: #7b5cba;
   --music-light: #1565c3;
   --newsletter-light: #37b0b0;
diff --git a/src/includes/partials/media/music/chart.liquid b/src/includes/partials/media/music/chart.liquid
index 383df89b..6b62052c 100644
--- a/src/includes/partials/media/music/chart.liquid
+++ b/src/includes/partials/media/music/chart.liquid
@@ -7,7 +7,7 @@
       <li value="{{ item.rank }}">
         <div class="item">
           <div class="info">
-            <a class="title window" href="{{ item.url }}">{{ item.title }}</a>
+            <a class="title" href="{{ item.url }}">{{ item.title }}</a>
             {%- capture playsLabel -%}
               {%- if item.plays > 1 -%}
                 plays
diff --git a/src/includes/partials/media/watching/hero.liquid b/src/includes/partials/media/watching/hero.liquid
index d9473f10..af633d1e 100644
--- a/src/includes/partials/media/watching/hero.liquid
+++ b/src/includes/partials/media/watching/hero.liquid
@@ -1,4 +1,3 @@
-{%- capture alt -%}{{ movie.title | escape }} ({{ movie.year }}){%- endcapture -%}
 <a href="{{ movie.url }}">
   <div class="watching hero">
     <div class="meta-text">
@@ -22,7 +21,6 @@
         (max-width: 1000px) 1024px,
         2048px"
       src="https://cdn.coryd.dev{{ movie.backdrop }}?class=bannerlg"
-      alt="{{ alt }}"
       loading="eager"
       decoding="async"
       width="1080"
diff --git a/src/includes/partials/nav/link.liquid b/src/includes/partials/nav/link.liquid
index 09c79614..1fb3a435 100644
--- a/src/includes/partials/nav/link.liquid
+++ b/src/includes/partials/nav/link.liquid
@@ -9,7 +9,7 @@
     {%- endif -%}
   </span>
 {%- else -%}
-  <a class="{% if icon %}{{ icon | downcase }} icon {% endif %}{{ class }}" href="{{ categoryUrl }}" rel="me">
+  <a class="{% if icon %}{{ icon | downcase }} icon {% endif %}{{ class }}" href="{{ categoryUrl }}" rel="me" aria-label="{{ title }}">
     {%- if icon -%}
       {% tablericon icon %}
       <span>{{ title }}</span>
diff --git a/src/includes/partials/nav/linked-icon.liquid b/src/includes/partials/nav/linked-icon.liquid
deleted file mode 100644
index 481a3a32..00000000
--- a/src/includes/partials/nav/linked-icon.liquid
+++ /dev/null
@@ -1,8 +0,0 @@
-<a
-  class="{{ icon }}"
-  href="{{ url | downcase }}"
-  rel="me"
-  title="{{ title }}"
-  tabindex="0">
-  {% tablericon icon %}
-</a>
\ No newline at end of file
diff --git a/src/includes/partials/nav/paginator.liquid b/src/includes/partials/nav/paginator.liquid
index 261609ac..ce8e742c 100644
--- a/src/includes/partials/nav/paginator.liquid
+++ b/src/includes/partials/nav/paginator.liquid
@@ -5,10 +5,7 @@
       {% tablericon "arrow-left" %}
     </a>
   {%- else -%}
-    <span
-      class="disabled"
-      aria-label="Previous page (disabled)"
-      disabled>
+    <span class="disabled" disabled>
       {% tablericon "arrow-left" %}
     </span>
   {%- endif -%}
@@ -29,10 +26,7 @@
       {% tablericon "arrow-right" %}
     </a>
   {%- else -%}
-    <span
-      class="disabled"
-      aria-label="Next page (disabled)"
-      disabled>
+    <span class="disabled" disabled>
       {% tablericon "arrow-right" %}
     </span>
   {%- endif -%}
diff --git a/src/includes/partials/nav/theme-toggle.liquid b/src/includes/partials/nav/theme-toggle.liquid
index c779d64d..85b86200 100644
--- a/src/includes/partials/nav/theme-toggle.liquid
+++ b/src/includes/partials/nav/theme-toggle.liquid
@@ -1,7 +1,7 @@
 <script type="module" src="/assets/scripts/components/theme-toggle.js?v={% appVersion %}" crossorigin="anonymous"></script>
 <span class="client-side">
   <theme-toggle>
-    <button class="theme-toggle">
+    <button aria-label="Light and dark theme toggle" class="theme-toggle">
       <span class="light">
         {% tablericon "sun" %}
       </span>
diff --git a/src/pages/dynamic/blogroll.html b/src/pages/dynamic/blogroll.html
index e5fc7389..2fa26169 100644
--- a/src/pages/dynamic/blogroll.html
+++ b/src/pages/dynamic/blogroll.html
@@ -18,16 +18,16 @@ description: These are awesome blogs that I enjoy and you may enjoy too.
     <td><a href="{{ blog.url }}">{{ blog.url | replace: "https://", "" }}</a></td>
     <td class="blog-roll-icons">
       {%- if blog.rss_feed -%}
-      <a class="rss" href="{{ blog.rss_feed }}">{% tablericon "rss" %}</a>&nbsp;
+      <a class="rss" href="{{ blog.rss_feed }}" aria-label="RSS feed for {{ blog.name }}">{% tablericon "rss" %}</a>&nbsp;
       {%- endif -%}
       {%- if blog.json_feed -%}
-      <a class="json" href="{{ blog.json_feed }}">{% tablericon "json" %}</a>&nbsp;
+      <a class="json" href="{{ blog.json_feed }}" aria-label="JSON feed for {{ blog.name }}">{% tablericon "json" %}</a>&nbsp;
       {%- endif -%}
       {%- if blog.newsletter -%}
-      <a class="mail-plus" href="{{ blog.newsletter }}">{% tablericon "mail-plus" %}</a>&nbsp;
+      <a class="mail-plus" href="{{ blog.newsletter }}" aria-label="Subscribe to {{ blog.name }}'s newsletter">{% tablericon "mail-plus" %}</a>&nbsp;
       {%- endif -%}
       {%- if blog.mastodon -%}
-      <a class="brand-mastodon" href="{{ blog.mastodon }}">{% tablericon "brand-mastodon" %}</a>&nbsp;
+      <a class="brand-mastodon" href="{{ blog.mastodon }}" aria-label="Follow {{ blog.name }} on Mastodon">{% tablericon "brand-mastodon" %}</a>&nbsp;
       {%- endif -%}
     </td>
   </tr>
diff --git a/src/pages/dynamic/books/book.html b/src/pages/dynamic/books/book.html
index 40f7fadc..e7c8a43b 100644
--- a/src/pages/dynamic/books/book.html
+++ b/src/pages/dynamic/books/book.html
@@ -54,7 +54,7 @@ schema: book
   </div>
   {% if book.review %}
   {% render "partials/blocks/banners/warning.liquid", text: "There are probably spoilers after this banner — this is a warning about them." %}
-  <h3>My thoughts</h3>
+  <h2>My thoughts</h2>
   {{ book.review | markdown }}
   <hr />
   {% endif %}
@@ -65,7 +65,7 @@ schema: book
   {% render "partials/blocks/associated-media.liquid", shows:book.shows %}
   {% render "partials/blocks/associated-media.liquid", genres:book.genres %}
   {% if book.description %}
-    <h3>Overview</h3>
+    <h2>Overview</h2>
     {{ book.description | markdown }}
   {% endif %}
 </article>
\ 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 64383652..63a399f9 100644
--- a/src/pages/dynamic/music/artists/artist.html
+++ b/src/pages/dynamic/music/artists/artist.html
@@ -63,7 +63,7 @@ schema: artist
   {% render "partials/blocks/associated-media.liquid", movies:artist.movies %}
   {% render "partials/blocks/associated-media.liquid", shows:artist.shows %}
   {%- if artist.description -%}
-  <h3>Overview</h3>
+  <h2>Overview</h2>
   <div data-toggle-content class="text-toggle-hidden">{{ artist.description | markdown }}</div>
   <button data-toggle-button>Show more</button>
   {%- endif -%}
diff --git a/src/pages/dynamic/watching/movie.html b/src/pages/dynamic/watching/movie.html
index d3cbfb92..50d2c24a 100644
--- a/src/pages/dynamic/watching/movie.html
+++ b/src/pages/dynamic/watching/movie.html
@@ -52,7 +52,7 @@ schema: movie
   </div>
   {% if movie.review %}
   {% render "partials/blocks/banners/warning.liquid", text: "There are probably spoilers after this banner — this is a warning about them." %}
-  <h3>My thoughts</h3>
+  <h2>My thoughts</h2>
   {{ movie.review | markdown }}
   <hr />
   {% endif %}
@@ -63,7 +63,7 @@ schema: movie
   {% render "partials/blocks/associated-media.liquid", books:movie.books %}
   {% render "partials/blocks/associated-media.liquid", genres:movie.genres %}
   {% if movie.description %}
-    <h3>Overview</h3>
+    <h2>Overview</h2>
     {{ movie.description | markdown }}
   {% endif %}
 </article>
\ No newline at end of file
diff --git a/src/pages/dynamic/watching/show.html b/src/pages/dynamic/watching/show.html
index 91de4afb..64f9359b 100644
--- a/src/pages/dynamic/watching/show.html
+++ b/src/pages/dynamic/watching/show.html
@@ -54,7 +54,7 @@ schema: show
   </div>
   {% if show.review %}
   {% render "partials/blocks/banners/warning.liquid", text: "There are probably spoilers after this banner — this is a warning about them." %}
-  <h3>My thoughts</h3>
+  <h2>My thoughts</h2>
   {{ show.review | markdown }}
   <hr />
   {% endif %}
@@ -64,7 +64,7 @@ schema: show
   {% render "partials/blocks/associated-media.liquid", movies:show.movies %}
   {% render "partials/blocks/associated-media.liquid", books:show.books %}
   {% if show.description %}
-    <h3>Overview</h3>
+    <h2>Overview</h2>
     {{ show.description | markdown }}
   {% endif %}
 </article>
\ No newline at end of file