diff --git a/package-lock.json b/package-lock.json index 0dfc77f..7583be0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "10.7.5", + "version": "10.8.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "10.7.5", + "version": "10.8.5", "license": "MIT", "dependencies": { "minisearch": "^7.1.2", @@ -38,7 +38,7 @@ "prettier": "3.5.3", "rimraf": "^6.0.1", "sql-formatter": "15.6.5", - "terser": "^5.43.0", + "terser": "^5.43.1", "truncate-html": "^1.2.2" }, "engines": { @@ -1681,9 +1681,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.170", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.170.tgz", - "integrity": "sha512-GP+M7aeluQo9uAyiTCxgIj/j+PrWhMlY7LFVj8prlsPljd0Fdg9AprlfUi+OCSFWy9Y5/2D/Jrj9HS8Z4rpKWA==", + "version": "1.5.171", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.171.tgz", + "integrity": "sha512-scWpzXEJEMrGJa4Y6m/tVotb0WuvNmasv3wWVzUAeCgKU0ToFOhUW6Z+xWnRQANMYGxN4ngJXIThgBJOqzVPCQ==", "dev": true, "license": "ISC" }, @@ -5564,9 +5564,9 @@ } }, "node_modules/terser": { - "version": "5.43.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.0.tgz", - "integrity": "sha512-CqNNxKSGKSZCunSvwKLTs8u8sGGlp27sxNZ4quGh0QeNuyHM0JSEM/clM9Mf4zUp6J+tO2gUXhgXT2YMMkwfKQ==", + "version": "5.43.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.1.tgz", + "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { diff --git a/package.json b/package.json index 5d71018..c45c409 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "10.7.5", + "version": "10.8.5", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "engines": { @@ -67,7 +67,7 @@ "prettier": "3.5.3", "rimraf": "^6.0.1", "sql-formatter": "15.6.5", - "terser": "^5.43.0", + "terser": "^5.43.1", "truncate-html": "^1.2.2" } } diff --git a/src/assets/fonts/dm-bold-italic.woff2 b/src/assets/fonts/dm-bold-italic.woff2 deleted file mode 100644 index 8754b7c..0000000 Binary files a/src/assets/fonts/dm-bold-italic.woff2 and /dev/null differ diff --git a/src/assets/fonts/dm-bold.woff2 b/src/assets/fonts/dm-bold.woff2 deleted file mode 100644 index 8897792..0000000 Binary files a/src/assets/fonts/dm-bold.woff2 and /dev/null differ diff --git a/src/assets/fonts/dm-regular-italic.woff2 b/src/assets/fonts/dm-regular-italic.woff2 deleted file mode 100644 index b880c89..0000000 Binary files a/src/assets/fonts/dm-regular-italic.woff2 and /dev/null differ diff --git a/src/assets/fonts/dm-regular.woff2 b/src/assets/fonts/dm-regular.woff2 deleted file mode 100644 index 1a8e71c..0000000 Binary files a/src/assets/fonts/dm-regular.woff2 and /dev/null differ diff --git a/src/assets/fonts/ml.woff2 b/src/assets/fonts/ml.woff2 deleted file mode 100644 index d7fa24f..0000000 Binary files a/src/assets/fonts/ml.woff2 and /dev/null differ diff --git a/src/assets/scripts/sw.js b/src/assets/scripts/sw.js index 2758912..38a6ab3 100644 --- a/src/assets/scripts/sw.js +++ b/src/assets/scripts/sw.js @@ -3,9 +3,6 @@ const staticAssets = [ "/assets/styles/index.css", "/assets/styles/noscript.css", "/assets/fonts/sg.woff2", - "/assets/fonts/dm.woff2", - "/assets/fonts/dmi.woff2", - "/assets/fonts/ml.woff2", "/assets/scripts/index.js", "/assets/scripts/components/select-pagination.js" ]; diff --git a/src/assets/styles/base/fonts.css b/src/assets/styles/base/fonts.css index d31d229..40fd84e 100644 --- a/src/assets/styles/base/fonts.css +++ b/src/assets/styles/base/fonts.css @@ -5,43 +5,3 @@ font-style: normal; font-display: swap; } - -@font-face { - font-family: "DM Sans"; - src: url("/assets/fonts/dm-regular.woff2") format("woff2"); - font-weight: 400; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: "DM Sans"; - src: url("/assets/fonts/dm-bold.woff2") format("woff2"); - font-weight: 700; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: "DM Sans"; - src: url("/assets/fonts/dm-regular-italic.woff2") format("woff2"); - font-weight: 400; - font-style: italic; - font-display: optional; -} - -@font-face { - font-family: "DM Sans"; - src: url("/assets/fonts/dm-bold-italic.woff2") format("woff2"); - font-weight: 700; - font-style: italic; - font-display: optional; -} - -@font-face { - font-family: "MonoLisa"; - src: url("/assets/fonts/ml.woff2") format("woff2"); - font-weight: 400; - font-style: normal; - font-display: swap; -} diff --git a/src/assets/styles/base/vars.css b/src/assets/styles/base/vars.css index 46c515d..af6eec7 100644 --- a/src/assets/styles/base/vars.css +++ b/src/assets/styles/base/vars.css @@ -71,10 +71,11 @@ --border-gray: 1px solid var(--gray-light); /* fonts */ - --font-body: "DM Sans", Helvetica Neue, Helvetica, Arial, system-ui, sans-serif; + --font-body: + -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, Adwaita Sans, + Cantarell, Ubuntu, roboto, noto, helvetica, arial, sans-serif; --font-heading: "Space Grotesk", "Arial Black", "Arial Bold", Gadget, sans-serif; - --font-code: - "MonoLisa", SFMono-Regular, Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace; + --font-code: Menlo, Consolas, Monaco, Adwaita Mono, Liberation Mono, Lucida Console, monospace; /* text */ --font-size-xs: 0.7rem; diff --git a/src/assets/styles/plugins/prism.css b/src/assets/styles/plugins/prism.css index e0c118c..10a5911 100644 --- a/src/assets/styles/plugins/prism.css +++ b/src/assets/styles/plugins/prism.css @@ -11,7 +11,7 @@ pre { word-spacing: normal; word-break: normal; word-wrap: normal; - line-height: var(--line-height-md); + line-height: var(--line-height-base); tab-size: 2; hyphens: none; } diff --git a/src/layouts/base.liquid b/src/layouts/base.liquid index 8a54321..20fe373 100644 --- a/src/layouts/base.liquid +++ b/src/layouts/base.liquid @@ -9,20 +9,6 @@ type="font/woff2" crossorigin="anonymous" > - -