From 0b73169fa46a2af9f6620f0247ec762325d086c0 Mon Sep 17 00:00:00 2001 From: gil Date: Mon, 8 Jul 2024 00:17:58 -0500 Subject: [PATCH] Change fonts, update README --- .eleventy.js | 10 +- .gitignore | 1 + README.md | 8 +- package-lock.json | 43 ++++++++ package.json | 4 +- src/_includes/layouts/article.njk | 4 +- src/_includes/partials/footer.njk | 2 +- src/about.md | 2 - src/blog/2024/liberation-1.md | 8 ++ src/blog/blog.json | 4 + src/blog/index.md | 25 +++++ src/journal/2024/2024-07-07.md | 10 ++ src/journal/finally-updating-my-website.md | 8 -- src/journal/index.md | 9 +- src/journal/journal.json | 3 +- src/res/css/global.css | 32 +++++- src/res/css/global.css.map | 2 +- src/res/font/AtkinsonHyperlegible-Bold.ttf | Bin 0 -> 54444 bytes .../font/AtkinsonHyperlegible-BoldItalic.ttf | Bin 0 -> 54608 bytes src/res/font/AtkinsonHyperlegible-Italic.ttf | Bin 0 -> 54200 bytes src/res/font/AtkinsonHyperlegible-Regular.ttf | Bin 0 -> 53504 bytes src/res/font/OFL.txt | 93 ++++++++++++++++++ src/res/font/alkhemikal.ttf | Bin 44728 -> 0 bytes src/res/scss/_vars.scss | 2 + src/res/scss/global.scss | 2 +- src/res/scss/modules/_fonts.scss | 43 ++++++++ todo sections/blog/index.md | 2 +- todo sections/poems/index.md | 2 +- 28 files changed, 291 insertions(+), 28 deletions(-) create mode 100644 src/blog/2024/liberation-1.md create mode 100644 src/blog/blog.json create mode 100644 src/blog/index.md create mode 100644 src/journal/2024/2024-07-07.md delete mode 100644 src/journal/finally-updating-my-website.md create mode 100644 src/res/font/AtkinsonHyperlegible-Bold.ttf create mode 100644 src/res/font/AtkinsonHyperlegible-BoldItalic.ttf create mode 100644 src/res/font/AtkinsonHyperlegible-Italic.ttf create mode 100644 src/res/font/AtkinsonHyperlegible-Regular.ttf create mode 100644 src/res/font/OFL.txt delete mode 100644 src/res/font/alkhemikal.ttf diff --git a/.eleventy.js b/.eleventy.js index d09d256..18fbf3b 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,5 +1,7 @@ const eleventyNavigationPlugin = require("@11ty/eleventy-navigation"); const markdownIt = require("markdown-it"); +const markdownItFootnote = require("markdown-it-footnote"); +const markdownItAnchor = require("markdown-it-anchor"); const { DateTime } = require("luxon"); const MARKDOWN_OPTIONS = { @@ -9,7 +11,9 @@ const MARKDOWN_OPTIONS = { typographer: true, }; -const md = new markdownIt(MARKDOWN_OPTIONS); +const md = new markdownIt(MARKDOWN_OPTIONS) + .use(markdownItFootnote) + .use(markdownItAnchor); module.exports = function (eleventyConfig) { // Libraries @@ -19,8 +23,8 @@ module.exports = function (eleventyConfig) { eleventyConfig.addPlugin(eleventyNavigationPlugin); // Filters - eleventyConfig.addFilter("formatDate", (dateObj) => { - return DateTime.fromJSDate(dateObj).toFormat("y'-'LL'-'dd' 'HH':'mm"); + eleventyConfig.addFilter("formatDate", (dateObj, format) => { + return DateTime.fromJSDate(dateObj).toFormat(format); }); // Passthrough copies diff --git a/.gitignore b/.gitignore index 9922145..4870f9c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules _site public desktop.ini +.vscode \ No newline at end of file diff --git a/README.md b/README.md index a382331..486086f 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ - [ ] Do some i18n? (e.g., English, German, Tagalog, Bisaya, Spanish, etc.) - [ ] Add more graphical stuff to site so it doesn't look so bland - [ ] Banner image - - [ ] Landing background - - [ ] Landing link icons - [ ] Global background - [ ] Custom badge - [ ] Make a webring with ringfairy and join webrings @@ -33,3 +31,9 @@ - Refactored base template - Switched layout back to CSS flex - Created `theme-default`, which provides default theming based on browser preference + +## 0.0.4 + +- Removed landing page +- Added `markdown-it-anchor` and `markdown-it-footnote` for header anchors and footnotes respectively +- Changed date parsing filter diff --git a/package-lock.json b/package-lock.json index fe1fe3d..1b6a370 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,8 @@ "license": "ISC", "dependencies": { "markdown-it": "^14.1.0", + "markdown-it-anchor": "^9.0.1", + "markdown-it-footnote": "^4.0.0", "npm": "^10.8.0" }, "devDependencies": { @@ -327,6 +329,31 @@ "node": ">=8" } }, + "node_modules/@types/linkify-it": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==", + "license": "MIT", + "peer": true + }, + "node_modules/@types/markdown-it": { + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.1.tgz", + "integrity": "sha512-4NpsnpYl2Gt1ljyBGrKMxFYAYvpqbnnkgP/i/g+NLpjEUa3obn1XJCur9YbEXKDAkaXqsR1LbDnGEJ0MmKFxfg==", + "license": "MIT", + "peer": true, + "dependencies": { + "@types/linkify-it": "^5", + "@types/mdurl": "^2" + } + }, + "node_modules/@types/mdurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==", + "license": "MIT", + "peer": true + }, "node_modules/@types/minimatch": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", @@ -2111,6 +2138,22 @@ "markdown-it": "bin/markdown-it.mjs" } }, + "node_modules/markdown-it-anchor": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-9.0.1.tgz", + "integrity": "sha512-cBt7aAzmkfX8X7FqAe8EBryiKmToXgMQEEMqkXzWCm0toDtfDYIGboKeTKd8cpNJArJtutrf+977wFJTsvNGmQ==", + "license": "Unlicense", + "peerDependencies": { + "@types/markdown-it": "*", + "markdown-it": "*" + } + }, + "node_modules/markdown-it-footnote": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/markdown-it-footnote/-/markdown-it-footnote-4.0.0.tgz", + "integrity": "sha512-WYJ7urf+khJYl3DqofQpYfEYkZKbmXmwxQV8c8mO/hGIhgZ1wOe7R4HLFNwqx7TjILbnC98fuyeSsin19JdFcQ==", + "license": "MIT" + }, "node_modules/markdown-it/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", diff --git a/package.json b/package.json index 97725b3..2da08df 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gils-nexus", - "version": "0.0.3", + "version": "0.0.4", "description": "", "main": "index.js", "scripts": { @@ -23,6 +23,8 @@ }, "dependencies": { "markdown-it": "^14.1.0", + "markdown-it-anchor": "^9.0.1", + "markdown-it-footnote": "^4.0.0", "npm": "^10.8.0" } } diff --git a/src/_includes/layouts/article.njk b/src/_includes/layouts/article.njk index c3f8dcb..63b1520 100644 --- a/src/_includes/layouts/article.njk +++ b/src/_includes/layouts/article.njk @@ -6,8 +6,8 @@ layout: layouts/base.njk
{% if page.date -%} -