From c61fd69f66a217e832585da2dd938605e7a3803d Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Mon, 25 Dec 2023 19:04:42 -0500 Subject: [PATCH 01/30] Initial enwound setup --- .eleventy.js | 5 + .node-version | 1 + package-lock.json | 869 ++++++++++++++++++++++++++++++- package.json | 10 +- src/_includes/content.macros.njk | 25 + src/_includes/rime.njk | 14 + src/_includes/util.macros.njk | 10 + src/enwound2023.njk | 22 + src/plugins/utils.js | 10 + src/scss/rime.scss | 37 ++ src/scss/vendor/_remedy.scss | 1 + 11 files changed, 996 insertions(+), 8 deletions(-) create mode 100644 .node-version create mode 100644 src/_includes/content.macros.njk create mode 100644 src/_includes/rime.njk create mode 100644 src/_includes/util.macros.njk create mode 100644 src/enwound2023.njk create mode 100644 src/plugins/utils.js create mode 100644 src/scss/rime.scss create mode 100644 src/scss/vendor/_remedy.scss diff --git a/.eleventy.js b/.eleventy.js index c538979..49aec41 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,6 +1,8 @@ const { minify } = require('terser'); const CleanCSS = require("clean-css"); +const configUtils = require('./src/plugins/utils'); + module.exports = function(eleventyConfig) { // Set custom directories for input, output, includes, and data eleventyConfig.addNunjucksAsyncFilter("jsmin", async function ( code, @@ -19,6 +21,9 @@ module.exports = function(eleventyConfig) { // Set custom directories for input return new CleanCSS({}).minify(code).styles; }); + // plugins + eleventyConfig.addPlugin(configUtils); + // separate projects included fully eleventyConfig.addPassthroughCopy("src/darken"); eleventyConfig.addPassthroughCopy("src/offsetCipher"); diff --git a/.node-version b/.node-version new file mode 100644 index 0000000..d5a1596 --- /dev/null +++ b/.node-version @@ -0,0 +1 @@ +20.10.0 diff --git a/package-lock.json b/package-lock.json index 62377b4..f1fc47a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,9 @@ "devDependencies": { "@11ty/eleventy": "^2.0.1", "clean-css": "^5.3.0", + "cssremedy": "^0.1.0-beta.2", + "npm-run-all2": "^6.1.1", + "sass": "^1.69.5", "terser": "^5.12.1" } }, @@ -153,15 +156,184 @@ "url": "https://opencollective.com/11ty" } }, + "node_modules/@babel/code-frame": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.23.4", + "chalk": "^2.4.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/code-frame/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/code-frame/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", - "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/highlight": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/parser": { "version": "7.17.8", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz", @@ -333,6 +505,12 @@ "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", "dev": true }, + "node_modules/@types/normalize-package-data": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "dev": true + }, "node_modules/a-sync-waterfall": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz", @@ -672,6 +850,12 @@ "node": ">= 8" } }, + "node_modules/cssremedy": { + "version": "0.1.0-beta.2", + "resolved": "https://registry.npmjs.org/cssremedy/-/cssremedy-0.1.0-beta.2.tgz", + "integrity": "sha512-6mpPQzoUQHY7fiAxWCQDgPz73j5ugz2LqU62BLohUsxYurYLdTHQc+ilPm4i52wU2SxzPTrcRMIdniE2zGfjOA==", + "dev": true + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -834,6 +1018,15 @@ "errno": "cli.js" } }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -1144,6 +1337,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/hosted-git-info": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz", + "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==", + "dev": true, + "dependencies": { + "lru-cache": "^10.0.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, "node_modules/htmlparser2": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", @@ -1172,6 +1377,12 @@ "node": ">= 0.10" } }, + "node_modules/immutable": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz", + "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==", + "dev": true + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -1212,6 +1423,12 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -1362,6 +1579,12 @@ "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds=", "dev": true }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, "node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", @@ -1375,6 +1598,15 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/json-parse-even-better-errors": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz", + "integrity": "sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/jstransformer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", @@ -1412,6 +1644,15 @@ "node": ">=6" } }, + "node_modules/lines-and-columns": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", + "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, "node_modules/linkify-it": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", @@ -1462,6 +1703,15 @@ "integrity": "sha1-3bG7s+8HRYwBd7oH3hRCLLAz/5s=", "dev": true }, + "node_modules/lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "dev": true, + "engines": { + "node": "14 || >=16.14" + } + }, "node_modules/luxon": { "version": "3.4.4", "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", @@ -1544,6 +1794,15 @@ "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", "dev": true }, + "node_modules/memorystream": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", + "integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==", + "dev": true, + "engines": { + "node": ">= 0.10.0" + } + }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -1675,6 +1934,21 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "node_modules/normalize-package-data": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz", + "integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==", + "dev": true, + "dependencies": { + "hosted-git-info": "^7.0.0", + "is-core-module": "^2.8.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -1684,6 +1958,67 @@ "node": ">=0.10.0" } }, + "node_modules/npm-run-all2": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/npm-run-all2/-/npm-run-all2-6.1.1.tgz", + "integrity": "sha512-lWLbkPZ5BSdXtN8lR+0rc8caKoPdymycpZksyDEC9MOBvfdwTXZ0uVhb7bMcGeXv2/BKtfQuo6Zn3zfc8rxNXA==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.2.1", + "cross-spawn": "^7.0.3", + "memorystream": "^0.3.1", + "minimatch": "^9.0.0", + "pidtree": "^0.6.0", + "read-pkg": "^8.0.0", + "shell-quote": "^1.7.3" + }, + "bin": { + "npm-run-all": "bin/npm-run-all/index.js", + "npm-run-all2": "bin/npm-run-all/index.js", + "run-p": "bin/run-p/index.js", + "run-s": "bin/run-s/index.js" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0", + "npm": ">= 8" + } + }, + "node_modules/npm-run-all2/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/npm-run-all2/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/npm-run-all2/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/nunjucks": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz", @@ -1739,6 +2074,37 @@ "wrappy": "1" } }, + "node_modules/parse-json": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz", + "integrity": "sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.21.4", + "error-ex": "^1.3.2", + "json-parse-even-better-errors": "^3.0.0", + "lines-and-columns": "^2.0.3", + "type-fest": "^3.8.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse-json/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "dev": true, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/parse-srcset": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", @@ -1796,6 +2162,18 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pidtree": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", + "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", + "dev": true, + "bin": { + "pidtree": "bin/pidtree.js" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -2034,6 +2412,24 @@ } ] }, + "node_modules/read-pkg": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz", + "integrity": "sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==", + "dev": true, + "dependencies": { + "@types/normalize-package-data": "^2.4.1", + "normalize-package-data": "^6.0.0", + "parse-json": "^7.0.0", + "type-fest": "^4.2.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -2125,6 +2521,23 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/sass": { + "version": "1.69.5", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz", + "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==", + "dev": true, + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/section-matter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", @@ -2190,6 +2603,15 @@ "node": ">=8" } }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/slash": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", @@ -2217,6 +2639,15 @@ "node": ">=0.10.0" } }, + "node_modules/source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-support": { "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", @@ -2227,6 +2658,38 @@ "source-map": "^0.6.0" } }, + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "dev": true, + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", + "dev": true + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", + "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", + "dev": true + }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -2349,6 +2812,18 @@ "integrity": "sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=", "dev": true }, + "node_modules/type-fest": { + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.8.3.tgz", + "integrity": "sha512-//BaTm14Q/gHBn09xlnKNqfI8t6bmdzx2DXYfPBNofN0WUybCEUDcbCWcTa0oF09lzLjZgPphXAsvRiMK0V6Bw==", + "dev": true, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/uc.micro": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", @@ -2377,6 +2852,16 @@ "node": ">= 0.8" } }, + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, "node_modules/void-elements": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", @@ -2551,12 +3036,149 @@ "integrity": "sha512-Mqt6im1xpb1Ykn3nbcCovWXK3ggywRJa+IXIdoz4wIIK+cvozADH63lexcuPpGS/gJ6/m2JxyyXDyupkMr5DHw==", "dev": true }, + "@babel/code-frame": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", + "dev": true, + "requires": { + "@babel/highlight": "^7.23.4", + "chalk": "^2.4.2" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "@babel/helper-validator-identifier": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", - "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true }, + "@babel/highlight": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "@babel/parser": { "version": "7.17.8", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz", @@ -2688,6 +3310,12 @@ "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", "dev": true }, + "@types/normalize-package-data": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "dev": true + }, "a-sync-waterfall": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz", @@ -2947,6 +3575,12 @@ "which": "^2.0.1" } }, + "cssremedy": { + "version": "0.1.0-beta.2", + "resolved": "https://registry.npmjs.org/cssremedy/-/cssremedy-0.1.0-beta.2.tgz", + "integrity": "sha512-6mpPQzoUQHY7fiAxWCQDgPz73j5ugz2LqU62BLohUsxYurYLdTHQc+ilPm4i52wU2SxzPTrcRMIdniE2zGfjOA==", + "dev": true + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -3055,6 +3689,15 @@ "prr": "~1.0.1" } }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -3293,6 +3936,15 @@ "has-symbols": "^1.0.2" } }, + "hosted-git-info": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.1.tgz", + "integrity": "sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==", + "dev": true, + "requires": { + "lru-cache": "^10.0.1" + } + }, "htmlparser2": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz", @@ -3311,6 +3963,12 @@ "integrity": "sha512-TScO04soylRN9i/QdOdgZyhydXg9z6XdaGzEyOgDKycePeDeTT4KvigjBcI+tgfTlieLWauGORMq5F1eIDa+1w==", "dev": true }, + "immutable": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz", + "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==", + "dev": true + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -3343,6 +4001,12 @@ "is-decimal": "^1.0.0" } }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -3456,6 +4120,12 @@ "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds=", "dev": true }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, "js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", @@ -3466,6 +4136,12 @@ "esprima": "^4.0.0" } }, + "json-parse-even-better-errors": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz", + "integrity": "sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==", + "dev": true + }, "jstransformer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", @@ -3494,6 +4170,12 @@ "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", "dev": true }, + "lines-and-columns": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", + "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", + "dev": true + }, "linkify-it": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", @@ -3532,6 +4214,12 @@ "integrity": "sha1-3bG7s+8HRYwBd7oH3hRCLLAz/5s=", "dev": true }, + "lru-cache": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.1.0.tgz", + "integrity": "sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==", + "dev": true + }, "luxon": { "version": "3.4.4", "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", @@ -3600,6 +4288,12 @@ "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", "dev": true }, + "memorystream": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", + "integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==", + "dev": true + }, "merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -3698,12 +4392,65 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, + "normalize-package-data": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.0.tgz", + "integrity": "sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==", + "dev": true, + "requires": { + "hosted-git-info": "^7.0.0", + "is-core-module": "^2.8.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" + } + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, + "npm-run-all2": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/npm-run-all2/-/npm-run-all2-6.1.1.tgz", + "integrity": "sha512-lWLbkPZ5BSdXtN8lR+0rc8caKoPdymycpZksyDEC9MOBvfdwTXZ0uVhb7bMcGeXv2/BKtfQuo6Zn3zfc8rxNXA==", + "dev": true, + "requires": { + "ansi-styles": "^6.2.1", + "cross-spawn": "^7.0.3", + "memorystream": "^0.3.1", + "minimatch": "^9.0.0", + "pidtree": "^0.6.0", + "read-pkg": "^8.0.0", + "shell-quote": "^1.7.3" + }, + "dependencies": { + "ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + } + } + }, "nunjucks": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz", @@ -3739,6 +4486,27 @@ "wrappy": "1" } }, + "parse-json": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz", + "integrity": "sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.21.4", + "error-ex": "^1.3.2", + "json-parse-even-better-errors": "^3.0.0", + "lines-and-columns": "^2.0.3", + "type-fest": "^3.8.0" + }, + "dependencies": { + "type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "dev": true + } + } + }, "parse-srcset": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", @@ -3781,6 +4549,12 @@ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, + "pidtree": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", + "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", + "dev": true + }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -3990,6 +4764,18 @@ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, + "read-pkg": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-8.1.0.tgz", + "integrity": "sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==", + "dev": true, + "requires": { + "@types/normalize-package-data": "^2.4.1", + "normalize-package-data": "^6.0.0", + "parse-json": "^7.0.0", + "type-fest": "^4.2.0" + } + }, "readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -4051,6 +4837,17 @@ "queue-microtask": "^1.2.2" } }, + "sass": { + "version": "1.69.5", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz", + "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==", + "dev": true, + "requires": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + } + }, "section-matter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", @@ -4100,6 +4897,12 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true + }, "slash": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", @@ -4118,6 +4921,12 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, + "source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "dev": true + }, "source-map-support": { "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", @@ -4128,6 +4937,38 @@ "source-map": "^0.6.0" } }, + "spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", + "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", + "dev": true + }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -4216,6 +5057,12 @@ "integrity": "sha1-zCAOqyYT9BZtJ/+a/HylbUnfbrQ=", "dev": true }, + "type-fest": { + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.8.3.tgz", + "integrity": "sha512-//BaTm14Q/gHBn09xlnKNqfI8t6bmdzx2DXYfPBNofN0WUybCEUDcbCWcTa0oF09lzLjZgPphXAsvRiMK0V6Bw==", + "dev": true + }, "uc.micro": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", @@ -4235,6 +5082,16 @@ "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, "void-elements": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", diff --git a/package.json b/package.json index e93e21b..78802b6 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,11 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "cc": "node b.js", - "start": "npx @11ty/eleventy --serve", - "build": "npx @11ty/eleventy" + "eleventy:serve": "npx @11ty/eleventy --serve", + "eleventy": "npx @11ty/eleventy", + "sass": "sass src/scss:docs/css", + "watch:sass": "sass --watch src/scss:docs/css", + "serve": "npm-run-all -p sass eleventy:serve watch:*" }, "repository": { "type": "git", @@ -22,6 +25,9 @@ "devDependencies": { "@11ty/eleventy": "^2.0.1", "clean-css": "^5.3.0", + "cssremedy": "^0.1.0-beta.2", + "npm-run-all2": "^6.1.1", + "sass": "^1.69.5", "terser": "^5.12.1" }, "dependencies": { diff --git a/src/_includes/content.macros.njk b/src/_includes/content.macros.njk new file mode 100644 index 0000000..bcd303b --- /dev/null +++ b/src/_includes/content.macros.njk @@ -0,0 +1,25 @@ +{% import "util.macros.njk" as util %} + +{% macro iframe( + src, + title, + width=none, + height=none, + span=none +) %} + {%- set width = width or 560 -%} + {%- set height = height or 315 -%} + {%- set style = { + '--ratio': [width, height] | join('/'), + '--span': span + } | styles -%} + {%- set attrs = { + 'src': src, + 'title': title, + 'height': height, + 'width': width, + 'frameborder': '0', + 'style': style + } -%} + +{% endmacro %} diff --git a/src/_includes/rime.njk b/src/_includes/rime.njk new file mode 100644 index 0000000..bc7ea40 --- /dev/null +++ b/src/_includes/rime.njk @@ -0,0 +1,14 @@ + + + + + + {{ title }} + + + +
+ {% block main %}{{ content | safe }}{% endblock %} +
+ + diff --git a/src/_includes/util.macros.njk b/src/_includes/util.macros.njk new file mode 100644 index 0000000..2ddbd85 --- /dev/null +++ b/src/_includes/util.macros.njk @@ -0,0 +1,10 @@ +{# Attributes #} +{% macro attr_if(name, value=none) %} + {%- if value -%} + {{ name }}="{{ value | string }}" + {%- endif -%} +{% endmacro %} + +{% macro as_attrs(attrs) %} + {%- for name, value in attrs %} {{ attr_if(name, value) }}{%- endfor -%} +{% endmacro %} diff --git a/src/enwound2023.njk b/src/enwound2023.njk new file mode 100644 index 0000000..bc4fbbc --- /dev/null +++ b/src/enwound2023.njk @@ -0,0 +1,22 @@ +--- +title: Enwound 2023 +layout: rime +hoagies: + src: https://bandcamp.com/EmbeddedPlayer/album=203876381/size=small/bgcol=ffffff/linkcol=2ebd35/transparent=true/ + title: hoagies +--- +
+

+ Ruins
Crumbling remnants of decades of social-media poisoning +

+
+ +{% import "content.macros.njk" as content %} +{{ content.iframe( + src=hoagies.src, + title=hoagies.title, + width=509, + height=42 +)}} + + diff --git a/src/plugins/utils.js b/src/plugins/utils.js new file mode 100644 index 0000000..aaed1a2 --- /dev/null +++ b/src/plugins/utils.js @@ -0,0 +1,10 @@ +'use strict'; + +const styles = (obj) => { + return Object.entries(obj).reduce((acc, [key, value]) => value ? `${key}:${value};${acc}` : acc, ""); +}; + +module.exports = function(eleventyConfig) { + + eleventyConfig.addFilter('styles', styles); +}; diff --git a/src/scss/rime.scss b/src/scss/rime.scss new file mode 100644 index 0000000..4e8ac4a --- /dev/null +++ b/src/scss/rime.scss @@ -0,0 +1,37 @@ +@forward './vendor/remedy'; + +body { + color: mediumvioletred; + background-color: #ddd; +} + +.breakout { + --gap: clamp(1rem, 6vw, 3rem); + --full: minmax(var(--gap), 1fr); + --content: min(50ch, 100% - var(--gap) * 2); + --popout: minmax(0, 2rem); + --feature: minmax(0, 5rem); + + display: grid; + grid-template-columns: + [full-start] var(--full) + [feature-start] var(--feature) + [popout-start] var(--popout) + [content-start] var(--content) [content-end] + var(--popout) [popout-end] + var(--feature) [feature-end] + var(--full) [full-end]; +} + +.breakout > * { + grid-column: content; +} +.popout { + grid-column: popout; +} +.feature { + grid-column: feature; +} +.full { + grid-column: full; +} diff --git a/src/scss/vendor/_remedy.scss b/src/scss/vendor/_remedy.scss new file mode 100644 index 0000000..a5ce476 --- /dev/null +++ b/src/scss/vendor/_remedy.scss @@ -0,0 +1 @@ +@forward '../../../node_modules/cssremedy/css/remedy.css'; From 56df83cec6d91818b34691fe7a3e0e420936665b Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Tue, 26 Dec 2023 15:51:41 -0500 Subject: [PATCH 02/30] Iterate on Rime layout, rename enwound -> entwined --- src/_includes/rime.njk | 10 +++++++-- src/entwined2023.njk | 18 ++++++++++++++++ src/enwound2023.njk | 22 ------------------- src/scss/base/_index.scss | 2 ++ src/scss/base/_root.scss | 4 ++++ src/scss/layout/_content-grid.scss | 31 +++++++++++++++++++++++++++ src/scss/layout/_index.scss | 1 + src/scss/rime.scss | 34 ++---------------------------- 8 files changed, 66 insertions(+), 56 deletions(-) create mode 100644 src/entwined2023.njk delete mode 100644 src/enwound2023.njk create mode 100644 src/scss/base/_index.scss create mode 100644 src/scss/base/_root.scss create mode 100644 src/scss/layout/_content-grid.scss create mode 100644 src/scss/layout/_index.scss diff --git a/src/_includes/rime.njk b/src/_includes/rime.njk index bc7ea40..6e8bca7 100644 --- a/src/_includes/rime.njk +++ b/src/_includes/rime.njk @@ -1,3 +1,4 @@ +{%- import 'util.macros.njk' as util -%} @@ -7,8 +8,13 @@ -
- {% block main %}{{ content | safe }}{% endblock %} +
+ {% block main %} +
+

{{ title }}

+
+ {{ content | safe }} + {% endblock %}
diff --git a/src/entwined2023.njk b/src/entwined2023.njk new file mode 100644 index 0000000..ec1817f --- /dev/null +++ b/src/entwined2023.njk @@ -0,0 +1,18 @@ +--- +title: Entwined 2023 +layout: rime +attrs: + main: + class: content-grid + +hoagies: + src: https://bandcamp.com/EmbeddedPlayer/album=203876381/size=small/bgcol=ffffff/linkcol=2ebd35/transparent=true/ + title: hoagies +--- +{% import "content.macros.njk" as content %} +{{ content.iframe( + src=hoagies.src, + title=hoagies.title, + width=509, + height=42 +)}} diff --git a/src/enwound2023.njk b/src/enwound2023.njk deleted file mode 100644 index bc4fbbc..0000000 --- a/src/enwound2023.njk +++ /dev/null @@ -1,22 +0,0 @@ ---- -title: Enwound 2023 -layout: rime -hoagies: - src: https://bandcamp.com/EmbeddedPlayer/album=203876381/size=small/bgcol=ffffff/linkcol=2ebd35/transparent=true/ - title: hoagies ---- -
-

- Ruins
Crumbling remnants of decades of social-media poisoning -

-
- -{% import "content.macros.njk" as content %} -{{ content.iframe( - src=hoagies.src, - title=hoagies.title, - width=509, - height=42 -)}} - - diff --git a/src/scss/base/_index.scss b/src/scss/base/_index.scss new file mode 100644 index 0000000..80c34dd --- /dev/null +++ b/src/scss/base/_index.scss @@ -0,0 +1,2 @@ +@forward '../vendor/remedy'; +@forward 'root'; diff --git a/src/scss/base/_root.scss b/src/scss/base/_root.scss new file mode 100644 index 0000000..0dd6003 --- /dev/null +++ b/src/scss/base/_root.scss @@ -0,0 +1,4 @@ +html { + font-family: system-ui, sans-serif; + font-weight: normal; +} diff --git a/src/scss/layout/_content-grid.scss b/src/scss/layout/_content-grid.scss new file mode 100644 index 0000000..91300e1 --- /dev/null +++ b/src/scss/layout/_content-grid.scss @@ -0,0 +1,31 @@ +.content-grid { + --gap: clamp(1rem, 6vw, 3rem); + --full: minmax(var(--gap), 1fr); + --content: min(50ch, 100% - var(--gap) * 2); + --popout: minmax(0, 2rem); + --feature: minmax(0, 5rem); + + display: grid; + grid-template-columns: + [full-start] var(--full) + [feature-start] var(--feature) + [popout-start] var(--popout) + [content-start] var(--content) [content-end] + var(--popout) [popout-end] + var(--feature) [feature-end] + var(--full) [full-end]; + + & > * { + grid-column: content; + } +} + +.popout { + grid-column: popout; +} +.feature { + grid-column: feature; +} +.full { + grid-column: full; +} diff --git a/src/scss/layout/_index.scss b/src/scss/layout/_index.scss new file mode 100644 index 0000000..011b693 --- /dev/null +++ b/src/scss/layout/_index.scss @@ -0,0 +1 @@ +@forward 'content-grid'; diff --git a/src/scss/rime.scss b/src/scss/rime.scss index 4e8ac4a..f8a5d05 100644 --- a/src/scss/rime.scss +++ b/src/scss/rime.scss @@ -1,37 +1,7 @@ -@forward './vendor/remedy'; +@use 'base'; +@use 'layout'; body { color: mediumvioletred; background-color: #ddd; } - -.breakout { - --gap: clamp(1rem, 6vw, 3rem); - --full: minmax(var(--gap), 1fr); - --content: min(50ch, 100% - var(--gap) * 2); - --popout: minmax(0, 2rem); - --feature: minmax(0, 5rem); - - display: grid; - grid-template-columns: - [full-start] var(--full) - [feature-start] var(--feature) - [popout-start] var(--popout) - [content-start] var(--content) [content-end] - var(--popout) [popout-end] - var(--feature) [feature-end] - var(--full) [full-end]; -} - -.breakout > * { - grid-column: content; -} -.popout { - grid-column: popout; -} -.feature { - grid-column: feature; -} -.full { - grid-column: full; -} From 8b989297f39a15117cf8d543e1c4bdf0c011b3de Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Tue, 26 Dec 2023 17:47:05 -0500 Subject: [PATCH 03/30] Iterate further on the entwined 2023 and the future of this site 1. Allow inline markdown in the captions of figures 2. Wire up some colors. I think this is a slightly simpler situation than what I had before but I'm not sure. I can add more things where needed (and we will need more). 3. Add the full `figure` macro. This right now renders a data object as a captioned figure. Right now only `iframe` support. 4. Basic figure styles, popping out, background color. 5. Enable markdown files as pages. --- .eleventy.js | 4 + package-lock.json | 191 +++++++++++++++++++++++++------ package.json | 1 + src/_includes/content.macros.njk | 34 ++++++ src/entwined2023.md | 22 ++++ src/entwined2023.njk | 18 --- src/plugins/type.js | 14 +++ src/scss/base/_figure.scss | 8 ++ src/scss/base/_index.scss | 1 + src/scss/base/_root.scss | 12 ++ src/scss/config/_colors.scss | 53 +++++++++ src/scss/config/_index.scss | 1 + src/scss/rime.scss | 4 +- 13 files changed, 308 insertions(+), 55 deletions(-) create mode 100644 src/entwined2023.md delete mode 100644 src/entwined2023.njk create mode 100644 src/plugins/type.js create mode 100644 src/scss/base/_figure.scss create mode 100644 src/scss/config/_colors.scss create mode 100644 src/scss/config/_index.scss diff --git a/.eleventy.js b/.eleventy.js index 49aec41..54a1534 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -2,6 +2,7 @@ const { minify } = require('terser'); const CleanCSS = require("clean-css"); const configUtils = require('./src/plugins/utils'); +const typeUtils = require('./src/plugins/type'); module.exports = function(eleventyConfig) { // Set custom directories for input, output, includes, and data eleventyConfig.addNunjucksAsyncFilter("jsmin", async function ( @@ -23,6 +24,7 @@ module.exports = function(eleventyConfig) { // Set custom directories for input // plugins eleventyConfig.addPlugin(configUtils); + eleventyConfig.addPlugin(typeUtils); // separate projects included fully eleventyConfig.addPassthroughCopy("src/darken"); @@ -39,8 +41,10 @@ module.exports = function(eleventyConfig) { // Set custom directories for input eleventyConfig.addPassthroughCopy("src/**/*.txt"); eleventyConfig.addPassthroughCopy("src/favicon.ico"); return { + markdownTemplateEngine: 'njk', templateFormats: [ "njk", + "md" ], dir: { input: "src", diff --git a/package-lock.json b/package-lock.json index f1fc47a..ed7b20c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "@11ty/eleventy": "^2.0.1", "clean-css": "^5.3.0", "cssremedy": "^0.1.0-beta.2", + "markdown-it": "^14.0.0", "npm-run-all2": "^6.1.1", "sass": "^1.69.5", "terser": "^5.12.1" @@ -143,6 +144,49 @@ "url": "https://opencollective.com/11ty" } }, + "node_modules/@11ty/eleventy/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/@11ty/eleventy/node_modules/linkify-it": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", + "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", + "dev": true, + "dependencies": { + "uc.micro": "^1.0.1" + } + }, + "node_modules/@11ty/eleventy/node_modules/markdown-it": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz", + "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1", + "entities": "~3.0.1", + "linkify-it": "^4.0.1", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + }, + "bin": { + "markdown-it": "bin/markdown-it.js" + } + }, + "node_modules/@11ty/eleventy/node_modules/mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "dev": true + }, + "node_modules/@11ty/eleventy/node_modules/uc.micro": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "dev": true + }, "node_modules/@11ty/lodash-custom": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/@11ty/lodash-custom/-/lodash-custom-4.17.21.tgz", @@ -1654,12 +1698,12 @@ } }, "node_modules/linkify-it": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", - "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", "dev": true, "dependencies": { - "uc.micro": "^1.0.1" + "uc.micro": "^2.0.0" } }, "node_modules/liquidjs": { @@ -1722,19 +1766,20 @@ } }, "node_modules/markdown-it": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz", - "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.0.0.tgz", + "integrity": "sha512-seFjF0FIcPt4P9U39Bq1JYblX0KZCjDLFFQPHpL5AzHpqPEKtosxmdq/LTVZnjfH7tjt9BxStm+wXcDBNuYmzw==", "dev": true, "dependencies": { "argparse": "^2.0.1", - "entities": "~3.0.1", - "linkify-it": "^4.0.1", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" + "entities": "^4.4.0", + "linkify-it": "^5.0.0", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.0.0" }, "bin": { - "markdown-it": "bin/markdown-it.js" + "markdown-it": "bin/markdown-it.mjs" } }, "node_modules/markdown-it/node_modules/argparse": { @@ -1743,6 +1788,18 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, + "node_modules/markdown-it/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/maximatch": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/maximatch/-/maximatch-0.1.0.tgz", @@ -1789,9 +1846,9 @@ } }, "node_modules/mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", "dev": true }, "node_modules/memorystream": { @@ -2392,6 +2449,15 @@ "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==", "dev": true }, + "node_modules/punycode.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", + "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -2825,9 +2891,9 @@ } }, "node_modules/uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.0.0.tgz", + "integrity": "sha512-DffL94LsNOccVn4hyfRe5rdKa273swqeA5DJpMOeFmEn1wCDc7nAbbB0gXlgBCL7TNzeTv6G7XVWzan7iJtfig==", "dev": true }, "node_modules/uglify-js": { @@ -2991,6 +3057,48 @@ "recursive-copy": "^2.0.14", "semver": "^7.3.8", "slugify": "^1.6.6" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "linkify-it": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", + "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", + "dev": true, + "requires": { + "uc.micro": "^1.0.1" + } + }, + "markdown-it": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz", + "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==", + "dev": true, + "requires": { + "argparse": "^2.0.1", + "entities": "~3.0.1", + "linkify-it": "^4.0.1", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + } + }, + "mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "dev": true + }, + "uc.micro": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "dev": true + } } }, "@11ty/eleventy-dev-server": { @@ -4177,12 +4285,12 @@ "dev": true }, "linkify-it": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", - "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", "dev": true, "requires": { - "uc.micro": "^1.0.1" + "uc.micro": "^2.0.0" } }, "liquidjs": { @@ -4227,16 +4335,17 @@ "dev": true }, "markdown-it": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz", - "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.0.0.tgz", + "integrity": "sha512-seFjF0FIcPt4P9U39Bq1JYblX0KZCjDLFFQPHpL5AzHpqPEKtosxmdq/LTVZnjfH7tjt9BxStm+wXcDBNuYmzw==", "dev": true, "requires": { "argparse": "^2.0.1", - "entities": "~3.0.1", - "linkify-it": "^4.0.1", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" + "entities": "^4.4.0", + "linkify-it": "^5.0.0", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.0.0" }, "dependencies": { "argparse": { @@ -4244,6 +4353,12 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true + }, + "entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true } } }, @@ -4283,9 +4398,9 @@ } }, "mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", "dev": true }, "memorystream": { @@ -4758,6 +4873,12 @@ "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==", "dev": true }, + "punycode.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", + "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", + "dev": true + }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -5064,9 +5185,9 @@ "dev": true }, "uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.0.0.tgz", + "integrity": "sha512-DffL94LsNOccVn4hyfRe5rdKa273swqeA5DJpMOeFmEn1wCDc7nAbbB0gXlgBCL7TNzeTv6G7XVWzan7iJtfig==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 78802b6..d170728 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "@11ty/eleventy": "^2.0.1", "clean-css": "^5.3.0", "cssremedy": "^0.1.0-beta.2", + "markdown-it": "^14.0.0", "npm-run-all2": "^6.1.1", "sass": "^1.69.5", "terser": "^5.12.1" diff --git a/src/_includes/content.macros.njk b/src/_includes/content.macros.njk index bcd303b..d7dc437 100644 --- a/src/_includes/content.macros.njk +++ b/src/_includes/content.macros.njk @@ -1,5 +1,21 @@ {% import "util.macros.njk" as util %} +{% macro figure( + data=none, + caption=none, + attrs={} +) -%} + {%- set rendered = _render_data(data) %} +
+
+ {{- rendered | trim | safe -}} +
+ {%- if caption -%} + {{- caption | mdInline | safe -}} + {% endif %} +
+{% endmacro %} + {% macro iframe( src, title, @@ -23,3 +39,21 @@ } -%} {% endmacro %} + + +{% macro _render_data( + data +)-%} + {%- for item in data -%} + {%- if item.iframe -%} + {{- iframe( + item.iframe, + item.title or 'embed', + item.width, + item.height, + item.span + ) -}} + {% else %} + {% endif %} + {% endfor %} +{% endmacro %} diff --git a/src/entwined2023.md b/src/entwined2023.md new file mode 100644 index 0000000..c49fbc0 --- /dev/null +++ b/src/entwined2023.md @@ -0,0 +1,22 @@ +--- +title: Entwined 2023 +layout: rime +attrs: + main: + class: content-grid + +hoagies: + - iframe: https://bandcamp.com/EmbeddedPlayer/album=203876381/size=small/bgcol=ffffff/linkcol=2ebd35/transparent=true/ + height: 42 + width: 509 + title: hoagies +--- +{% import "content.macros.njk" as content %} + +And lo, when the Imperium marches..... + +{{ content.figure( + hoagies, + caption='Most important hoagie of the year', + attrs={class: 'popout'} +) }} diff --git a/src/entwined2023.njk b/src/entwined2023.njk deleted file mode 100644 index ec1817f..0000000 --- a/src/entwined2023.njk +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: Entwined 2023 -layout: rime -attrs: - main: - class: content-grid - -hoagies: - src: https://bandcamp.com/EmbeddedPlayer/album=203876381/size=small/bgcol=ffffff/linkcol=2ebd35/transparent=true/ - title: hoagies ---- -{% import "content.macros.njk" as content %} -{{ content.iframe( - src=hoagies.src, - title=hoagies.title, - width=509, - height=42 -)}} diff --git a/src/plugins/type.js b/src/plugins/type.js new file mode 100644 index 0000000..8af7d5e --- /dev/null +++ b/src/plugins/type.js @@ -0,0 +1,14 @@ +'use strict'; + +const markdownit = require('markdown-it'); + +const marker = markdownit({ + html: true, + typographer: true, +}); + +const inline = (content) => (content ? marker.renderInline(content.trim()) : ""); + +module.exports = (eleventyConfig) => { + eleventyConfig.addFilter("mdInline", inline); +}; diff --git a/src/scss/base/_figure.scss b/src/scss/base/_figure.scss new file mode 100644 index 0000000..3744571 --- /dev/null +++ b/src/scss/base/_figure.scss @@ -0,0 +1,8 @@ +figure { + display: grid; + gap: 1em; + margin-inline: 0; + padding: 1em; + + background-color: var(--shadow); +} diff --git a/src/scss/base/_index.scss b/src/scss/base/_index.scss index 80c34dd..64fc678 100644 --- a/src/scss/base/_index.scss +++ b/src/scss/base/_index.scss @@ -1,2 +1,3 @@ @forward '../vendor/remedy'; @forward 'root'; +@forward 'figure'; diff --git a/src/scss/base/_root.scss b/src/scss/base/_root.scss index 0dd6003..2629a96 100644 --- a/src/scss/base/_root.scss +++ b/src/scss/base/_root.scss @@ -1,4 +1,16 @@ +@use 'sass:meta'; +@use '../config/colors'; + html { font-family: system-ui, sans-serif; font-weight: normal; + + @each $name, $value in meta.module-variables('colors') { + --#{$name}: #{$value}; + } + + @include colors.theme; + + background-color: var(--background-color); + color: var(--text-color); } diff --git a/src/scss/config/_colors.scss b/src/scss/config/_colors.scss new file mode 100644 index 0000000..8da06ec --- /dev/null +++ b/src/scss/config/_colors.scss @@ -0,0 +1,53 @@ +@use 'sass:color'; + +// $colors: ( +// "nord": ( +// "0": #2e3440, +// "1": #3b4252, +// "3": #4c566a, +// "4": #d8dee9, +// "5": #e5e9f0, +// "6": #eceff4, +// "7": #8fbcbb, +// "8": #88c0d0, +// "9": #81a1c1, +// "10": #5e81ac, +// "14": #a3be8c, +// "15": #b48ead, +// ), +// "accent": ( +// "200": hsl(338, 47%, 43%), +// "400": hsl(352, 68%, 64%), +// ), +// ); + +$dark: #3b4252; +$darker: #2e3440; +$light: #eceff4; +$accent-light: #88c0d0; +$complement-light: #8fbcbb; +$accent-dark: #5e81ac; +$bg-accent-dark: color.mix($accent-dark, $darker, 15%); +$bg-accent-light: color.mix($accent-light, $light, 15%); +$complement-dark: #81a1c1; // teal; +$mark-light: color.change($accent-light, $alpha: 0.2); +$mark-dark: color.change($accent-dark, $alpha: 0.2); + +@mixin light { + --background-color: var(--light); + --text-color: var(--dark); + --accent-color: var(--accent-dark); + --accent-text: var(--background-color); + --complement: var(--complement-dark); + --complement-text: var(--background-color); + --mark: var(--mark-light); + --mark-text: var(--text); + --shadow: hsl(0deg 0% 0% / 12.5%); +} + +@mixin theme { + @include light; + + --action: var(--accent-text); + --active: var(--complement); +} diff --git a/src/scss/config/_index.scss b/src/scss/config/_index.scss new file mode 100644 index 0000000..7011938 --- /dev/null +++ b/src/scss/config/_index.scss @@ -0,0 +1 @@ +@forward 'colors'; diff --git a/src/scss/rime.scss b/src/scss/rime.scss index f8a5d05..375f19e 100644 --- a/src/scss/rime.scss +++ b/src/scss/rime.scss @@ -2,6 +2,6 @@ @use 'layout'; body { - color: mediumvioletred; - background-color: #ddd; + // color: mediumvioletred; + // background-color: #ddd; } From 8c7f39911572ef96e5ba0b343d2140a41a509053 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Tue, 26 Dec 2023 18:04:15 -0500 Subject: [PATCH 04/30] Assume tighter control over content grid spacing --- src/_includes/content.macros.njk | 6 +++--- src/scss/layout/_content-grid.scss | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/_includes/content.macros.njk b/src/_includes/content.macros.njk index d7dc437..1df4893 100644 --- a/src/_includes/content.macros.njk +++ b/src/_includes/content.macros.njk @@ -5,16 +5,16 @@ caption=none, attrs={} ) -%} - {%- set rendered = _render_data(data) %} + {%- set rendered = _render_data(data) -%}
{{- rendered | trim | safe -}}
{%- if caption -%} {{- caption | mdInline | safe -}} - {% endif %} + {%- endif -%}
-{% endmacro %} +{%- endmacro %} {% macro iframe( src, diff --git a/src/scss/layout/_content-grid.scss b/src/scss/layout/_content-grid.scss index 91300e1..801b4fd 100644 --- a/src/scss/layout/_content-grid.scss +++ b/src/scss/layout/_content-grid.scss @@ -6,6 +6,7 @@ --feature: minmax(0, 5rem); display: grid; + row-gap: 1.5em; grid-template-columns: [full-start] var(--full) [feature-start] var(--feature) @@ -17,6 +18,7 @@ & > * { grid-column: content; + margin: 0; } } From e4e0cf3fc34b8c108674ef77d96dd3b34f8d6863 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Tue, 26 Dec 2023 18:04:30 -0500 Subject: [PATCH 05/30] Add first item on the Entwined list --- src/entwined2023.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/entwined2023.md b/src/entwined2023.md index c49fbc0..830a427 100644 --- a/src/entwined2023.md +++ b/src/entwined2023.md @@ -5,6 +5,10 @@ attrs: main: class: content-grid +kirkwood: + - iframe: https://www.youtube.com/embed/kKIhEIzzlis?si=V1Lz7K7dEs20Vbe6 + title: "Jim Kirkwood ‎- Souls That Dance On The Edge Of A Sword (1991)" + hoagies: - iframe: https://bandcamp.com/EmbeddedPlayer/album=203876381/size=small/bgcol=ffffff/linkcol=2ebd35/transparent=true/ height: 42 @@ -15,6 +19,10 @@ hoagies: And lo, when the Imperium marches..... +## Retro/cosmic dark ambient + +{{ content.figure(kirkwood, caption="Souls that Dance on The Edge of a Sword", attrs={class: "popout"}) }} + {{ content.figure( hoagies, caption='Most important hoagie of the year', From 38ca542ac3b2645ec7325c8c77b9dd34445374b5 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 27 Dec 2023 16:20:56 -0500 Subject: [PATCH 06/30] CNAME file passthrough --- .eleventy.js | 1 + docs/CNAME | 2 +- src/CNAME | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 src/CNAME diff --git a/.eleventy.js b/.eleventy.js index 54a1534..835b386 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -40,6 +40,7 @@ module.exports = function(eleventyConfig) { // Set custom directories for input eleventyConfig.addPassthroughCopy("src/js"); eleventyConfig.addPassthroughCopy("src/**/*.txt"); eleventyConfig.addPassthroughCopy("src/favicon.ico"); + eleventyConfig.addPassthroughCopy("src/CNAME"); return { markdownTemplateEngine: 'njk', templateFormats: [ diff --git a/docs/CNAME b/docs/CNAME index 1f9d96a..fbf8746 100644 --- a/docs/CNAME +++ b/docs/CNAME @@ -1 +1 @@ -chigby.org \ No newline at end of file +chigby.org diff --git a/src/CNAME b/src/CNAME new file mode 100644 index 0000000..fbf8746 --- /dev/null +++ b/src/CNAME @@ -0,0 +1 @@ +chigby.org From c5acfac2515d6402db64726c4e87dc3306694b5a Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 27 Dec 2023 16:21:15 -0500 Subject: [PATCH 07/30] Link styles --- src/scss/base/_index.scss | 1 + src/scss/base/_links.scss | 14 ++++++++++++++ src/scss/config/_colors.scss | 6 +++++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/scss/base/_links.scss diff --git a/src/scss/base/_index.scss b/src/scss/base/_index.scss index 64fc678..a62f96e 100644 --- a/src/scss/base/_index.scss +++ b/src/scss/base/_index.scss @@ -1,3 +1,4 @@ @forward '../vendor/remedy'; @forward 'root'; @forward 'figure'; +@forward 'links'; diff --git a/src/scss/base/_links.scss b/src/scss/base/_links.scss new file mode 100644 index 0000000..7861c51 --- /dev/null +++ b/src/scss/base/_links.scss @@ -0,0 +1,14 @@ +a { + &:where(:any-link) { + color: var(--link-color); + } + + &:where(:visited) { + color: var(--link-visited, var(--link-color)); + } + + &:where(:hover, :focus, :active) { + color: var(--link-active); + background-color: var(--link-active-bg); + } +} diff --git a/src/scss/config/_colors.scss b/src/scss/config/_colors.scss index 8da06ec..3196db0 100644 --- a/src/scss/config/_colors.scss +++ b/src/scss/config/_colors.scss @@ -43,11 +43,15 @@ $mark-dark: color.change($accent-dark, $alpha: 0.2); --mark: var(--mark-light); --mark-text: var(--text); --shadow: hsl(0deg 0% 0% / 12.5%); + + --link-color: var(--action); + --link-active: var(--active); } @mixin theme { @include light; - --action: var(--accent-text); + // applications of color + --action: var(--accent-color); --active: var(--complement); } From 83754d25bf0bd260484e1fdc99404670851231fe Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 27 Dec 2023 17:07:54 -0500 Subject: [PATCH 08/30] Add JSON5 for better data file format --- .eleventy.js | 4 ++++ package-lock.json | 19 +++++++++++++++++++ package.json | 1 + 3 files changed, 24 insertions(+) diff --git a/.eleventy.js b/.eleventy.js index 835b386..8b416db 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,5 +1,6 @@ const { minify } = require('terser'); const CleanCSS = require("clean-css"); +const JSON5 = require('json5'); const configUtils = require('./src/plugins/utils'); const typeUtils = require('./src/plugins/type'); @@ -26,6 +27,9 @@ module.exports = function(eleventyConfig) { // Set custom directories for input eleventyConfig.addPlugin(configUtils); eleventyConfig.addPlugin(typeUtils); + // configure json5 support for data files + eleventyConfig.addDataExtension('json5', JSON5.parse); + // separate projects included fully eleventyConfig.addPassthroughCopy("src/darken"); eleventyConfig.addPassthroughCopy("src/offsetCipher"); diff --git a/package-lock.json b/package-lock.json index ed7b20c..6f6cd04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "@11ty/eleventy": "^2.0.1", "clean-css": "^5.3.0", "cssremedy": "^0.1.0-beta.2", + "json5": "^2.2.3", "markdown-it": "^14.0.0", "npm-run-all2": "^6.1.1", "sass": "^1.69.5", @@ -1651,6 +1652,18 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/jstransformer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", @@ -4250,6 +4263,12 @@ "integrity": "sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==", "dev": true }, + "json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true + }, "jstransformer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", diff --git a/package.json b/package.json index d170728..e829c49 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "@11ty/eleventy": "^2.0.1", "clean-css": "^5.3.0", "cssremedy": "^0.1.0-beta.2", + "json5": "^2.2.3", "markdown-it": "^14.0.0", "npm-run-all2": "^6.1.1", "sass": "^1.69.5", From 195a307b2b16a33aed0ca9dc86c6525d1455d726 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 27 Dec 2023 17:08:52 -0500 Subject: [PATCH 09/30] Move Entwined 2023 page into new "post" folder This is so, I think, it will be easier to control how this page can be similar to and have the same layout as other potential future pages. --- src/{ => post}/entwined2023.md | 2 -- src/post/post.json5 | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) rename src/{ => post}/entwined2023.md (94%) create mode 100644 src/post/post.json5 diff --git a/src/entwined2023.md b/src/post/entwined2023.md similarity index 94% rename from src/entwined2023.md rename to src/post/entwined2023.md index 830a427..05bf1f4 100644 --- a/src/entwined2023.md +++ b/src/post/entwined2023.md @@ -17,8 +17,6 @@ hoagies: --- {% import "content.macros.njk" as content %} -And lo, when the Imperium marches..... - ## Retro/cosmic dark ambient {{ content.figure(kirkwood, caption="Souls that Dance on The Edge of a Sword", attrs={class: "popout"}) }} diff --git a/src/post/post.json5 b/src/post/post.json5 new file mode 100644 index 0000000..50061b1 --- /dev/null +++ b/src/post/post.json5 @@ -0,0 +1,7 @@ +{ + attrs: { + body: { + class: "a-page", + } + } +} From d183238905b72e48da662917e58102588e7c9eb4 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 27 Dec 2023 17:09:46 -0500 Subject: [PATCH 10/30] Give our CSS some standard space sizes --- src/scss/base/_root.scss | 2 ++ src/scss/config/_sizes.scss | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 src/scss/config/_sizes.scss diff --git a/src/scss/base/_root.scss b/src/scss/base/_root.scss index 2629a96..12df6e2 100644 --- a/src/scss/base/_root.scss +++ b/src/scss/base/_root.scss @@ -1,5 +1,6 @@ @use 'sass:meta'; @use '../config/colors'; +@use '../config/sizes'; html { font-family: system-ui, sans-serif; @@ -10,6 +11,7 @@ html { } @include colors.theme; + @include sizes.space; background-color: var(--background-color); color: var(--text-color); diff --git a/src/scss/config/_sizes.scss b/src/scss/config/_sizes.scss new file mode 100644 index 0000000..c90bb91 --- /dev/null +++ b/src/scss/config/_sizes.scss @@ -0,0 +1,11 @@ +@mixin space { + --gap: 1rem; + --half-gap: calc(var(--gap) / 2); + --shim: calc(var(--gap) / 4); + --half-shim: calc(var(--shim) / 2); + --spacer: clamp( + var(--gap) * 1.5, + var(--gap) + 4vw, + min(var(--gap) * 6, 20vmin) + ); +} From 0dc2a0cd387c7b0500724e02c326fe47c7e96d8f Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 27 Dec 2023 17:10:04 -0500 Subject: [PATCH 11/30] Give the body tag some spatial relationship to the footer Everything being a grid makes it easier to control what's happening. --- src/scss/layout/_body.scss | 9 +++++++++ src/scss/layout/_index.scss | 2 ++ src/scss/layout/_site-footer.scss | 7 +++++++ 3 files changed, 18 insertions(+) create mode 100644 src/scss/layout/_body.scss create mode 100644 src/scss/layout/_site-footer.scss diff --git a/src/scss/layout/_body.scss b/src/scss/layout/_body.scss new file mode 100644 index 0000000..686ca84 --- /dev/null +++ b/src/scss/layout/_body.scss @@ -0,0 +1,9 @@ +.a-page { + display: grid; + row-gap: var(--spacer); + margin: 0; + + :where(&) > * { + margin-block: 0; + } +} diff --git a/src/scss/layout/_index.scss b/src/scss/layout/_index.scss index 011b693..e93b8ec 100644 --- a/src/scss/layout/_index.scss +++ b/src/scss/layout/_index.scss @@ -1 +1,3 @@ @forward 'content-grid'; +@forward 'site-footer'; +@forward 'body'; diff --git a/src/scss/layout/_site-footer.scss b/src/scss/layout/_site-footer.scss new file mode 100644 index 0000000..4e97198 --- /dev/null +++ b/src/scss/layout/_site-footer.scss @@ -0,0 +1,7 @@ +body > footer { + padding: 1rem; + text-align: center; + padding-block-start: 1rem; + + border-top: 1.5px solid; +} From 54af48bc66929f7223898e122cc8ae6b73c20ff3 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 27 Dec 2023 17:10:54 -0500 Subject: [PATCH 12/30] Footer that took way to long to settle on the exact contents of --- src/_includes/rime.njk | 3 ++- src/_includes/site/footer.njk | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/_includes/site/footer.njk diff --git a/src/_includes/rime.njk b/src/_includes/rime.njk index 6e8bca7..d4c491e 100644 --- a/src/_includes/rime.njk +++ b/src/_includes/rime.njk @@ -7,7 +7,7 @@ {{ title }} - +
{% block main %}
@@ -16,5 +16,6 @@ {{ content | safe }} {% endblock %}
+ {% include "site/footer.njk" %} diff --git a/src/_includes/site/footer.njk b/src/_includes/site/footer.njk new file mode 100644 index 0000000..956634d --- /dev/null +++ b/src/_includes/site/footer.njk @@ -0,0 +1,15 @@ + From 0a8e6b9daaddafb871e3b68520d5e3610e97701d Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 27 Dec 2023 17:44:31 -0500 Subject: [PATCH 13/30] Enable better typography site-wide --- src/plugins/type.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/type.js b/src/plugins/type.js index 8af7d5e..43b89a8 100644 --- a/src/plugins/type.js +++ b/src/plugins/type.js @@ -11,4 +11,6 @@ const inline = (content) => (content ? marker.renderInline(content.trim()) : "") module.exports = (eleventyConfig) => { eleventyConfig.addFilter("mdInline", inline); + + eleventyConfig.setLibrary('md', marker); }; From 98be65955c4475f37ba23340b84dfba08379a84f Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 27 Dec 2023 17:44:41 -0500 Subject: [PATCH 14/30] Use the actual `
` tag for figure captions --- src/_includes/content.macros.njk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/_includes/content.macros.njk b/src/_includes/content.macros.njk index 1df4893..3a11924 100644 --- a/src/_includes/content.macros.njk +++ b/src/_includes/content.macros.njk @@ -11,7 +11,9 @@ {{- rendered | trim | safe -}} {%- if caption -%} - {{- caption | mdInline | safe -}} +
+ {{- caption | mdInline | safe -}} +
{%- endif -%} {%- endmacro %} From 309db547e213e8ee5f5fc9e069b422eab50d4924 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Wed, 27 Dec 2023 17:44:56 -0500 Subject: [PATCH 15/30] Add some initial descriptions --- src/post/entwined2023.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/post/entwined2023.md b/src/post/entwined2023.md index 05bf1f4..9767b56 100644 --- a/src/post/entwined2023.md +++ b/src/post/entwined2023.md @@ -9,6 +9,12 @@ kirkwood: - iframe: https://www.youtube.com/embed/kKIhEIzzlis?si=V1Lz7K7dEs20Vbe6 title: "Jim Kirkwood ‎- Souls That Dance On The Edge Of A Sword (1991)" +enmarta: + - iframe: https://bandcamp.com/EmbeddedPlayer/album=403823612/size=large/bgcol=ffffff/linkcol=f171a2/tracklist=false/transparent=true/ + width: 350 + height: 470 + title: The Hermit by Enmarta + hoagies: - iframe: https://bandcamp.com/EmbeddedPlayer/album=203876381/size=small/bgcol=ffffff/linkcol=2ebd35/transparent=true/ height: 42 @@ -17,10 +23,26 @@ hoagies: --- {% import "content.macros.njk" as content %} -## Retro/cosmic dark ambient +## Favorite retro/cosmic dark ambient + +New-to-me artist Jim Kirkwood has apparently beem making this kind of +music since time immemorial, so I'm pleased to have been finally +introduced to it. Cosmic, weird, disconcerting: is it dark ambient? +Is it dungeon synth? Can one enter a strange zone-out realm with +enough repeated exposures, as I have done this year? Yes. {{ content.figure(kirkwood, caption="Souls that Dance on The Edge of a Sword", attrs={class: "popout"}) }} +## Favorite new(er) dark ambient + +Using "new" here to mean released in the last ten years. For me, this +album is less about entering a zone-out realm and more about crossing +the threshold of night into a haunting saga---yes, a _saga_---at once +wistful, isolated, dreaming, wakeful, desolate, still. Also, there is +a significant amount of viola, which one cannot really object to. I struggle to pick a favorite track, but "March of the Priests" and "Apokatástasis II" both rule. + +{{ content.figure(enmarta, caption="_The Hermit_ by Enmarta", attrs={class: "popout"}) }} + {{ content.figure( hoagies, caption='Most important hoagie of the year', From f04bb80ccf62005e72a11843025c3429ec14b49d Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Thu, 28 Dec 2023 17:11:53 -0500 Subject: [PATCH 16/30] Add light/dark theme switcher to Rime layout --- package-lock.json | 599 ++++++++++++++++++++++++++ package.json | 5 +- src/_includes/rime.njk | 2 + src/_includes/site/header.njk | 16 + src/js/index.js | 3 + src/js/theme-chooser.js | 26 ++ src/scss/config/_colors.scss | 31 +- src/scss/features/_index.scss | 1 + src/scss/features/_theme-chooser.scss | 3 + src/scss/rime.scss | 1 + 10 files changed, 683 insertions(+), 4 deletions(-) create mode 100644 src/_includes/site/header.njk create mode 100644 src/js/index.js create mode 100644 src/js/theme-chooser.js create mode 100644 src/scss/features/_index.scss create mode 100644 src/scss/features/_theme-chooser.scss diff --git a/package-lock.json b/package-lock.json index 6f6cd04..34dd411 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "@11ty/eleventy": "^2.0.1", "clean-css": "^5.3.0", "cssremedy": "^0.1.0-beta.2", + "esbuild": "^0.19.10", "json5": "^2.2.3", "markdown-it": "^14.0.0", "npm-run-all2": "^6.1.1", @@ -404,6 +405,374 @@ "node": ">=6.9.0" } }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.10.tgz", + "integrity": "sha512-Q+mk96KJ+FZ30h9fsJl+67IjNJm3x2eX+GBWGmocAKgzp27cowCOOqSdscX80s0SpdFXZnIv/+1xD1EctFx96Q==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.10.tgz", + "integrity": "sha512-7W0bK7qfkw1fc2viBfrtAEkDKHatYfHzr/jKAHNr9BvkYDXPcC6bodtm8AyLJNNuqClLNaeTLuwURt4PRT9d7w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.10.tgz", + "integrity": "sha512-1X4CClKhDgC3by7k8aOWZeBXQX8dHT5QAMCAQDArCLaYfkppoARvh0fit3X2Qs+MXDngKcHv6XXyQCpY0hkK1Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.10.tgz", + "integrity": "sha512-O/nO/g+/7NlitUxETkUv/IvADKuZXyH4BHf/g/7laqKC4i/7whLpB0gvpPc2zpF0q9Q6FXS3TS75QHac9MvVWw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.10.tgz", + "integrity": "sha512-YSRRs2zOpwypck+6GL3wGXx2gNP7DXzetmo5pHXLrY/VIMsS59yKfjPizQ4lLt5vEI80M41gjm2BxrGZ5U+VMA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.10.tgz", + "integrity": "sha512-alfGtT+IEICKtNE54hbvPg13xGBe4GkVxyGWtzr+yHO7HIiRJppPDhOKq3zstTcVf8msXb/t4eavW3jCDpMSmA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.10.tgz", + "integrity": "sha512-dMtk1wc7FSH8CCkE854GyGuNKCewlh+7heYP/sclpOG6Cectzk14qdUIY5CrKDbkA/OczXq9WesqnPl09mj5dg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.10.tgz", + "integrity": "sha512-G5UPPspryHu1T3uX8WiOEUa6q6OlQh6gNl4CO4Iw5PS+Kg5bVggVFehzXBJY6X6RSOMS8iXDv2330VzaObm4Ag==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.10.tgz", + "integrity": "sha512-j6gUW5aAaPgD416Hk9FHxn27On28H4eVI9rJ4az7oCGTFW48+LcgNDBN+9f8rKZz7EEowo889CPKyeaD0iw9Kg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.10.tgz", + "integrity": "sha512-QxaouHWZ+2KWEj7cGJmvTIHVALfhpGxo3WLmlYfJ+dA5fJB6lDEIg+oe/0//FuyVHuS3l79/wyBxbHr0NgtxJQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.10.tgz", + "integrity": "sha512-4ub1YwXxYjj9h1UIZs2hYbnTZBtenPw5NfXCRgEkGb0b6OJ2gpkMvDqRDYIDRjRdWSe/TBiZltm3Y3Q8SN1xNg==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.10.tgz", + "integrity": "sha512-lo3I9k+mbEKoxtoIbM0yC/MZ1i2wM0cIeOejlVdZ3D86LAcFXFRdeuZmh91QJvUTW51bOK5W2BznGNIl4+mDaA==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.10.tgz", + "integrity": "sha512-J4gH3zhHNbdZN0Bcr1QUGVNkHTdpijgx5VMxeetSk6ntdt+vR1DqGmHxQYHRmNb77tP6GVvD+K0NyO4xjd7y4A==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.10.tgz", + "integrity": "sha512-tgT/7u+QhV6ge8wFMzaklOY7KqiyitgT1AUHMApau32ZlvTB/+efeCtMk4eXS+uEymYK249JsoiklZN64xt6oQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.10.tgz", + "integrity": "sha512-0f/spw0PfBMZBNqtKe5FLzBDGo0SKZKvMl5PHYQr3+eiSscfJ96XEknCe+JoOayybWUFQbcJTrk946i3j9uYZA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.10.tgz", + "integrity": "sha512-pZFe0OeskMHzHa9U38g+z8Yx5FNCLFtUnJtQMpwhS+r4S566aK2ci3t4NCP4tjt6d5j5uo4h7tExZMjeKoehAA==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.10.tgz", + "integrity": "sha512-SpYNEqg/6pZYoc+1zLCjVOYvxfZVZj6w0KROZ3Fje/QrM3nfvT2llI+wmKSrWuX6wmZeTapbarvuNNK/qepSgA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.10.tgz", + "integrity": "sha512-ACbZ0vXy9zksNArWlk2c38NdKg25+L9pr/mVaj9SUq6lHZu/35nx2xnQVRGLrC1KKQqJKRIB0q8GspiHI3J80Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.10.tgz", + "integrity": "sha512-PxcgvjdSjtgPMiPQrM3pwSaG4kGphP+bLSb+cihuP0LYdZv1epbAIecHVl5sD3npkfYBZ0ZnOjR878I7MdJDFg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.10.tgz", + "integrity": "sha512-ZkIOtrRL8SEJjr+VHjmW0znkPs+oJXhlJbNwfI37rvgeMtk3sxOQevXPXjmAPZPigVTncvFqLMd+uV0IBSEzqA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.10.tgz", + "integrity": "sha512-+Sa4oTDbpBfGpl3Hn3XiUe4f8TU2JF7aX8cOfqFYMMjXp6ma6NJDztl5FDG8Ezx0OjwGikIHw+iA54YLDNNVfw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.10.tgz", + "integrity": "sha512-EOGVLK1oWMBXgfttJdPHDTiivYSjX6jDNaATeNOaCOFEVcfMjtbx7WVQwPSE1eIfCp/CaSF2nSrDtzc4I9f8TQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.10.tgz", + "integrity": "sha512-whqLG6Sc70AbU73fFYvuYzaE4MNMBIlR1Y/IrUeOXFrWHxBEjjbZaQ3IXIQS8wJdAzue2GwYZCjOrgrU1oUHoA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@iarna/toml": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz", @@ -1072,6 +1441,44 @@ "is-arrayish": "^0.2.1" } }, + "node_modules/esbuild": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.10.tgz", + "integrity": "sha512-S1Y27QGt/snkNYrRcswgRFqZjaTG5a5xM3EQo97uNBnH505pdzSNe/HLBq1v0RO7iK/ngdbhJB6mDAp0OK+iUA==", + "dev": true, + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.19.10", + "@esbuild/android-arm": "0.19.10", + "@esbuild/android-arm64": "0.19.10", + "@esbuild/android-x64": "0.19.10", + "@esbuild/darwin-arm64": "0.19.10", + "@esbuild/darwin-x64": "0.19.10", + "@esbuild/freebsd-arm64": "0.19.10", + "@esbuild/freebsd-x64": "0.19.10", + "@esbuild/linux-arm": "0.19.10", + "@esbuild/linux-arm64": "0.19.10", + "@esbuild/linux-ia32": "0.19.10", + "@esbuild/linux-loong64": "0.19.10", + "@esbuild/linux-mips64el": "0.19.10", + "@esbuild/linux-ppc64": "0.19.10", + "@esbuild/linux-riscv64": "0.19.10", + "@esbuild/linux-s390x": "0.19.10", + "@esbuild/linux-x64": "0.19.10", + "@esbuild/netbsd-x64": "0.19.10", + "@esbuild/openbsd-x64": "0.19.10", + "@esbuild/sunos-x64": "0.19.10", + "@esbuild/win32-arm64": "0.19.10", + "@esbuild/win32-ia32": "0.19.10", + "@esbuild/win32-x64": "0.19.10" + } + }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -3316,6 +3723,167 @@ "to-fast-properties": "^2.0.0" } }, + "@esbuild/aix-ppc64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.10.tgz", + "integrity": "sha512-Q+mk96KJ+FZ30h9fsJl+67IjNJm3x2eX+GBWGmocAKgzp27cowCOOqSdscX80s0SpdFXZnIv/+1xD1EctFx96Q==", + "dev": true, + "optional": true + }, + "@esbuild/android-arm": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.10.tgz", + "integrity": "sha512-7W0bK7qfkw1fc2viBfrtAEkDKHatYfHzr/jKAHNr9BvkYDXPcC6bodtm8AyLJNNuqClLNaeTLuwURt4PRT9d7w==", + "dev": true, + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.10.tgz", + "integrity": "sha512-1X4CClKhDgC3by7k8aOWZeBXQX8dHT5QAMCAQDArCLaYfkppoARvh0fit3X2Qs+MXDngKcHv6XXyQCpY0hkK1Q==", + "dev": true, + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.10.tgz", + "integrity": "sha512-O/nO/g+/7NlitUxETkUv/IvADKuZXyH4BHf/g/7laqKC4i/7whLpB0gvpPc2zpF0q9Q6FXS3TS75QHac9MvVWw==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-arm64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.10.tgz", + "integrity": "sha512-YSRRs2zOpwypck+6GL3wGXx2gNP7DXzetmo5pHXLrY/VIMsS59yKfjPizQ4lLt5vEI80M41gjm2BxrGZ5U+VMA==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.10.tgz", + "integrity": "sha512-alfGtT+IEICKtNE54hbvPg13xGBe4GkVxyGWtzr+yHO7HIiRJppPDhOKq3zstTcVf8msXb/t4eavW3jCDpMSmA==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.10.tgz", + "integrity": "sha512-dMtk1wc7FSH8CCkE854GyGuNKCewlh+7heYP/sclpOG6Cectzk14qdUIY5CrKDbkA/OczXq9WesqnPl09mj5dg==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.10.tgz", + "integrity": "sha512-G5UPPspryHu1T3uX8WiOEUa6q6OlQh6gNl4CO4Iw5PS+Kg5bVggVFehzXBJY6X6RSOMS8iXDv2330VzaObm4Ag==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.10.tgz", + "integrity": "sha512-j6gUW5aAaPgD416Hk9FHxn27On28H4eVI9rJ4az7oCGTFW48+LcgNDBN+9f8rKZz7EEowo889CPKyeaD0iw9Kg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.10.tgz", + "integrity": "sha512-QxaouHWZ+2KWEj7cGJmvTIHVALfhpGxo3WLmlYfJ+dA5fJB6lDEIg+oe/0//FuyVHuS3l79/wyBxbHr0NgtxJQ==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.10.tgz", + "integrity": "sha512-4ub1YwXxYjj9h1UIZs2hYbnTZBtenPw5NfXCRgEkGb0b6OJ2gpkMvDqRDYIDRjRdWSe/TBiZltm3Y3Q8SN1xNg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.10.tgz", + "integrity": "sha512-lo3I9k+mbEKoxtoIbM0yC/MZ1i2wM0cIeOejlVdZ3D86LAcFXFRdeuZmh91QJvUTW51bOK5W2BznGNIl4+mDaA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.10.tgz", + "integrity": "sha512-J4gH3zhHNbdZN0Bcr1QUGVNkHTdpijgx5VMxeetSk6ntdt+vR1DqGmHxQYHRmNb77tP6GVvD+K0NyO4xjd7y4A==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.10.tgz", + "integrity": "sha512-tgT/7u+QhV6ge8wFMzaklOY7KqiyitgT1AUHMApau32ZlvTB/+efeCtMk4eXS+uEymYK249JsoiklZN64xt6oQ==", + "dev": true, + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.10.tgz", + "integrity": "sha512-0f/spw0PfBMZBNqtKe5FLzBDGo0SKZKvMl5PHYQr3+eiSscfJ96XEknCe+JoOayybWUFQbcJTrk946i3j9uYZA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.10.tgz", + "integrity": "sha512-pZFe0OeskMHzHa9U38g+z8Yx5FNCLFtUnJtQMpwhS+r4S566aK2ci3t4NCP4tjt6d5j5uo4h7tExZMjeKoehAA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.10.tgz", + "integrity": "sha512-SpYNEqg/6pZYoc+1zLCjVOYvxfZVZj6w0KROZ3Fje/QrM3nfvT2llI+wmKSrWuX6wmZeTapbarvuNNK/qepSgA==", + "dev": true, + "optional": true + }, + "@esbuild/netbsd-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.10.tgz", + "integrity": "sha512-ACbZ0vXy9zksNArWlk2c38NdKg25+L9pr/mVaj9SUq6lHZu/35nx2xnQVRGLrC1KKQqJKRIB0q8GspiHI3J80Q==", + "dev": true, + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.10.tgz", + "integrity": "sha512-PxcgvjdSjtgPMiPQrM3pwSaG4kGphP+bLSb+cihuP0LYdZv1epbAIecHVl5sD3npkfYBZ0ZnOjR878I7MdJDFg==", + "dev": true, + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.10.tgz", + "integrity": "sha512-ZkIOtrRL8SEJjr+VHjmW0znkPs+oJXhlJbNwfI37rvgeMtk3sxOQevXPXjmAPZPigVTncvFqLMd+uV0IBSEzqA==", + "dev": true, + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.10.tgz", + "integrity": "sha512-+Sa4oTDbpBfGpl3Hn3XiUe4f8TU2JF7aX8cOfqFYMMjXp6ma6NJDztl5FDG8Ezx0OjwGikIHw+iA54YLDNNVfw==", + "dev": true, + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.10.tgz", + "integrity": "sha512-EOGVLK1oWMBXgfttJdPHDTiivYSjX6jDNaATeNOaCOFEVcfMjtbx7WVQwPSE1eIfCp/CaSF2nSrDtzc4I9f8TQ==", + "dev": true, + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.10.tgz", + "integrity": "sha512-whqLG6Sc70AbU73fFYvuYzaE4MNMBIlR1Y/IrUeOXFrWHxBEjjbZaQ3IXIQS8wJdAzue2GwYZCjOrgrU1oUHoA==", + "dev": true, + "optional": true + }, "@iarna/toml": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz", @@ -3819,6 +4387,37 @@ "is-arrayish": "^0.2.1" } }, + "esbuild": { + "version": "0.19.10", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.10.tgz", + "integrity": "sha512-S1Y27QGt/snkNYrRcswgRFqZjaTG5a5xM3EQo97uNBnH505pdzSNe/HLBq1v0RO7iK/ngdbhJB6mDAp0OK+iUA==", + "dev": true, + "requires": { + "@esbuild/aix-ppc64": "0.19.10", + "@esbuild/android-arm": "0.19.10", + "@esbuild/android-arm64": "0.19.10", + "@esbuild/android-x64": "0.19.10", + "@esbuild/darwin-arm64": "0.19.10", + "@esbuild/darwin-x64": "0.19.10", + "@esbuild/freebsd-arm64": "0.19.10", + "@esbuild/freebsd-x64": "0.19.10", + "@esbuild/linux-arm": "0.19.10", + "@esbuild/linux-arm64": "0.19.10", + "@esbuild/linux-ia32": "0.19.10", + "@esbuild/linux-loong64": "0.19.10", + "@esbuild/linux-mips64el": "0.19.10", + "@esbuild/linux-ppc64": "0.19.10", + "@esbuild/linux-riscv64": "0.19.10", + "@esbuild/linux-s390x": "0.19.10", + "@esbuild/linux-x64": "0.19.10", + "@esbuild/netbsd-x64": "0.19.10", + "@esbuild/openbsd-x64": "0.19.10", + "@esbuild/sunos-x64": "0.19.10", + "@esbuild/win32-arm64": "0.19.10", + "@esbuild/win32-ia32": "0.19.10", + "@esbuild/win32-x64": "0.19.10" + } + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", diff --git a/package.json b/package.json index e829c49..53bc531 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,9 @@ "eleventy": "npx @11ty/eleventy", "sass": "sass src/scss:docs/css", "watch:sass": "sass --watch src/scss:docs/css", - "serve": "npm-run-all -p sass eleventy:serve watch:*" + "serve": "npm-run-all -p sass eleventy:serve watch:*", + "js": "esbuild ./src/js --bundle --outfile=docs/js/scripts.js", + "watch:js": "esbuild ./src/js --watch --bundle --outfile=docs/js/scripts.js" }, "repository": { "type": "git", @@ -26,6 +28,7 @@ "@11ty/eleventy": "^2.0.1", "clean-css": "^5.3.0", "cssremedy": "^0.1.0-beta.2", + "esbuild": "^0.19.10", "json5": "^2.2.3", "markdown-it": "^14.0.0", "npm-run-all2": "^6.1.1", diff --git a/src/_includes/rime.njk b/src/_includes/rime.njk index d4c491e..5c2d15b 100644 --- a/src/_includes/rime.njk +++ b/src/_includes/rime.njk @@ -6,8 +6,10 @@ {{ title }} + + {% include "site/header.njk" %}
{% block main %}
diff --git a/src/_includes/site/header.njk b/src/_includes/site/header.njk new file mode 100644 index 0000000..36e4c23 --- /dev/null +++ b/src/_includes/site/header.njk @@ -0,0 +1,16 @@ +
+
+ Light/Dark +
+
+ Color Mode + + + + + + +
+
+
+
diff --git a/src/js/index.js b/src/js/index.js new file mode 100644 index 0000000..5d137f2 --- /dev/null +++ b/src/js/index.js @@ -0,0 +1,3 @@ +import theme from './theme-chooser'; + +theme(); diff --git a/src/js/theme-chooser.js b/src/js/theme-chooser.js new file mode 100644 index 0000000..94d34eb --- /dev/null +++ b/src/js/theme-chooser.js @@ -0,0 +1,26 @@ +function setTheme(value) { + if (["light", "dark"].includes(value)) { + document.documentElement.dataset.colorTheme = value; + localStorage.setItem('theme', value); + } else if (value === "system") { + delete document.documentElement.dataset.colorTheme; + } +} + +export default function() { + let theme = localStorage.getItem('theme'); + if (["light", "dark"].includes(theme)) { + document.documentElement.dataset.colorTheme = theme; + let box = document.getElementById(theme); + if (box) { + box.checked = true; + } + } + + const themeButtons = document.querySelectorAll('input[name="theme-toggle"]'); + themeButtons.forEach(button => { + button.addEventListener("click", () => { + setTheme(button.value); + }); + }); +}; diff --git a/src/scss/config/_colors.scss b/src/scss/config/_colors.scss index 3196db0..463e368 100644 --- a/src/scss/config/_colors.scss +++ b/src/scss/config/_colors.scss @@ -43,15 +43,40 @@ $mark-dark: color.change($accent-dark, $alpha: 0.2); --mark: var(--mark-light); --mark-text: var(--text); --shadow: hsl(0deg 0% 0% / 12.5%); +} - --link-color: var(--action); - --link-active: var(--active); +@mixin dark { + --background-color: var(--darker); + --text-color: var(--light); + --accent-color: var(--accent-light); + --accent-text: var(--background-color); + --complement: var(--complement-light); + --complement-text: var(--background-color); + --mark: var(--mark-dark); + --mark-text: var(--text); + --shadow: hsl(0deg 0% 0% / 25%); } @mixin theme { - @include light; + @include dark; + + @media (prefers-color-scheme: light) { + @include light; + } + + &[data-color-theme="dark"] { + @include dark; + } + + &[data-color-theme="light"] { + @include light; + } // applications of color --action: var(--accent-color); --active: var(--complement); + + // not 100% sure if these are correct to put here + --link-color: var(--action); + --link-active: var(--active); } diff --git a/src/scss/features/_index.scss b/src/scss/features/_index.scss new file mode 100644 index 0000000..1606eb9 --- /dev/null +++ b/src/scss/features/_index.scss @@ -0,0 +1 @@ +@forward 'theme-chooser'; diff --git a/src/scss/features/_theme-chooser.scss b/src/scss/features/_theme-chooser.scss new file mode 100644 index 0000000..e181861 --- /dev/null +++ b/src/scss/features/_theme-chooser.scss @@ -0,0 +1,3 @@ +#theme-chooser { + padding: var(--gap); +} diff --git a/src/scss/rime.scss b/src/scss/rime.scss index 375f19e..0c4055e 100644 --- a/src/scss/rime.scss +++ b/src/scss/rime.scss @@ -1,5 +1,6 @@ @use 'base'; @use 'layout'; +@use 'features'; body { // color: mediumvioletred; From e8f18ccadd96b17fb4f3f900c2f35acc16bd8e95 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Thu, 28 Dec 2023 17:47:35 -0500 Subject: [PATCH 17/30] Unify JS color theme choosing code --- .eleventy.js | 1 - package.json | 2 +- src/_includes/base-page.njk | 5 +---- src/index.njk | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.eleventy.js b/.eleventy.js index 8b416db..8b280f2 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -41,7 +41,6 @@ module.exports = function(eleventyConfig) { // Set custom directories for input eleventyConfig.addPassthroughCopy("src/fonts"); eleventyConfig.addPassthroughCopy("src/img"); eleventyConfig.addPassthroughCopy("src/vid"); - eleventyConfig.addPassthroughCopy("src/js"); eleventyConfig.addPassthroughCopy("src/**/*.txt"); eleventyConfig.addPassthroughCopy("src/favicon.ico"); eleventyConfig.addPassthroughCopy("src/CNAME"); diff --git a/package.json b/package.json index 53bc531..2c20ac2 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "sass": "sass src/scss:docs/css", "watch:sass": "sass --watch src/scss:docs/css", "serve": "npm-run-all -p sass eleventy:serve watch:*", - "js": "esbuild ./src/js --bundle --outfile=docs/js/scripts.js", + "js": "esbuild ./src/js --bundle --minify --outfile=docs/js/scripts.js", "watch:js": "esbuild ./src/js --watch --bundle --outfile=docs/js/scripts.js" }, "repository": { diff --git a/src/_includes/base-page.njk b/src/_includes/base-page.njk index 6fd8305..681f1b5 100644 --- a/src/_includes/base-page.njk +++ b/src/_includes/base-page.njk @@ -28,12 +28,9 @@ {% for script in extra_js %} {% endfor %} + - {% set js %} - {% include "applytheme.js" %} - {% endset %} - {{ content | safe }} diff --git a/src/index.njk b/src/index.njk index 33ba94d..c082a55 100644 --- a/src/index.njk +++ b/src/index.njk @@ -5,8 +5,6 @@ inline_styles: - fonts.css extra_styles: - styles2022.css -extra_js: -- theme.js preloads: - as: font From d88d024fd3719d79eba64f2cb47ea376b512cc60 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Thu, 28 Dec 2023 18:05:30 -0500 Subject: [PATCH 18/30] Add guardians of the galaxy trailer description --- src/post/entwined2023.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/post/entwined2023.md b/src/post/entwined2023.md index 9767b56..57e8ad0 100644 --- a/src/post/entwined2023.md +++ b/src/post/entwined2023.md @@ -15,6 +15,11 @@ enmarta: height: 470 title: The Hermit by Enmarta +guardians: + - iframe: https://www.youtube.com/embed/OeDWjroEPyg?si=axnkXD9J3pmUB2Sb + width: 560 + height: 315 + hoagies: - iframe: https://bandcamp.com/EmbeddedPlayer/album=203876381/size=small/bgcol=ffffff/linkcol=2ebd35/transparent=true/ height: 42 @@ -43,6 +48,12 @@ a significant amount of viola, which one cannot really object to. I struggle to {{ content.figure(enmarta, caption="_The Hermit_ by Enmarta", attrs={class: "popout"}) }} +## Most listened-to ten-second sequence + +I don't know what this says about me but I became, for a brief time, obsessed the music in this trailer for _The Guardians of the Galaxy Volume 3_, which is a somewhat lugubrious symphonic rendition of ["Since You've Been Gone" by Rainbow](https://www.youtube.com/watch?v=1P17ct4e5OE). Specifically, for reasons unknown, I simply had to figure out what the chord progression was for the sequence starting at 1:27, and in particular exactly what the orchestral bass is doing at 1:33, as a guy is thrown into a enormous white sculpture oozing with yellow fluid. + +{{ content.figure(guardians, caption="_Since You've Been Gone_ as imagined by Marvel. The time from 1:27 to 1:35 (or so) proved a hypnotic earworm and quasi-academic pursuit.", attrs={class: "popout"}) }} + {{ content.figure( hoagies, caption='Most important hoagie of the year', From 46c4bef0d464c705793b0e55e4c3380a79d9991c Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sat, 30 Dec 2023 13:15:36 -0500 Subject: [PATCH 19/30] Add opengraph metadata --- .eleventy.js | 2 ++ package-lock.json | 27 +++++++++++++++++++++++++++ package.json | 1 + src/_data/meta.json5 | 6 ++++++ src/_data/site.json5 | 6 ++++++ src/_includes/head/og.njk | 7 +++++++ src/_includes/rime.njk | 1 + src/post/entwined2023.md | 1 + 8 files changed, 51 insertions(+) create mode 100644 src/_data/meta.json5 create mode 100644 src/_data/site.json5 create mode 100644 src/_includes/head/og.njk diff --git a/.eleventy.js b/.eleventy.js index 8b280f2..0caeddf 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,6 +1,7 @@ const { minify } = require('terser'); const CleanCSS = require("clean-css"); const JSON5 = require('json5'); +const pluginRss = require("@11ty/eleventy-plugin-rss"); const configUtils = require('./src/plugins/utils'); const typeUtils = require('./src/plugins/type'); @@ -24,6 +25,7 @@ module.exports = function(eleventyConfig) { // Set custom directories for input }); // plugins + eleventyConfig.addPlugin(pluginRss); eleventyConfig.addPlugin(configUtils); eleventyConfig.addPlugin(typeUtils); diff --git a/package-lock.json b/package-lock.json index 34dd411..a4470f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ }, "devDependencies": { "@11ty/eleventy": "^2.0.1", + "@11ty/eleventy-plugin-rss": "^1.2.0", "clean-css": "^5.3.0", "cssremedy": "^0.1.0-beta.2", "esbuild": "^0.19.10", @@ -114,6 +115,21 @@ "url": "https://opencollective.com/11ty" } }, + "node_modules/@11ty/eleventy-plugin-rss": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@11ty/eleventy-plugin-rss/-/eleventy-plugin-rss-1.2.0.tgz", + "integrity": "sha512-YzFnSH/5pObcFnqZ2sAQ782WmpOZHj1+xB9ydY/0j7BZ2jUNahn53VmwCB/sBRwXA/Fbwwj90q1MLo01Ru0UaQ==", + "dev": true, + "dependencies": { + "debug": "^4.3.4", + "posthtml": "^0.16.6", + "posthtml-urls": "1.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/11ty" + } + }, "node_modules/@11ty/eleventy-upgrade-help": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/@11ty/eleventy-upgrade-help/-/eleventy-upgrade-help-2.0.5.tgz", @@ -3540,6 +3556,17 @@ "ws": "^8.13.0" } }, + "@11ty/eleventy-plugin-rss": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@11ty/eleventy-plugin-rss/-/eleventy-plugin-rss-1.2.0.tgz", + "integrity": "sha512-YzFnSH/5pObcFnqZ2sAQ782WmpOZHj1+xB9ydY/0j7BZ2jUNahn53VmwCB/sBRwXA/Fbwwj90q1MLo01Ru0UaQ==", + "dev": true, + "requires": { + "debug": "^4.3.4", + "posthtml": "^0.16.6", + "posthtml-urls": "1.0.0" + } + }, "@11ty/eleventy-upgrade-help": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/@11ty/eleventy-upgrade-help/-/eleventy-upgrade-help-2.0.5.tgz", diff --git a/package.json b/package.json index 2c20ac2..a5ec659 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "homepage": "https://github.com/chigby/chigby.github.com#readme", "devDependencies": { "@11ty/eleventy": "^2.0.1", + "@11ty/eleventy-plugin-rss": "^1.2.0", "clean-css": "^5.3.0", "cssremedy": "^0.1.0-beta.2", "esbuild": "^0.19.10", diff --git a/src/_data/meta.json5 b/src/_data/meta.json5 new file mode 100644 index 0000000..bd75263 --- /dev/null +++ b/src/_data/meta.json5 @@ -0,0 +1,6 @@ +{ + og: { + locale: "en_US", + type: "website", + }, +} diff --git a/src/_data/site.json5 b/src/_data/site.json5 new file mode 100644 index 0000000..cc75a7f --- /dev/null +++ b/src/_data/site.json5 @@ -0,0 +1,6 @@ +{ + url: "https://chigby.org", + author: "Cameron Higby-Naquin", + title: "Cameron Higby-Naquin", + description: "Games, writing, code, and projects from Cameron Higby-Naquin", +} diff --git a/src/_includes/head/og.njk b/src/_includes/head/og.njk new file mode 100644 index 0000000..f78bbe4 --- /dev/null +++ b/src/_includes/head/og.njk @@ -0,0 +1,7 @@ + + + +{# TODO: og:image #} + + + diff --git a/src/_includes/rime.njk b/src/_includes/rime.njk index 5c2d15b..53fdbb5 100644 --- a/src/_includes/rime.njk +++ b/src/_includes/rime.njk @@ -6,6 +6,7 @@ {{ title }} + {% include 'head/og.njk' %} diff --git a/src/post/entwined2023.md b/src/post/entwined2023.md index 57e8ad0..6d8d4bf 100644 --- a/src/post/entwined2023.md +++ b/src/post/entwined2023.md @@ -1,6 +1,7 @@ --- title: Entwined 2023 layout: rime +description: Year-end musical explorations and reflections on the year 2023. attrs: main: class: content-grid From fa07c2191f1e3fc765f65ed8315754e01e8128e7 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sat, 30 Dec 2023 14:27:56 -0500 Subject: [PATCH 20/30] Add Kalax --- src/post/entwined2023.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/post/entwined2023.md b/src/post/entwined2023.md index 6d8d4bf..890c173 100644 --- a/src/post/entwined2023.md +++ b/src/post/entwined2023.md @@ -21,6 +21,11 @@ guardians: width: 560 height: 315 +kalax: + - iframe: https://bandcamp.com/EmbeddedPlayer/album=393430288/size=large/bgcol=333333/linkcol=fe7eaf/tracklist=false/artwork=small/transparent=true/ + width: 560 + height: 120 + hoagies: - iframe: https://bandcamp.com/EmbeddedPlayer/album=203876381/size=small/bgcol=ffffff/linkcol=2ebd35/transparent=true/ height: 42 @@ -55,6 +60,12 @@ I don't know what this says about me but I became, for a brief time, obsessed th {{ content.figure(guardians, caption="_Since You've Been Gone_ as imagined by Marvel. The time from 1:27 to 1:35 (or so) proved a hypnotic earworm and quasi-academic pursuit.", attrs={class: "popout"}) }} +## Most listened-to for the purpose of chilling out + +Something about these beats just moves slowly, breathes deeply, and wires my brain up for a state of quasi-active (as in, not fully zonked out-of-it) chilled out vibrations. It's good! A very common pick when I'm wanting music but I don't know what to listen to. + +{{ content.figure(kalax, caption="_III_ by Kalax", attrs={class: "popout"}) }} + {{ content.figure( hoagies, caption='Most important hoagie of the year', From 512ace4571fbdf9849770536d4caea44fb41bd7b Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sat, 30 Dec 2023 15:59:15 -0500 Subject: [PATCH 21/30] Rename `--gap` to `--gutter` to avoid overwriting variable Original source of this code is https://ryanmulligan.dev/blog/layout-breakouts/ --- src/scss/layout/_content-grid.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scss/layout/_content-grid.scss b/src/scss/layout/_content-grid.scss index 801b4fd..5bb81c8 100644 --- a/src/scss/layout/_content-grid.scss +++ b/src/scss/layout/_content-grid.scss @@ -1,7 +1,7 @@ .content-grid { - --gap: clamp(1rem, 6vw, 3rem); - --full: minmax(var(--gap), 1fr); - --content: min(50ch, 100% - var(--gap) * 2); + --gutter: clamp(1rem, 6vw, 3rem); + --full: minmax(var(--gutter), 1fr); + --content: min(50ch, 100% - var(--gutter) * 2); --popout: minmax(0, 2rem); --feature: minmax(0, 5rem); From 36d3ae9910f57ec1591e6742afa36f8baf61b1ba Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sat, 30 Dec 2023 16:11:46 -0500 Subject: [PATCH 22/30] Support for multiple gallery items --- src/_includes/content.macros.njk | 12 +++++++----- src/scss/features/_gallery.scss | 23 +++++++++++++++++++++++ src/scss/features/_index.scss | 1 + 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 src/scss/features/_gallery.scss diff --git a/src/_includes/content.macros.njk b/src/_includes/content.macros.njk index 3a11924..e654da6 100644 --- a/src/_includes/content.macros.njk +++ b/src/_includes/content.macros.njk @@ -6,8 +6,10 @@ attrs={} ) -%} {%- set rendered = _render_data(data) -%} + {%- set multi = data and data | length > 1 -%} + {%- set gallery = 'multi' if multi else "" -%}
-
+
{{- rendered | trim | safe -}}
{%- if caption -%} @@ -55,7 +57,7 @@ item.height, item.span ) -}} - {% else %} - {% endif %} - {% endfor %} -{% endmacro %} + {%- else -%} + {%- endif -%} + {%- endfor -%} +{%- endmacro %} diff --git a/src/scss/features/_gallery.scss b/src/scss/features/_gallery.scss new file mode 100644 index 0000000..7e7fd55 --- /dev/null +++ b/src/scss/features/_gallery.scss @@ -0,0 +1,23 @@ +[data-gallery] { + display: grid; + gap: var(--gap, 1em); + + iframe { + width: var(--media-width, 100%); + height: var(--media-height, auto); + } + + :only-child { + grid-column: 1 / -1; + } +} + +[data-gallery="multi"] { + @media (min-width: 35em) { + grid-template-columns: [full-start] repeat(2, minmax(0, 1fr)) [full-end]; + + > * { + grid-column: var(--span); + } + } +} diff --git a/src/scss/features/_index.scss b/src/scss/features/_index.scss index 1606eb9..b4b0184 100644 --- a/src/scss/features/_index.scss +++ b/src/scss/features/_index.scss @@ -1 +1,2 @@ @forward 'theme-chooser'; +@forward 'gallery'; From fb312d35b585e95d9b43c35332f3ca9b550e94e6 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sat, 30 Dec 2023 16:11:59 -0500 Subject: [PATCH 23/30] entwined 2023: Add blizzard lofi music --- src/post/entwined2023.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/post/entwined2023.md b/src/post/entwined2023.md index 890c173..4ff619f 100644 --- a/src/post/entwined2023.md +++ b/src/post/entwined2023.md @@ -16,6 +16,17 @@ enmarta: height: 470 title: The Hermit by Enmarta +blizzlofi: + - iframe: https://www.youtube.com/embed/-uxi6_5cFqw?si=JZvzg8_hbZ0NGqFy + - iframe: https://www.youtube.com/embed/P3n8vT49ueg?si=El9uWH4aepLY05TL + +pop80s: + - iframe: https://www.youtube.com/embed/nNoaXej0Jeg?si=y6ggikCKC22FWE_g + width: 800 + height: 450 + span: full + - iframe + guardians: - iframe: https://www.youtube.com/embed/OeDWjroEPyg?si=axnkXD9J3pmUB2Sb width: 560 @@ -66,6 +77,12 @@ Something about these beats just moves slowly, breathes deeply, and wires my bra {{ content.figure(kalax, caption="_III_ by Kalax", attrs={class: "popout"}) }} +## Ideal soundtrack for grinding gold in Magic Arena (or anything in any game) + +It stands to reason that one of the nerdier instantiations of the "lo-fi beats to chillax/study to" trend would be the one that latched onto me. Very appropriate to pop one of these on (and there [is a lot more](https://www.youtube.com/playlist?list=PLFeA52fxqVTIqDsMhgfNTVwxpSlwjlcDT) where [these came from](https://www.youtube.com/playlist?list=PLY0KbDiiFYeOD_pjiZ3I_RrZzJ2dWAYqj)) and aim oneself at a somewhat pointless yet satisfying goal in some video game and just, let it wash over you. Quite apropriate that the creators of two games that brought "Grinding" into the mainstream would also create a compelling soundtrack for the general-purpose compulsion to do it. + +{{ content.figure(blizzlofi, caption="_World of Warcraft_ and _Diablo_ LoFi beats", attrs={class: "feature"}) }} + {{ content.figure( hoagies, caption='Most important hoagie of the year', From 1dd7b4aaa69d153a2df5e52f146244d702923811 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sat, 30 Dec 2023 17:25:48 -0500 Subject: [PATCH 24/30] entwined 2023: More additions (through 12-19) --- src/post/entwined2023.md | 72 +++++++++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/src/post/entwined2023.md b/src/post/entwined2023.md index 4ff619f..5da5c73 100644 --- a/src/post/entwined2023.md +++ b/src/post/entwined2023.md @@ -20,28 +20,32 @@ blizzlofi: - iframe: https://www.youtube.com/embed/-uxi6_5cFqw?si=JZvzg8_hbZ0NGqFy - iframe: https://www.youtube.com/embed/P3n8vT49ueg?si=El9uWH4aepLY05TL +popAsGenre: + - iframe: https://open.spotify.com/embed/playlist/7fWKjpqifDaYcFCsc30JBJ?utm_source=generator + height: 352 + width: 100% pop80s: - iframe: https://www.youtube.com/embed/nNoaXej0Jeg?si=y6ggikCKC22FWE_g - width: 800 - height: 450 - span: full - - iframe guardians: - iframe: https://www.youtube.com/embed/OeDWjroEPyg?si=axnkXD9J3pmUB2Sb width: 560 height: 315 +bowie: + - iframe: https://www.youtube.com/embed/_a6XVE-upEQ?si=IyBWCQRgQ-Q8j5kX + kalax: - iframe: https://bandcamp.com/EmbeddedPlayer/album=393430288/size=large/bgcol=333333/linkcol=fe7eaf/tracklist=false/artwork=small/transparent=true/ width: 560 height: 120 -hoagies: - - iframe: https://bandcamp.com/EmbeddedPlayer/album=203876381/size=small/bgcol=ffffff/linkcol=2ebd35/transparent=true/ - height: 42 - width: 509 - title: hoagies +taylorSwift: + - iframe: https://www.youtube.com/embed/gp1MR2WAAXY?si=yWRL-15B63Bcw6oF + +ulver: + - iframe: https://www.youtube.com/embed/NcsTTR9tcMk?si=QHQuh5cqYZ_QlsPS + --- {% import "content.macros.njk" as content %} @@ -77,14 +81,52 @@ Something about these beats just moves slowly, breathes deeply, and wires my bra {{ content.figure(kalax, caption="_III_ by Kalax", attrs={class: "popout"}) }} -## Ideal soundtrack for grinding gold in Magic Arena (or anything in any game) +## Pop history anthologies -It stands to reason that one of the nerdier instantiations of the "lo-fi beats to chillax/study to" trend would be the one that latched onto me. Very appropriate to pop one of these on (and there [is a lot more](https://www.youtube.com/playlist?list=PLFeA52fxqVTIqDsMhgfNTVwxpSlwjlcDT) where [these came from](https://www.youtube.com/playlist?list=PLY0KbDiiFYeOD_pjiZ3I_RrZzJ2dWAYqj)) and aim oneself at a somewhat pointless yet satisfying goal in some video game and just, let it wash over you. Quite apropriate that the creators of two games that brought "Grinding" into the mainstream would also create a compelling soundtrack for the general-purpose compulsion to do it. +Good to get in touch with the roots of the world (or what feels like the world) of the music of one's youth, but at an age where one feels less need to apply enormous amounts of judgment. The past couple years, actually, feel like they've been eras of being able to reach back into the past and unseal the latent and suppressed enjoyment of pop music. It feels good, you know? -{{ content.figure(blizzlofi, caption="_World of Warcraft_ and _Diablo_ LoFi beats", attrs={class: "feature"}) }} +{{ content.figure(popAsGenre, caption="Fluxblog's _The Origin of Pop-as-Genre_ Playlist. See also the [accompanying blog post](http://www.fluxblog.org/the-origin-of-pop-as-genre-1976-1996/).", attrs={class: "popout"}) }} + +Also adding this Youtube video which was recommended to me by an algorithm one late night which I did have a hard time turning off once I started it up. + +{{ content.figure(pop80s, caption="_most popular song each month since january 1980_ video -- data source of unknown reliability", attrs={class:"popout"}) }} + +## Year's best re-release of a song using the incredibly powerful I-V-vi-IV chord progression + +What more can one say, really? {{ content.figure( - hoagies, - caption='Most important hoagie of the year', - attrs={class: 'popout'} + taylorSwift, + caption="_Out of the Woods (Taylor's Version)_ by Taylor Swift", + attrs={class: "popout"} ) }} + +## Ideal soundtrack for grinding gold in Magic Arena (or anything in any game) + +It stands to reason that one of the nerdier instantiations of the "lo-fi beats to chillax/study to" trend would be the one that latched onto me. Very appropriate to pop one of these on (and there [is a lot more](https://www.youtube.com/playlist?list=PLFeA52fxqVTIqDsMhgfNTVwxpSlwjlcDT) where [these came from](https://www.youtube.com/playlist?list=PLY0KbDiiFYeOD_pjiZ3I_RrZzJ2dWAYqj)) and aim oneself at a somewhat pointless yet satisfying goal in some video game and just, let it wash over you. Quite apropriate that the creators of two games that brought "Grinding" into the mainstream would also create a compelling soundtrack for the general-purpose compulsion to do it. + +## Web + +> It's the darkest hour, you're 22\ +> The voice of youth, the hour of dread\ +> The darkest hour, and your voice is new\ +> Love is lost, lost is love + +This one is new-to-me this year, and it's probably been around for a while, but when have I ever been on the cutting edge of anything? Sometimes the ephemeral spiderweb that binds us to one another, and to the devouring jaws of time, vibrates on a certain frequency, collects droplets of dew of a certain scent. This year that scent, that vibration, maybe, was something akin to this song. + +> You refuse to talk, but you think like mad\ +> You've cut out your soul and the face of thought\ +> Oh, what have you done? Oh, what have you done?\ +> Oh, what have you done? Oh, what have you done? + +{{ content.figure(bowie, caption="_Love is Lost_ by David Bowie", attrs={class:"popout"})}} + +## Late-breaking entry from a metal legend who now makes 80s pastiche music + +No one told me this came out in the past month. Maybe no one told you either? Anyway, here's what's sure to be the track of the moment from the musical mind that brought you [_Nattens Madrigal_](https://www.youtube.com/watch?v=x3WdtS4FZck). I'm into it! But I also have a soft spot for musical chameleons. + +{{ content.figure(ulver, caption="_Ghost Entry_ by Ulver", attrs={class:"popout"})}} + +## Best scores from movies watched + +{{ content.figure(blizzlofi, caption="_World of Warcraft_ and _Diablo_ LoFi beats", attrs={class: "feature"}) }} From ea074f53ee597c68a321fab7db24cd0fe2631ede Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sat, 30 Dec 2023 17:26:04 -0500 Subject: [PATCH 25/30] Add styles for blockquotes --- src/scss/base/_index.scss | 1 + src/scss/base/_type.scss | 18 ++++++++++++++++++ src/scss/config/_sizes.scss | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 src/scss/base/_type.scss diff --git a/src/scss/base/_index.scss b/src/scss/base/_index.scss index a62f96e..1c7347a 100644 --- a/src/scss/base/_index.scss +++ b/src/scss/base/_index.scss @@ -1,4 +1,5 @@ @forward '../vendor/remedy'; @forward 'root'; @forward 'figure'; +@forward 'type'; @forward 'links'; diff --git a/src/scss/base/_type.scss b/src/scss/base/_type.scss new file mode 100644 index 0000000..a21c15b --- /dev/null +++ b/src/scss/base/_type.scss @@ -0,0 +1,18 @@ +blockquote { + border-inline-start: thick solid var(--border, currentColor); + margin-inline: 0; + padding-inline: var(--gap, 1em); + + > :first-child { + margin-block-start: 0; + } + + > :last-child { + margin-block-end: 0; + } + + > * { + font-size: var(--larger); + font-style: italic; + } +} diff --git a/src/scss/config/_sizes.scss b/src/scss/config/_sizes.scss index c90bb91..6296f78 100644 --- a/src/scss/config/_sizes.scss +++ b/src/scss/config/_sizes.scss @@ -8,4 +8,7 @@ var(--gap) + 4vw, min(var(--gap) * 6, 20vmin) ); + + // font sizes + --larger: 1.2em; } From 24cefd53d0f4a2c903dcdc8866ede3216d7ee727 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sun, 31 Dec 2023 12:34:11 -0500 Subject: [PATCH 26/30] Fix misplaced embed --- src/post/entwined2023.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/post/entwined2023.md b/src/post/entwined2023.md index 5da5c73..e688c1e 100644 --- a/src/post/entwined2023.md +++ b/src/post/entwined2023.md @@ -105,6 +105,8 @@ What more can one say, really? It stands to reason that one of the nerdier instantiations of the "lo-fi beats to chillax/study to" trend would be the one that latched onto me. Very appropriate to pop one of these on (and there [is a lot more](https://www.youtube.com/playlist?list=PLFeA52fxqVTIqDsMhgfNTVwxpSlwjlcDT) where [these came from](https://www.youtube.com/playlist?list=PLY0KbDiiFYeOD_pjiZ3I_RrZzJ2dWAYqj)) and aim oneself at a somewhat pointless yet satisfying goal in some video game and just, let it wash over you. Quite apropriate that the creators of two games that brought "Grinding" into the mainstream would also create a compelling soundtrack for the general-purpose compulsion to do it. +{{ content.figure(blizzlofi, caption="_World of Warcraft_ and _Diablo_ LoFi beats", attrs={class: "feature"}) }} + ## Web > It's the darkest hour, you're 22\ @@ -128,5 +130,3 @@ No one told me this came out in the past month. Maybe no one told you either? {{ content.figure(ulver, caption="_Ghost Entry_ by Ulver", attrs={class:"popout"})}} ## Best scores from movies watched - -{{ content.figure(blizzlofi, caption="_World of Warcraft_ and _Diablo_ LoFi beats", attrs={class: "feature"}) }} From dea977387e5c71c18582e6f5005ee3f62a01d6c3 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sun, 31 Dec 2023 14:46:55 -0500 Subject: [PATCH 27/30] Support embed aspect ratios, make summary/details more discoverable --- src/scss/base/_blocks.scss | 3 +++ src/scss/base/_index.scss | 2 ++ src/scss/base/_media.scss | 13 +++++++++++++ src/scss/features/_gallery.scss | 3 ++- 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/scss/base/_blocks.scss create mode 100644 src/scss/base/_media.scss diff --git a/src/scss/base/_blocks.scss b/src/scss/base/_blocks.scss new file mode 100644 index 0000000..054c05e --- /dev/null +++ b/src/scss/base/_blocks.scss @@ -0,0 +1,3 @@ +summary { + cursor: pointer; +} diff --git a/src/scss/base/_index.scss b/src/scss/base/_index.scss index 1c7347a..d634b4c 100644 --- a/src/scss/base/_index.scss +++ b/src/scss/base/_index.scss @@ -3,3 +3,5 @@ @forward 'figure'; @forward 'type'; @forward 'links'; +@forward 'media'; +@forward 'blocks'; diff --git a/src/scss/base/_media.scss b/src/scss/base/_media.scss new file mode 100644 index 0000000..cf451f0 --- /dev/null +++ b/src/scss/base/_media.scss @@ -0,0 +1,13 @@ +img, +video, +iframe, +picture { + max-width: 100%; + height: auto; + aspect-ratio: auto var(--ratio); +} + +video, +iframe { + --ratio: 16/ 9; +} diff --git a/src/scss/features/_gallery.scss b/src/scss/features/_gallery.scss index 7e7fd55..8ffb04e 100644 --- a/src/scss/features/_gallery.scss +++ b/src/scss/features/_gallery.scss @@ -7,7 +7,8 @@ height: var(--media-height, auto); } - :only-child { + :only-child, + :last-child:nth-child(odd):not([style*='--span'] ~ *) { grid-column: 1 / -1; } } From 4a9114107c5a89b1b5a6fdc2873156b1344beeea Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sun, 31 Dec 2023 16:56:14 -0500 Subject: [PATCH 28/30] Finish adding items to entwined 2023 --- src/post/entwined2023.md | 123 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 6 deletions(-) diff --git a/src/post/entwined2023.md b/src/post/entwined2023.md index e688c1e..1764004 100644 --- a/src/post/entwined2023.md +++ b/src/post/entwined2023.md @@ -15,7 +15,10 @@ enmarta: width: 350 height: 470 title: The Hermit by Enmarta - +opal: + - iframe: https://bandcamp.com/EmbeddedPlayer/album=668906073/size=large/bgcol=ffffff/linkcol=0687f5/tracklist=false/artwork=small/transparent=true/ + height: 406 + width: 100% blizzlofi: - iframe: https://www.youtube.com/embed/-uxi6_5cFqw?si=JZvzg8_hbZ0NGqFy - iframe: https://www.youtube.com/embed/P3n8vT49ueg?si=El9uWH4aepLY05TL @@ -23,7 +26,7 @@ blizzlofi: popAsGenre: - iframe: https://open.spotify.com/embed/playlist/7fWKjpqifDaYcFCsc30JBJ?utm_source=generator height: 352 - width: 100% + width: 650 pop80s: - iframe: https://www.youtube.com/embed/nNoaXej0Jeg?si=y6ggikCKC22FWE_g @@ -36,16 +39,52 @@ bowie: - iframe: https://www.youtube.com/embed/_a6XVE-upEQ?si=IyBWCQRgQ-Q8j5kX kalax: - - iframe: https://bandcamp.com/EmbeddedPlayer/album=393430288/size=large/bgcol=333333/linkcol=fe7eaf/tracklist=false/artwork=small/transparent=true/ - width: 560 + - iframe: https://bandcamp.com/EmbeddedPlayer/album=393430288/size=large/bgcol=333333/linkcol=fe7eaf/tracklist=false/artwork=small/track=4289216201/transparent=true/ + width: 100% height: 120 taylorSwift: - iframe: https://www.youtube.com/embed/gp1MR2WAAXY?si=yWRL-15B63Bcw6oF + height: 315 + width: 560 ulver: - iframe: https://www.youtube.com/embed/NcsTTR9tcMk?si=QHQuh5cqYZ_QlsPS +soundtracks: + - iframe: https://www.youtube.com/embed/Or-c47eFb-Q?si=BJa04U1gWYEIIZpb + width: 800 + height: 450 + span: full + - iframe: https://www.youtube.com/embed/kMYldMdf8ho?si=zSPrmskdbus-VSzh + - iframe: https://www.youtube.com/embed/NpH7_zNjEps?si=b3u5e0oDC96yxvj5 +terminus: + - iframe: https://bandcamp.com/EmbeddedPlayer/album=682779827/size=large/bgcol=333333/linkcol=2ebd35/tracklist=false/artwork=small/track=3179523090/transparent=true/ + height: 120 + width: 100% +danceWithTheDead: + - iframe: https://bandcamp.com/EmbeddedPlayer/album=365385341/size=large/bgcol=333333/linkcol=2ebd35/tracklist=false/artwork=small/track=2773073963/transparent=true/ + width: 100% + height: 406 +biolume: + - iframe: https://bandcamp.com/EmbeddedPlayer/album=3444603941/size=large/bgcol=333333/linkcol=e99708/tracklist=false/artwork=small/track=1142090951/transparent=true/ + width: 100% + height: 406 +longing: + - iframe: https://bandcamp.com/EmbeddedPlayer/album=1075688922/size=large/bgcol=333333/linkcol=ffffff/tracklist=false/artwork=small/transparent=true/ + width: 100% + height: 406 + +ahab: + - iframe: https://bandcamp.com/EmbeddedPlayer/album=3773900352/size=large/bgcol=333333/linkcol=0f91ff/tracklist=false/artwork=small/track=3775860606/transparent=true/ + width: 100% + height: 406 + +feminazgul: + - iframe: https://bandcamp.com/EmbeddedPlayer/album=4160526201/size=large/bgcol=333333/linkcol=fe7eaf/artwork=small/track=3777435019/transparent=true/ + width: 450 + height: 208 + --- {% import "content.macros.njk" as content %} @@ -69,6 +108,12 @@ a significant amount of viola, which one cannot really object to. I struggle to {{ content.figure(enmarta, caption="_The Hermit_ by Enmarta", attrs={class: "popout"}) }} +## Hardest to classify dark ambient + +Weird vibrations in the puce chasm, mirrors facing mirrors, pyramidal concretions of the soul drift as ash, as seedpods, as loci that circumscribe thought and existence. + +{{ content.figure(opal, caption="深淵の反射 by Opal Vessel", attrs={class: "popout"})}} + ## Most listened-to ten-second sequence I don't know what this says about me but I became, for a brief time, obsessed the music in this trailer for _The Guardians of the Galaxy Volume 3_, which is a somewhat lugubrious symphonic rendition of ["Since You've Been Gone" by Rainbow](https://www.youtube.com/watch?v=1P17ct4e5OE). Specifically, for reasons unknown, I simply had to figure out what the chord progression was for the sequence starting at 1:27, and in particular exactly what the orchestral bass is doing at 1:33, as a guy is thrown into a enormous white sculpture oozing with yellow fluid. @@ -85,7 +130,7 @@ Something about these beats just moves slowly, breathes deeply, and wires my bra Good to get in touch with the roots of the world (or what feels like the world) of the music of one's youth, but at an age where one feels less need to apply enormous amounts of judgment. The past couple years, actually, feel like they've been eras of being able to reach back into the past and unseal the latent and suppressed enjoyment of pop music. It feels good, you know? -{{ content.figure(popAsGenre, caption="Fluxblog's _The Origin of Pop-as-Genre_ Playlist. See also the [accompanying blog post](http://www.fluxblog.org/the-origin-of-pop-as-genre-1976-1996/).", attrs={class: "popout"}) }} +{{ content.figure(popAsGenre, caption="Fluxblog's _The Origin of Pop-as-Genre_ Playlist. See also the [accompanying blog post](http://www.fluxblog.org/the-origin-of-pop-as-genre-1976-1996/).", attrs={class: "feature"}) }} Also adding this Youtube video which was recommended to me by an algorithm one late night which I did have a hard time turning off once I started it up. @@ -129,4 +174,70 @@ No one told me this came out in the past month. Maybe no one told you either? {{ content.figure(ulver, caption="_Ghost Entry_ by Ulver", attrs={class:"popout"})}} -## Best scores from movies watched +## Best scores and music from movies watched + +Putting these on here more as "awards" I am "awarding" to particular pieces and less something that I listened to a lot and, as a result, _I_ am receiving some type of award for doing that. The latter is how I'm assuming Spotify "Wrapped" (upon which this exercise is based) works, though I admit I don't really know. Come to think of it, a lot of the entries on this page function more similarly to the former. Well, that's just how it is! + +In any case, here we have (1) Basil Poledouris, composer of the soundtracks for _The Hunt for Red October_ and _Conan: The Barbarian_ at it again with his soundtrack for Paul Verhoeven's early medieval plague-em-up, (2) the slab of stoner sludge that, almost as an afterthought, manifested the movie _Mandy_ out of the force of its own existence, and (3) one of the musical numbers from _Footlight Parade_ (I actually think the youtube version below is truncated---watch the whole movie, it's great) which is just overwhelmingly horny for a movie made like 80+ years ago. + +{{ content.figure(soundtracks, caption="Music from _Flesh + Blood_, _Mandy_, and _Footlight Parade_", attrs={class: "feature"}) }} + +## Earworm that was playing in my head for weeks before I remembered what it was + +Honestly, figuring this out finally was one of the most satisfying feelings I've had all year, which sounds bleaker than it is, but no, figuring out stuff is awesome and proof that my brain still works. + +{{ content.figure(terminus, caption='"Detonation" from _The Wrath of Code_ by Dan Terminus', attrs={class:"popout"})}} + +## Most listened-to synthwave + +The gift that keeps on giving is, at some point in the past, I bought one of those Bandcamp sales where a band gives you like 50%+ off of their entire catalog. And Dance with the Dead's catalog has been very good to me in this regard. But why? It's good Halloween music (and, as well we know, "every day is Halloween"), it's boppy, and if I were writing a blurb for the back of their album, I might write: "It gives even the undead a pulse!" or "The music playing in the tape deck of your 80s station wagon just before it's attacked---by the undead!" or "The best undead creature to crash your Halloween party since 'Monster Mash!'" + +Do CDs have blurbs? I don't think they do. + +{{ content.figure(danceWithTheDead, caption='_The Shape_ by Dance with the Dead', attrs={class:"popout"})}} + +## Ploddingest Metal Melancholy + +Thoroughly funerial with sludge tendencies, a viscous whirlpool, an incantation said in sorrow in the depths of the woods. Truth be told, I do love this kind of music, but it's hard to listen to as much of it as I once did, in the times beyond and before time. So in a way bringing this sort of energy into my life is getting in touch again with my roots. But I no longer _meditate_ on this sort of sound in the way I probably did fifteen years hence. + +{{ content.figure(longing, caption="_Longing_ by Bell Witch", attrs={class: "popout"})}} + +## Deepest Metal Underwater + +I'm not going to say this is a wholly different aesthetic experience than the previous album on this list. I mean, obviously it's not exactly the same. And I will admit to being drawn to this band because of its allusion to _Moby-Dick_, a book which I dearly love. But also, this is a great album, there is some very interesting and novel (to me) stuff going on here, it's not straight plodding doom, it's thoroughly heavy with plodding tendencies. May we be crushed by the pressure of the almighty ocean! + +{{ content.figure(ahab, caption="_The Coral Tombs_ by Ahab", attrs={class: "popout"})}} + +## Hardest to classify Metal + +On the one hand, who cares about classifications? + +On the other hand, that's part of the fun here, right? And is it ever more fun to contemplate how to classify some sound, some song, some album and just have it utterly fail to concretely resolve into anything? Refracting, fading, blurring, but somehow possessing a singular coherent unity of style that reinforces its difficult-to-classify-ability. And I think what I love most here is a key component of its style is a strand of resiliency, of uplifting. Most bands I listen to seem like they want to cut out all such strands from their sound, but here it feels like it's crucial to the art. + +Just listen. Words aren't as valuable. + +Apparently this album is part of a trilogy. Need to get around to absorbing the next two as well. Also, much respect to anyone out there in 2023 making a trilogy of albums. + +{{ content.figure(biolume, caption="_Biolume Part 1_ by Midnight Odyssey", attrs={class: "popout"})}} + +## Blackest Metal Night Before the No-Dawn + +> a spell to invoke Illa, an aspect of death, to remind us of our own fragility so that we may learn to be strong + +I can't resist a Tolkien allusion. No matter how many bands do this, I have no choice but to support it. + +Ending with this one, which is not new to me this year but one I keep on +returning to. I was drawn to it for being the only black metal group +I'm aware of that so prominently features an accordion, but the more I +listened the more fascinating, complex, and wonderful this album +became. It basically has everything I like about black +metal---intensity, atmosphere, thunder, color---but reconfigured in a +way that feels and sounds unlike most of what I'm used to: mournful, +empowered, hope-and-despair entwined. + +> in darkness no one reigns\ +> the night has no king\ +> the night has no queen\ +> in darkness no one reigns + +{{ content.figure(feminazgul, caption="_No Dawn For Men_ by Feminazgul", attrs={class: "popout"})}} From 43203a86f72d5d558e10a62ea75bd24472449b79 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sun, 31 Dec 2023 17:00:35 -0500 Subject: [PATCH 29/30] Add a build script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a5ec659..616db4e 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "watch:sass": "sass --watch src/scss:docs/css", "serve": "npm-run-all -p sass eleventy:serve watch:*", "js": "esbuild ./src/js --bundle --minify --outfile=docs/js/scripts.js", - "watch:js": "esbuild ./src/js --watch --bundle --outfile=docs/js/scripts.js" + "watch:js": "esbuild ./src/js --watch --bundle --outfile=docs/js/scripts.js", + "build": "npm-run-all -p sass js eleventy" }, "repository": { "type": "git", From 02b23098ed78232ccbf554f55152dbbe96c01c18 Mon Sep 17 00:00:00 2001 From: Cameron Higby-Naquin Date: Sun, 31 Dec 2023 17:00:52 -0500 Subject: [PATCH 30/30] Add build output to git --- docs/css/rime.css | 418 ++++++++++++++++++++++++++++++ docs/css/rime.css.map | 1 + docs/elm-elevenses/index.html | 3 +- docs/games/index.html | 3 +- docs/index.html | 5 +- docs/js/scripts.js | 1 + docs/js/theme.js | 11 - docs/no-place/index.html | 3 +- docs/northward/index.html | 3 +- docs/petrichor/index.html | 3 +- docs/post/entwined2023/index.html | 177 +++++++++++++ docs/quiz/index.html | 3 +- docs/ruins/index.html | 3 +- docs/social-media/index.html | 3 +- 14 files changed, 606 insertions(+), 31 deletions(-) create mode 100644 docs/css/rime.css create mode 100644 docs/css/rime.css.map create mode 100644 docs/js/scripts.js delete mode 100644 docs/js/theme.js create mode 100644 docs/post/entwined2023/index.html diff --git a/docs/css/rime.css b/docs/css/rime.css new file mode 100644 index 0000000..534b178 --- /dev/null +++ b/docs/css/rime.css @@ -0,0 +1,418 @@ +/* @docs +label: Core Remedies +version: 0.1.0-beta.2 + +note: | + These remedies are recommended + as a starter for any project. + +category: file +*/ +/* @docs +label: Box Sizing + +note: | + Use border-box by default, globally. + +category: global +*/ +*, ::before, ::after { + box-sizing: border-box; +} + +/* @docs +label: Line Sizing + +note: | + Consistent line-spacing, + even when inline elements have different line-heights. + +links: + - https://drafts.csswg.org/css-inline-3/#line-sizing-property + +category: global +*/ +html { + line-sizing: normal; +} + +/* @docs +label: Body Margins + +note: | + Remove the tiny space around the edge of the page. + +category: global +*/ +body { + margin: 0; +} + +/* @docs +label: Heading Sizes + +note: | + Switch to rem units for headings + +category: typography +*/ +h1 { + font-size: 2rem; +} + +h2 { + font-size: 1.5rem; +} + +h3 { + font-size: 1.17rem; +} + +h4 { + font-size: 1rem; +} + +h5 { + font-size: 0.83rem; +} + +h6 { + font-size: 0.67rem; +} + +/* @docs +label: H1 Margins + +note: | + Keep h1 margins consistent, even when nested. + +category: typography +*/ +h1 { + margin: 0.67em 0; +} + +/* @docs +label: Pre Wrapping + +note: | + Overflow by default is bad... + +category: typography +*/ +pre { + white-space: pre-wrap; +} + +/* @docs +label: Horizontal Rule + +note: | + 1. Solid, thin horizontal rules + 2. Remove Firefox `color: gray` + 3. Remove default `1px` height, and common `overflow: hidden` + +category: typography +*/ +hr { + border-style: solid; + border-width: 1px 0 0; + color: inherit; + height: 0; + overflow: visible; +} + +/* @docs +label: Responsive Embeds + +note: | + 1. Block display is usually what we want + 2. Remove strange space-below when inline + 3. Responsive by default + +category: embedded elements +*/ +img, svg, video, canvas, audio, iframe, embed, object { + display: block; + vertical-align: middle; + max-width: 100%; +} + +/* @docs +label: Aspect Ratios + +note: | + Maintain intrinsic aspect ratios when `max-width` is applied. + `iframe`, `embed`, and `object` are also embedded, + but have no intrinsic ratio, + so their `height` needs to be set explicitly. + +category: embedded elements +*/ +img, svg, video, canvas { + height: auto; +} + +/* @docs +label: Audio Width + +note: | + There is no good reason elements default to 300px, + and audio files are unlikely to come with a width attribute. + +category: embedded elements +*/ +audio { + width: 100%; +} + +/* @docs +label: Image Borders + +note: | + Remove the border on images inside links in IE 10 and earlier. + +category: legacy browsers +*/ +img { + border-style: none; +} + +/* @docs +label: SVG Overflow + +note: | + Hide the overflow in IE 10 and earlier. + +category: legacy browsers +*/ +svg { + overflow: hidden; +} + +/* @docs +label: HTML5 Elements + +note: | + Default block display on HTML5 elements + +category: legacy browsers +*/ +article, aside, figcaption, figure, footer, header, hgroup, main, nav, section { + display: block; +} + +/* @docs +label: Checkbox & Radio Inputs + +note: | + 1. Add the correct box sizing in IE 10 + 2. Remove the padding in IE 10 + +category: legacy browsers +*/ +[type=checkbox], +[type=radio] { + box-sizing: border-box; + padding: 0; +} + +html { + font-family: system-ui, sans-serif; + font-weight: normal; + --dark: #3b4252; + --darker: #2e3440; + --light: #eceff4; + --accent-light: #88c0d0; + --complement-light: #8fbcbb; + --accent-dark: #5e81ac; + --bg-accent-dark: #354050; + --bg-accent-light: #dde8ef; + --complement-dark: #81a1c1; + --mark-light: rgba(136, 192, 208, 0.2); + --mark-dark: rgba(94, 129, 172, 0.2); + --background-color: var(--darker); + --text-color: var(--light); + --accent-color: var(--accent-light); + --accent-text: var(--background-color); + --complement: var(--complement-light); + --complement-text: var(--background-color); + --mark: var(--mark-dark); + --mark-text: var(--text); + --shadow: hsl(0deg 0% 0% / 25%); + --action: var(--accent-color); + --active: var(--complement); + --link-color: var(--action); + --link-active: var(--active); + --gap: 1rem; + --half-gap: calc(var(--gap) / 2); + --shim: calc(var(--gap) / 4); + --half-shim: calc(var(--shim) / 2); + --spacer: clamp( + var(--gap) * 1.5, + var(--gap) + 4vw, + min(var(--gap) * 6, 20vmin) + ); + --larger: 1.2em; + background-color: var(--background-color); + color: var(--text-color); +} +@media (prefers-color-scheme: light) { + html { + --background-color: var(--light); + --text-color: var(--dark); + --accent-color: var(--accent-dark); + --accent-text: var(--background-color); + --complement: var(--complement-dark); + --complement-text: var(--background-color); + --mark: var(--mark-light); + --mark-text: var(--text); + --shadow: hsl(0deg 0% 0% / 12.5%); + } +} +html[data-color-theme=dark] { + --background-color: var(--darker); + --text-color: var(--light); + --accent-color: var(--accent-light); + --accent-text: var(--background-color); + --complement: var(--complement-light); + --complement-text: var(--background-color); + --mark: var(--mark-dark); + --mark-text: var(--text); + --shadow: hsl(0deg 0% 0% / 25%); +} +html[data-color-theme=light] { + --background-color: var(--light); + --text-color: var(--dark); + --accent-color: var(--accent-dark); + --accent-text: var(--background-color); + --complement: var(--complement-dark); + --complement-text: var(--background-color); + --mark: var(--mark-light); + --mark-text: var(--text); + --shadow: hsl(0deg 0% 0% / 12.5%); +} + +figure { + display: grid; + gap: 1em; + margin-inline: 0; + padding: 1em; + background-color: var(--shadow); +} + +blockquote { + border-inline-start: thick solid var(--border, currentColor); + margin-inline: 0; + padding-inline: var(--gap, 1em); +} +blockquote > :first-child { + margin-block-start: 0; +} +blockquote > :last-child { + margin-block-end: 0; +} +blockquote > * { + font-size: var(--larger); + font-style: italic; +} + +a:where(:any-link) { + color: var(--link-color); +} +a:where(:visited) { + color: var(--link-visited, var(--link-color)); +} +a:where(:hover, :focus, :active) { + color: var(--link-active); + background-color: var(--link-active-bg); +} + +img, +video, +iframe, +picture { + max-width: 100%; + height: auto; + aspect-ratio: auto var(--ratio); +} + +video, +iframe { + --ratio: 16/ 9; +} + +summary { + cursor: pointer; +} + +.content-grid { + --gutter: clamp(1rem, 6vw, 3rem); + --full: minmax(var(--gutter), 1fr); + --content: min(50ch, 100% - var(--gutter) * 2); + --popout: minmax(0, 2rem); + --feature: minmax(0, 5rem); + display: grid; + row-gap: 1.5em; + grid-template-columns: [full-start] var(--full) [feature-start] var(--feature) [popout-start] var(--popout) [content-start] var(--content) [content-end] var(--popout) [popout-end] var(--feature) [feature-end] var(--full) [full-end]; +} +.content-grid > * { + grid-column: content; + margin: 0; +} + +.popout { + grid-column: popout; +} + +.feature { + grid-column: feature; +} + +.full { + grid-column: full; +} + +body > footer { + padding: 1rem; + text-align: center; + padding-block-start: 1rem; + border-top: 1.5px solid; +} + +.a-page { + display: grid; + row-gap: var(--spacer); + margin: 0; +} +:where(.a-page) > * { + margin-block: 0; +} + +#theme-chooser { + padding: var(--gap); +} + +[data-gallery] { + display: grid; + gap: var(--gap, 1em); +} +[data-gallery] iframe { + width: var(--media-width, 100%); + height: var(--media-height, auto); +} +[data-gallery] :only-child, +[data-gallery] :last-child:nth-child(odd):not([style*="--span"] ~ *) { + grid-column: 1/-1; +} + +@media (min-width: 35em) { + [data-gallery=multi] { + grid-template-columns: [full-start] repeat(2, minmax(0, 1fr)) [full-end]; + } + [data-gallery=multi] > * { + grid-column: var(--span); + } +} + +/*# sourceMappingURL=rime.css.map */ diff --git a/docs/css/rime.css.map b/docs/css/rime.css.map new file mode 100644 index 0000000..3d401d6 --- /dev/null +++ b/docs/css/rime.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["../../node_modules/cssremedy/css/remedy.css","../../src/scss/base/_root.scss","../../src/scss/config/_colors.scss","../../src/scss/config/_sizes.scss","../../src/scss/base/_figure.scss","../../src/scss/base/_type.scss","../../src/scss/base/_links.scss","../../src/scss/base/_media.scss","../../src/scss/base/_blocks.scss","../../src/scss/layout/_content-grid.scss","../../src/scss/layout/_site-footer.scss","../../src/scss/layout/_body.scss","../../src/scss/features/_theme-chooser.scss","../../src/scss/features/_gallery.scss"],"names":[],"mappings":"AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;AAYA;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAQA;EAAuB;;;AAGvB;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAYA;EAAO;;;AAGP;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAQA;EAAO;;;AAGP;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAQA;EAAK;;;AACL;EAAK;;;AACL;EAAK;;;AACL;EAAK;;;AACL;EAAK;;;AACL;EAAK;;;AAGL;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAQA;EAAK;;;AAGL;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAQA;EAAM;;;AAGN;AAAA;;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;AAUA;EACE;EACA;EACA;EACA;EACA;;;AAIF;AAAA;;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;AAUA;EACE;EACA;EACA;;;AAIF;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;AAWA;EACE;;;AAIF;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;AASA;EAAQ;;;AAGR;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAQA;EAAM;;;AAGN;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAQA;EAAM;;;AAGN;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAQA;EACE;;;AAIF;AAAA;;AAAA;AAAA;AAAA;;AAAA;AAAA;AASA;AAAA;EAEE;EACA;;;AClMF;EACE;EACA;EAGE;EAAA;EAAA;EAAA;EAAA;EAAA;EAAA;EAAA;EAAA;EAAA;EAAA;ECuCF;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAmBA;EACA;EAGA;EACA;EC/EA;EACA;EACA;EACA;EACA;AAAA;AAAA;AAAA;AAAA;EAOA;EFGA;EACA;;AC8CA;ED1DF;ICgCE;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;;AAsBA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAcA;EAlCA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AE5CF;EACE;EACA;EACA;EACA;EAEA;;;ACNF;EACE;EACA;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;;;ACdF;EACE;;AAGF;EACE;;AAGF;EACE;EACA;;;ACXJ;AAAA;AAAA;AAAA;EAIE;EACA;EACA;;;AAGF;AAAA;EAEE;;;ACXF;EACE;;;ACDF;EACE;EACA;EACA;EACA;EACA;EAEA;EACA;EACA,uBACE;;AAQF;EACE;EACA;;;AAIJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AC/BF;EACE;EACA;EACA;EAEA;;;ACLF;EACE;EACA;EACA;;AAEA;EACE;;;ACNJ;EACE;;;ACDF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;AAAA;EAEE;;;AAKF;EADF;IAEI;;EAEA;IACE","file":"rime.css"} \ No newline at end of file diff --git a/docs/elm-elevenses/index.html b/docs/elm-elevenses/index.html index 60373a7..dfa7344 100644 --- a/docs/elm-elevenses/index.html +++ b/docs/elm-elevenses/index.html @@ -10,10 +10,9 @@ + - -

Elm Elevenses ☕ 🍙 🍰

diff --git a/docs/games/index.html b/docs/games/index.html index 79fe7d2..d3f7290 100644 --- a/docs/games/index.html +++ b/docs/games/index.html @@ -8,10 +8,9 @@ + - -
diff --git a/docs/index.html b/docs/index.html index 7229c3d..111ab91 100644 --- a/docs/index.html +++ b/docs/index.html @@ -14,12 +14,9 @@ - - + - -

Cameron Higby‑Naquin

    diff --git a/docs/js/scripts.js b/docs/js/scripts.js new file mode 100644 index 0000000..eae1205 --- /dev/null +++ b/docs/js/scripts.js @@ -0,0 +1 @@ +(()=>{function o(e){["light","dark"].includes(e)?(document.documentElement.dataset.colorTheme=e,localStorage.setItem("theme",e)):e==="system"&&delete document.documentElement.dataset.colorTheme}function m(){let e=localStorage.getItem("theme");if(["light","dark"].includes(e)){document.documentElement.dataset.colorTheme=e;let t=document.getElementById(e);t&&(t.checked=!0)}document.querySelectorAll('input[name="theme-toggle"]').forEach(t=>{t.addEventListener("click",()=>{o(t.value)})})}m();})(); diff --git a/docs/js/theme.js b/docs/js/theme.js deleted file mode 100644 index 64f4457..0000000 --- a/docs/js/theme.js +++ /dev/null @@ -1,11 +0,0 @@ -let storedTheme = localStorage.getItem('theme'); -if (!storedTheme) { storedTheme = '""'; } -let preferredTheme = JSON.parse(storedTheme); -document.querySelectorAll('input[name="theme-toggle"]').forEach(element => { - if (element.value == preferredTheme) { element.checked = true; } - element.addEventListener("change", e => { - e.preventDefault(); - let value = document.querySelector('input[name="theme-toggle"]:checked').value; - window.__setPreferredTheme(value); - }); -}); diff --git a/docs/no-place/index.html b/docs/no-place/index.html index 64f8db5..e627862 100644 --- a/docs/no-place/index.html +++ b/docs/no-place/index.html @@ -9,10 +9,9 @@ + - -
    diff --git a/docs/northward/index.html b/docs/northward/index.html index a6156ac..1ab2a38 100644 --- a/docs/northward/index.html +++ b/docs/northward/index.html @@ -15,10 +15,9 @@ + - -
    diff --git a/docs/petrichor/index.html b/docs/petrichor/index.html index adfd014..4faa3ae 100644 --- a/docs/petrichor/index.html +++ b/docs/petrichor/index.html @@ -9,10 +9,9 @@ + - -
    diff --git a/docs/post/entwined2023/index.html b/docs/post/entwined2023/index.html new file mode 100644 index 0000000..f7bb5de --- /dev/null +++ b/docs/post/entwined2023/index.html @@ -0,0 +1,177 @@ + + + + + + Entwined 2023 + + + + + + + + + + + + +
    +
    + Light/Dark +
    +
    + Color Mode + + + + + + +
    +
    +
    +
    + +
    + +
    +

    Entwined 2023

    +
    +

    Favorite retro/cosmic dark ambient

    +

    New-to-me artist Jim Kirkwood has apparently beem making this kind of +music since time immemorial, so I’m pleased to have been finally +introduced to it. Cosmic, weird, disconcerting: is it dark ambient? +Is it dungeon synth? Can one enter a strange zone-out realm with +enough repeated exposures, as I have done this year? Yes.

    +
    +
    Souls that Dance on The Edge of a Sword
    +

    Favorite new(er) dark ambient

    +

    Using “new” here to mean released in the last ten years. For me, this +album is less about entering a zone-out realm and more about crossing +the threshold of night into a haunting saga—yes, a saga—at once +wistful, isolated, dreaming, wakeful, desolate, still. Also, there is +a significant amount of viola, which one cannot really object to. I struggle to pick a favorite track, but “March of the Priests” and “Apokatástasis II” both rule.

    +
    +
    The Hermit by Enmarta
    +

    Hardest to classify dark ambient

    +

    Weird vibrations in the puce chasm, mirrors facing mirrors, pyramidal concretions of the soul drift as ash, as seedpods, as loci that circumscribe thought and existence.

    +
    +
    深淵の反射 by Opal Vessel
    +

    Most listened-to ten-second sequence

    +

    I don’t know what this says about me but I became, for a brief time, obsessed the music in this trailer for The Guardians of the Galaxy Volume 3, which is a somewhat lugubrious symphonic rendition of “Since You’ve Been Gone” by Rainbow. Specifically, for reasons unknown, I simply had to figure out what the chord progression was for the sequence starting at 1:27, and in particular exactly what the orchestral bass is doing at 1:33, as a guy is thrown into a enormous white sculpture oozing with yellow fluid.

    +
    +
    Since You’ve Been Gone as imagined by Marvel. The time from 1:27 to 1:35 (or so) proved a hypnotic earworm and quasi-academic pursuit.
    +

    Most listened-to for the purpose of chilling out

    +

    Something about these beats just moves slowly, breathes deeply, and wires my brain up for a state of quasi-active (as in, not fully zonked out-of-it) chilled out vibrations. It’s good! A very common pick when I’m wanting music but I don’t know what to listen to.

    +
    +
    III by Kalax
    +

    Pop history anthologies

    +

    Good to get in touch with the roots of the world (or what feels like the world) of the music of one’s youth, but at an age where one feels less need to apply enormous amounts of judgment. The past couple years, actually, feel like they’ve been eras of being able to reach back into the past and unseal the latent and suppressed enjoyment of pop music. It feels good, you know?

    +
    +
    Fluxblog’s The Origin of Pop-as-Genre Playlist. See also the accompanying blog post.
    +

    Also adding this Youtube video which was recommended to me by an algorithm one late night which I did have a hard time turning off once I started it up.

    +
    +
    most popular song each month since january 1980 video – data source of unknown reliability
    +

    Year’s best re-release of a song using the incredibly powerful I-V-vi-IV chord progression

    +

    What more can one say, really?

    +
    +
    Out of the Woods (Taylor’s Version) by Taylor Swift
    +

    Ideal soundtrack for grinding gold in Magic Arena (or anything in any game)

    +

    It stands to reason that one of the nerdier instantiations of the “lo-fi beats to chillax/study to” trend would be the one that latched onto me. Very appropriate to pop one of these on (and there is a lot more where these came from) and aim oneself at a somewhat pointless yet satisfying goal in some video game and just, let it wash over you. Quite apropriate that the creators of two games that brought “Grinding” into the mainstream would also create a compelling soundtrack for the general-purpose compulsion to do it.

    +
    +
    +
    World of Warcraft and Diablo LoFi beats
    +

    Web

    +
    +

    It’s the darkest hour, you’re 22
    +The voice of youth, the hour of dread
    +The darkest hour, and your voice is new
    +Love is lost, lost is love

    +
    +

    This one is new-to-me this year, and it’s probably been around for a while, but when have I ever been on the cutting edge of anything? Sometimes the ephemeral spiderweb that binds us to one another, and to the devouring jaws of time, vibrates on a certain frequency, collects droplets of dew of a certain scent. This year that scent, that vibration, maybe, was something akin to this song.

    +
    +

    You refuse to talk, but you think like mad
    +You’ve cut out your soul and the face of thought
    +Oh, what have you done? Oh, what have you done?
    +Oh, what have you done? Oh, what have you done?

    +
    +
    +
    Love is Lost by David Bowie
    +

    Late-breaking entry from a metal legend who now makes 80s pastiche music

    +

    No one told me this came out in the past month. Maybe no one told you either? Anyway, here’s what’s sure to be the track of the moment from the musical mind that brought you Nattens Madrigal. I’m into it! But I also have a soft spot for musical chameleons.

    +
    +
    Ghost Entry by Ulver
    +

    Best scores and music from movies watched

    +

    Putting these on here more as “awards” I am “awarding” to particular pieces and less something that I listened to a lot and, as a result, I am receiving some type of award for doing that. The latter is how I’m assuming Spotify “Wrapped” (upon which this exercise is based) works, though I admit I don’t really know. Come to think of it, a lot of the entries on this page function more similarly to the former. Well, that’s just how it is!

    +

    In any case, here we have (1) Basil Poledouris, composer of the soundtracks for The Hunt for Red October and Conan: The Barbarian at it again with his soundtrack for Paul Verhoeven’s early medieval plague-em-up, (2) the slab of stoner sludge that, almost as an afterthought, manifested the movie Mandy out of the force of its own existence, and (3) one of the musical numbers from Footlight Parade (I actually think the youtube version below is truncated—watch the whole movie, it’s great) which is just overwhelmingly horny for a movie made like 80+ years ago.

    +
    +
    + +
    Music from Flesh + Blood, Mandy, and Footlight Parade
    +

    Earworm that was playing in my head for weeks before I remembered what it was

    +

    Honestly, figuring this out finally was one of the most satisfying feelings I’ve had all year, which sounds bleaker than it is, but no, figuring out stuff is awesome and proof that my brain still works.

    +
    +
    “Detonation” from The Wrath of Code by Dan Terminus
    +

    Most listened-to synthwave

    +

    The gift that keeps on giving is, at some point in the past, I bought one of those Bandcamp sales where a band gives you like 50%+ off of their entire catalog. And Dance with the Dead’s catalog has been very good to me in this regard. But why? It’s good Halloween music (and, as well we know, “every day is Halloween”), it’s boppy, and if I were writing a blurb for the back of their album, I might write: “It gives even the undead a pulse!” or “The music playing in the tape deck of your 80s station wagon just before it’s attacked—by the undead!” or “The best undead creature to crash your Halloween party since ‘Monster Mash!’”

    +

    Do CDs have blurbs? I don’t think they do.

    +
    +
    The Shape by Dance with the Dead
    +

    Ploddingest Metal Melancholy

    +

    Thoroughly funerial with sludge tendencies, a viscous whirlpool, an incantation said in sorrow in the depths of the woods. Truth be told, I do love this kind of music, but it’s hard to listen to as much of it as I once did, in the times beyond and before time. So in a way bringing this sort of energy into my life is getting in touch again with my roots. But I no longer meditate on this sort of sound in the way I probably did fifteen years hence.

    +
    +
    Longing by Bell Witch
    +

    Deepest Metal Underwater

    +

    I’m not going to say this is a wholly different aesthetic experience than the previous album on this list. I mean, obviously it’s not exactly the same. And I will admit to being drawn to this band because of its allusion to Moby-Dick, a book which I dearly love. But also, this is a great album, there is some very interesting and novel (to me) stuff going on here, it’s not straight plodding doom, it’s thoroughly heavy with plodding tendencies. May we be crushed by the pressure of the almighty ocean!

    +
    +
    The Coral Tombs by Ahab
    +

    Hardest to classify Metal

    +

    On the one hand, who cares about classifications?

    +

    On the other hand, that’s part of the fun here, right? And is it ever more fun to contemplate how to classify some sound, some song, some album and just have it utterly fail to concretely resolve into anything? Refracting, fading, blurring, but somehow possessing a singular coherent unity of style that reinforces its difficult-to-classify-ability. And I think what I love most here is a key component of its style is a strand of resiliency, of uplifting. Most bands I listen to seem like they want to cut out all such strands from their sound, but here it feels like it’s crucial to the art.

    +

    Just listen. Words aren’t as valuable.

    +

    Apparently this album is part of a trilogy. Need to get around to absorbing the next two as well. Also, much respect to anyone out there in 2023 making a trilogy of albums.

    +
    +
    Biolume Part 1 by Midnight Odyssey
    +

    Blackest Metal Night Before the No-Dawn

    +
    +

    a spell to invoke Illa, an aspect of death, to remind us of our own fragility so that we may learn to be strong

    +
    +

    I can’t resist a Tolkien allusion. No matter how many bands do this, I have no choice but to support it.

    +

    Ending with this one, which is not new to me this year but one I keep on +returning to. I was drawn to it for being the only black metal group +I’m aware of that so prominently features an accordion, but the more I +listened the more fascinating, complex, and wonderful this album +became. It basically has everything I like about black +metal—intensity, atmosphere, thunder, color—but reconfigured in a +way that feels and sounds unlike most of what I’m used to: mournful, +empowered, hope-and-despair entwined.

    +
    +

    in darkness no one reigns
    +the night has no king
    +the night has no queen
    +in darkness no one reigns

    +
    +
    +
    No Dawn For Men by Feminazgul
    + + +
    + + + + diff --git a/docs/quiz/index.html b/docs/quiz/index.html index 07ece61..fa37f74 100644 --- a/docs/quiz/index.html +++ b/docs/quiz/index.html @@ -10,10 +10,9 @@ + - -

    Quiz of Monster Quizzes

    diff --git a/docs/ruins/index.html b/docs/ruins/index.html index 2f86e11..9a9ba0c 100644 --- a/docs/ruins/index.html +++ b/docs/ruins/index.html @@ -8,10 +8,9 @@ + - -
    diff --git a/docs/social-media/index.html b/docs/social-media/index.html index f79f1be..e43470e 100644 --- a/docs/social-media/index.html +++ b/docs/social-media/index.html @@ -9,10 +9,9 @@ + - -