From 9f8a6cde5ff4728b2e3e832c4f7370c9f67994db Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Wed, 12 Jun 2024 13:26:52 -0700 Subject: [PATCH] chore: style, data, type fixes --- package-lock.json | 18 +++++----- package.json | 4 +-- src/_data/albumReleases.js | 3 +- src/_includes/base.liquid | 2 +- src/_includes/partials/home/posts.liquid | 2 +- src/assets/styles/base/index.css | 44 ++++++++++++++---------- src/assets/styles/defaults/vars.css | 27 ++++----------- src/assets/styles/pages/media.css | 16 ++++----- 8 files changed, 55 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index a67951aa..47855d37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "19.1.0", + "version": "19.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "19.1.0", + "version": "19.2.0", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", @@ -16,7 +16,7 @@ "youtube-video-element": "^1.1.5" }, "devDependencies": { - "@11ty/eleventy": "3.0.0-alpha.12", + "@11ty/eleventy": "3.0.0-alpha.13", "@11ty/eleventy-fetch": "^4.0.1", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@11tyrocks/eleventy-plugin-lightningcss": "^1.4.0", @@ -68,9 +68,9 @@ } }, "node_modules/@11ty/eleventy": { - "version": "3.0.0-alpha.12", - "resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-3.0.0-alpha.12.tgz", - "integrity": "sha512-dtBcjyAeUDKzYgrJ6/wTqZIUXCgEWGjlBhRT/5jX8GJ4yTkDxtmTzCbkaWOwvmqpYB5+OuZdnee9wAmm1pRDsQ==", + "version": "3.0.0-alpha.13", + "resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-3.0.0-alpha.13.tgz", + "integrity": "sha512-LZ1mI2JoB/vu6eIzeh9Eim0istAmKiJ0C5LEYG8HigvGgVsADd7OGHpOeOpDgKjotPSO+DTVh48gQj/cW2mRNw==", "dev": true, "license": "MIT", "dependencies": { @@ -1146,9 +1146,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.798", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.798.tgz", - "integrity": "sha512-by9J2CiM9KPGj9qfp5U4FcPSbXJG7FNzqnYaY4WLzX+v2PHieVGmnsA4dxfpGE3QEC7JofpPZmn7Vn1B9NR2+Q==", + "version": "1.4.799", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.799.tgz", + "integrity": "sha512-3D3DwWkRTzrdEpntY0hMLYwj7SeBk1138CkPE8sBDSj3WzrzOiG2rHm3luw8jucpf+WiyLBCZyU9lMHyQI9M9Q==", "dev": true, "license": "ISC" }, diff --git a/package.json b/package.json index f2593e88..69d87d0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "19.1.0", + "version": "19.2.0", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { @@ -26,7 +26,7 @@ "youtube-video-element": "^1.1.5" }, "devDependencies": { - "@11ty/eleventy": "3.0.0-alpha.12", + "@11ty/eleventy": "3.0.0-alpha.13", "@11ty/eleventy-fetch": "^4.0.1", "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", "@11tyrocks/eleventy-plugin-lightningcss": "^1.4.0", diff --git a/src/_data/albumReleases.js b/src/_data/albumReleases.js index 373a1a64..f3e92df5 100644 --- a/src/_data/albumReleases.js +++ b/src/_data/albumReleases.js @@ -16,6 +16,7 @@ export default async function () { image, release_date, release_link, + total_plays, artists (name_string, mbid, country) `) .gt('release_date', today) @@ -25,7 +26,7 @@ export default async function () { return } - return data.map(album => { + return data.filter(album => !album['total_plays'] || !album['total_plays'] > 0).map(album => { return { artist: album['artists']['name_string'], title: album['name'], diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 07799831..2013c09e 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -72,7 +72,7 @@ - + {{ pageTitle }} diff --git a/src/_includes/partials/home/posts.liquid b/src/_includes/partials/home/posts.liquid index a84d0c8f..a443a7d2 100644 --- a/src/_includes/partials/home/posts.liquid +++ b/src/_includes/partials/home/posts.liquid @@ -19,7 +19,7 @@ - {{ post.description | truncate: 300 }} + {{ post.description | markdown | truncate: 300 }} {% endfor %} {% if postType != 'featured' %} diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css index 95ac1a55..442cd1a4 100644 --- a/src/assets/styles/base/index.css +++ b/src/assets/styles/base/index.css @@ -1,18 +1,25 @@ - -body, -html { +html +body { color: var(--text-color); font-family: var(--font-mono); - font-size: var(--font-size-base); letter-spacing: -.05rem; word-spacing: -.125rem; - line-height: var(--line-height-base); background: var(--background-color); accent-color: var(--accent-color); scrollbar-width: thin; scrollbar-color: var(--accent-color) var(--gray-light); } +html { + font-size: 100%; + -webkit-text-size-adjust: none; +} + +body { + font-size: var(--font-size-base); + line-height: 2; +} + ::-moz-selection { color: var(--color-lightest); background: var(--selection-color); @@ -150,15 +157,16 @@ a:active, /* headers */ h1, h2, h3, h4, h5, h6 { font-weight: var(--font-weight-bold); + line-height: 1.5; margin: var(--sizing-base) 0; } -h1 { font-size: var(--font-size-xl) } -h2 { font-size: var(--font-size-lg) } -h3 { font-size: var(--font-size-base) } -h4 { font-size: var(--font-size-md) } -h5 { font-size: var(--font-size-sm) } -h6 { font-size: var(--font-size-xs) } +h1 { font-size: var(--font-size-3xl) } +h2 { font-size: var(--font-size-2xl) } +h3 { font-size: var(--font-size-xl) } +h4 { font-size: var(--font-size-base) } +h5 { font-size: var(--font-size-md) } +h6 { font-size: var(--font-size-sm) } .section-header-wrapper { display: flex; @@ -266,12 +274,10 @@ th { justify-content: space-between; & h1 { - line-height: 1.25; - margin: 0; - padding-bottom: 0; font-size: var(--font-size-2xl); font-weight: var(--font-weight-extrabold); - line-height: var(--line-height-2xl); + margin: 0; + padding: 0; & a { text-decoration: none; @@ -419,7 +425,6 @@ footer { &.sub-pages { font-size: var(--font-size-sm); - line-height: var(--line-height-sm); padding-bottom: var(--sizing-3xl); & span:not(.active) { @@ -437,7 +442,6 @@ footer { /* articles */ article { & h2 { - line-height: var(--line-height-lg); margin: 0 0 var(--sizing-lg); transition-property: color; } @@ -454,7 +458,6 @@ article { & time { color: var(--gray-dark); font-size: var(--font-size-sm); - line-height: var(--line-height-sm); margin-right: var(--sizing-xs); } @@ -578,7 +581,6 @@ li { .text-small { font-size: var(--font-size-sm) !important; - line-height: var(--line-height-sm) !important; } .flex-centered { @@ -615,6 +617,10 @@ li { max-width: 768px; } + .main-title h1 { + font-size: var(--font-size-3xl); + } + .section-header-wrapper { flex-direction: row; } diff --git a/src/assets/styles/defaults/vars.css b/src/assets/styles/defaults/vars.css index 7b2f2679..5c0d9d31 100644 --- a/src/assets/styles/defaults/vars.css +++ b/src/assets/styles/defaults/vars.css @@ -69,26 +69,13 @@ --font-mono: MonoLisa, Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, ui-monospace, monospace; /* text */ - --font-size-xs: .725rem; - --line-height-xs: 1.45rem; - - --font-size-sm: .825rem; - --line-height-sm: 1.65rem; - - --font-size-base: .95rem; - --line-height-base: 1.9rem; - - --font-size-lg: 1.125rem; - --line-height-lg: 2.25rem; - - --font-size-xl: 1.25rem; - --line-height-xl: 2.5rem; - - --font-size-2xl: 1.5rem; - --line-height-2xl: 3rem; - - --font-size-3xl: 1.7rem; - --line-height-3xl: 3.4rem; + --font-size-xs: .7rem; + --font-size-sm: .85rem; + --font-size-base: 1rem; + --font-size-lg: 1.15rem; + --font-size-xl: 1.3rem; + --font-size-2xl: 1.45rem; + --font-size-3xl: 1.6rem; --font-weight-base: 400; --font-weight-bold: 600; diff --git a/src/assets/styles/pages/media.css b/src/assets/styles/pages/media.css index 34f1bb17..61444396 100644 --- a/src/assets/styles/pages/media.css +++ b/src/assets/styles/pages/media.css @@ -34,12 +34,12 @@ } &.sub-meta { - font-size: var(--font-size-xs); - line-height: var(--line-height-xs); + font-size: var(--font-size-sm); + line-height: var(--line-height-sm); svg { - width: 16px; - height: 16px; + width: 18px; + height: 18px; margin-right: var(--sizing-xs); } } @@ -146,13 +146,13 @@ & .subheader, & .rating { color: var(--color-lightest); - font-size: var(--font-size-xs); + font-size: var(--font-size-sm); line-height: 1.5; text-shadow: rgba(0, 0, 0, 0.7) 0px 0px 10px; } & .rating { - font-size: calc(var(--font-size-xs) * .75); + font-size: calc(var(--font-size-sm) * .75); } & .header { @@ -195,8 +195,8 @@ } &.sub-meta { - font-size: var(--font-size-xs); - line-height: var(--line-height-xs); + font-size: var(--font-size-sm); + line-height: var(--line-height-sm); } } }