diff --git a/.eleventy.js b/.eleventy.js index 7e66811..dcfb05c 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -1,7 +1,7 @@ +import { RenderPlugin, IdAttributePlugin } from "@11ty/eleventy"; import eleventyNavigationPlugin from "@11ty/eleventy-navigation"; import markdownIt from "markdown-it"; import markdownItFootnote from "markdown-it-footnote"; -import markdownItAnchor from "markdown-it-anchor"; import { DateTime } from "luxon"; export default function (eleventyConfig) { @@ -13,18 +13,19 @@ export default function (eleventyConfig) { }; let md = markdownIt(MARKDOWN_OPTIONS) - .use(markdownItFootnote) - .use(markdownItAnchor); + .use(markdownItFootnote); // Libraries eleventyConfig.setLibrary("md", md); // Plugins + eleventyConfig.addPlugin(RenderPlugin); + eleventyConfig.addPlugin(IdAttributePlugin); eleventyConfig.addPlugin(eleventyNavigationPlugin); // Filters eleventyConfig.addFilter("formatDate", (dateObj) => { - return DateTime.fromJSDate(dateObj).toFormat('dd LLL yyyy, HH:mm ZZZZ'); + return DateTime.fromJSDate(dateObj).toFormat("dd LLL yyyy, HH:mm ZZZZ"); }); eleventyConfig.addFilter("mdinline", (content) => { return md.renderInline(content); @@ -34,7 +35,7 @@ export default function (eleventyConfig) { ["src/assets"].forEach((path) => { eleventyConfig.addPassthroughCopy(path); }); - + eleventyConfig.addWatchTarget("./src/assets/css"); return { diff --git a/package-lock.json b/package-lock.json index 6ea7e5a..f8a5e7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,6 @@ "@11ty/eleventy-navigation": "^1.0.4", "luxon": "^3.6.1", "markdown-it": "^14.1.0", - "markdown-it-anchor": "^9.2.0", "markdown-it-footnote": "^4.0.0", "sass": "^1.87.0" }, @@ -653,31 +652,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "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.2", - "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz", - "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==", - "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/a-sync-waterfall": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz", @@ -2831,16 +2805,6 @@ "markdown-it": "bin/markdown-it.mjs" } }, - "node_modules/markdown-it-anchor": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-9.2.0.tgz", - "integrity": "sha512-sa2ErMQ6kKOA4l31gLGYliFQrMKkqSO0ZJgGhDHKijPf0pNFM9vghjAh3gn26pS4JDRs7Iwa9S36gxm3vgZTzg==", - "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", diff --git a/package.json b/package.json index 9450701..449c948 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "@11ty/eleventy-navigation": "^1.0.4", "luxon": "^3.6.1", "markdown-it": "^14.1.0", - "markdown-it-anchor": "^9.2.0", "markdown-it-footnote": "^4.0.0", "sass": "^1.87.0" }, @@ -25,5 +24,5 @@ "@11ty/eleventy": "^3.0.0", "npm-run-all": "^4.1.5" }, - "type":"module" + "type": "module" } diff --git a/scss/main.scss b/scss/main.scss index d1c1296..4f4f46c 100644 --- a/scss/main.scss +++ b/scss/main.scss @@ -13,6 +13,9 @@ body { a { color: var(--color-link); + &:hover { + text-decoration-thickness: 3px; + } } h1, @@ -54,6 +57,11 @@ hr { border: solid var(--color-normal) 2px; border-bottom-width: 5px; border-radius: 5px; + background-color: var(--color-paper); + padding: 10px; + :first-child { + margin-top: 0; + } } .navbar { @@ -63,11 +71,8 @@ hr { gap: 5px; a { @extend .box; - display: inline; width: 100%; - background-color: var(--color-paper); color: var(--color-accent); - padding: 10px; font-weight: bold; text-decoration: none; &:hover { @@ -84,27 +89,38 @@ hr { .page-footer { @extend .box; - background-color: var(--color-paper); - padding: 10px; margin: 5px 0; - :first-child { - margin-top: 0; - } } .site-footer { - @extend .page-footer; + @extend .box; + gap: 5px; margin: 0 0 50px 0; } .page-container { + display: flex; + flex-direction: column; + gap: 5px; main { @extend .box; width: 100%; - background-color: var(--color-paper); - padding: 10px; - :first-child { - margin-top: 0; + } +} + +.home-container { + display: flex; + flex-direction: column; + gap: 5px; + .widget-updates, + .widget-socials { + @extend .box; + } + @include media.breakpoint(medium) { + display: grid; + grid-template-columns: repeat(2, 1fr); + main { + grid-column: 1 / 4; } } } diff --git a/src/404.md b/src/404.md index 8c3d050..124c628 100644 --- a/src/404.md +++ b/src/404.md @@ -1,6 +1,6 @@ --- title: 'Error 404: Not found' -layout: base.njk +layout: default.njk permalink: '404.html' --- diff --git a/src/_data/socials.json b/src/_data/socials.json new file mode 100644 index 0000000..d57ec00 --- /dev/null +++ b/src/_data/socials.json @@ -0,0 +1,38 @@ +[ + { + "label": "Microblogging", + "link": "https://hol.ogra.ph/@gil", + "handle": "@gil@hol.ogra.ph" + }, + { + "label": "Forgejo", + "link": "https://ide.ogra.ph/gil", + "handle": "ide.ogra.ph/gil" + }, + { + "label": "Matrix", + "link": "https://matrix.to/#/@kalanggam:matrix.org", + "handle": "kalanggam:matrix.org" + }, + { + "label": "Pixelfed", + "link": "https://pixelfed.social/kalanggam", + "handle": "pixelfed.social/kalanggam" + }, + { + "label": "Bookwyrm", + "link": "https://bookwyrm.social/user/kalanggam", + "handle": "bookwyrm.social/user/kalanggam" + }, + { + "label": "Bluesky", + "link": "https://bsky.app/profile/kalanggam.bsky.social", + "handle": "kalanggam.bsky.social" + }, + { + "label": "Newsletter", + "link": "https://gilosophies.ghost.io/", + "handle": "gilosophies.ghost.io", + "note": "(forthcoming)" + } +] diff --git a/src/_includes/footer.njk b/src/_includes/footer.njk index 5610439..be5b30e 100644 --- a/src/_includes/footer.njk +++ b/src/_includes/footer.njk @@ -1,6 +1,5 @@ \ No newline at end of file +

Made by me with Eleventy

+ {% include 'theme-switcher.njk' %} + Jump to top + \ No newline at end of file diff --git a/src/_includes/snippets/socials.njk b/src/_includes/snippets/socials.njk index 02ea208..8e883ac 100644 --- a/src/_includes/snippets/socials.njk +++ b/src/_includes/snippets/socials.njk @@ -1,7 +1,13 @@ -**Microblogging** @gil@hol.ogra.ph -**Forgejo** [ide.ogra.ph/gil](https://ide.ogra.ph/gil) -**Matrix** [@kalanggam:matrix.org](https://matrix.to/#/@kalanggam:matrix.org) -**Pixelfed** [pixelfed.social/kalanggam](https://pixelfed.social/kalanggam) -**Bookwyrm** [bookwyrm.social/user/kalanggam](https://bookwyrm.social/user/kalanggam) -**Bluesky** [@kalanggam.bsky.social](https://bsky.app/profile/kalanggam.bsky.social) -**Newsletter** [gilosophies.ghost.io](https://gilosophies.ghost.io/) (forthcoming) \ No newline at end of file +
+ {% for social in socials %} +
+ {{ social.label }} +
+
+ {{ social.handle }} + {% if social.note %} + {{ social.note }} + {% endif %} +
+ {% endfor %} +
\ No newline at end of file diff --git a/src/_includes/snippets/updates.njk b/src/_includes/snippets/updates.njk index 38d17f3..a4856c5 100644 --- a/src/_includes/snippets/updates.njk +++ b/src/_includes/snippets/updates.njk @@ -1,3 +1,6 @@ -{% for update in updates -%} - {{ update.content | mdinline }} -{% endfor %} \ No newline at end of file +

+ {% for update in updates %} + + {{ update.content | mdinline | safe }}
+ {% endfor %} +

\ No newline at end of file diff --git a/src/_layouts/base.njk b/src/_layouts/base.njk index 8e3fef4..30ffab9 100644 --- a/src/_layouts/base.njk +++ b/src/_layouts/base.njk @@ -6,9 +6,7 @@ Skip navigation

Gil•INK

{% include 'nav.njk' %} -
-
{{ content | safe }}
-
+
{{ content | safe }}
{% include 'footer.njk' %} diff --git a/src/_layouts/default.njk b/src/_layouts/default.njk new file mode 100644 index 0000000..aa48214 --- /dev/null +++ b/src/_layouts/default.njk @@ -0,0 +1,5 @@ +--- +layout: base.njk +--- + +
{{ content | safe }}
\ No newline at end of file diff --git a/src/_layouts/home.njk b/src/_layouts/home.njk new file mode 100644 index 0000000..6b06a39 --- /dev/null +++ b/src/_layouts/home.njk @@ -0,0 +1,16 @@ +--- +layout: base.njk +--- + +
+
{{ content | safe }}
+ + + +
\ No newline at end of file diff --git a/src/about.md b/src/about.md index faea622..53388a1 100644 --- a/src/about.md +++ b/src/about.md @@ -1,10 +1,12 @@ --- title: 'About' -layout: base.njk +layout: default.njk lastmod: 2025-02-20T02:11:25.00-06:00 eleventyNavigation: key: 'About' + order: 0 --- +# About * Gil * he/they diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 03bb0f2..683205c 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -65,6 +65,9 @@ body { a { color: var(--color-link); } +a:hover { + text-decoration-thickness: 3px; +} h1, h2, @@ -103,10 +106,17 @@ hr { } } -.box, .page-container main, .page-footer, .site-footer, .navbar a { +.box, .home-container .widget-updates, +.home-container .widget-socials, .page-container main, .site-footer, .page-footer, .navbar a { border: solid var(--color-normal) 2px; border-bottom-width: 5px; border-radius: 5px; + background-color: var(--color-paper); + padding: 10px; +} +.box :first-child, .home-container .widget-updates :first-child, +.home-container .widget-socials :first-child, .page-container main :first-child, .site-footer :first-child, .page-footer :first-child, .navbar a :first-child { + margin-top: 0; } .navbar { @@ -116,11 +126,8 @@ hr { gap: 5px; } .navbar a { - display: inline; width: 100%; - background-color: var(--color-paper); color: var(--color-accent); - padding: 10px; font-weight: bold; text-decoration: none; } @@ -134,26 +141,37 @@ hr { border-bottom-width: 2px; } -.page-footer, .site-footer { - background-color: var(--color-paper); - padding: 10px; +.page-footer { margin: 5px 0; } -.page-footer :first-child, .site-footer :first-child { - margin-top: 0; -} .site-footer { + gap: 5px; margin: 0 0 50px 0; } +.page-container { + display: flex; + flex-direction: column; + gap: 5px; +} .page-container main { width: 100%; - background-color: var(--color-paper); - padding: 10px; } -.page-container main :first-child { - margin-top: 0; + +.home-container { + display: flex; + flex-direction: column; + gap: 5px; +} +@media only screen and (min-width: 768px) { + .home-container { + display: grid; + grid-template-columns: repeat(2, 1fr); + } + .home-container main { + grid-column: 1/4; + } } .muted { diff --git a/src/assets/css/main.css.map b/src/assets/css/main.css.map index dbac5d8..e6846b6 100644 --- a/src/assets/css/main.css.map +++ b/src/assets/css/main.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../../scss/_color.scss","../../../scss/_font.scss","../../../scss/main.scss","../../../scss/_media.scss"],"names":[],"mappings":"AAAA;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAkBA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;ACnCJ;EACI;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;ACdJ;EACE;EACA;EACA,aANU;;;AASZ;EACE;;;AAGF;AAAA;AAAA;AAAA;AAAA;AAAA;EAME,aAlBa;EAmBb;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;;ACrCI;EDmCN;IAII;IACA;;;;AAIJ;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EAEE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;;AAKN;EAEE;EACA;EACA;;AACA;EACE;;;AAIJ;EAEE;;;AAIA;EAEE;EACA;EACA;;AACA;EACE;;;AAKN;EACE","file":"main.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../../scss/_color.scss","../../../scss/_font.scss","../../../scss/main.scss","../../../scss/_media.scss"],"names":[],"mappings":"AAAA;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAkBA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;ACnCJ;EACI;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;ACdJ;EACE;EACA;EACA,aANU;;;AASZ;EACE;;AACA;EACE;;;AAIJ;AAAA;AAAA;AAAA;AAAA;AAAA;EAME,aArBa;EAsBb;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;;ACxCI;EDsCN;IAII;IACA;;;;AAIJ;AAAA;EACE;EACA;EACA;EACA;EACA;;AACA;AAAA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;AACA;EAEE;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;;AAKN;EAEE;;;AAGF;EAEE;EACA;;;AAGF;EACE;EACA;EACA;;AACA;EAEE;;;AAIJ;EACE;EACA;EACA;;AC5GI;EDyGN;IASI;IACA;;EACA;IACE;;;;AAKN;EACE","file":"main.css"} \ No newline at end of file diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index 397d8b7..d6ef57d 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -51,7 +51,6 @@ h3, h4 { img, picture { max-width: 100%; - display: block; } /* Inherit fonts for inputs and buttons */ diff --git a/src/blog/index.md b/src/blog/index.md index d39f240..9ba55b9 100644 --- a/src/blog/index.md +++ b/src/blog/index.md @@ -1,8 +1,9 @@ --- title: 'Blog' -layout: base.njk +layout: default.njk lastmod: 2025-02-20T02:29:17.00-06:00 eleventyNavigation: key: 'Blog' + order: 1 --- - +# Blog \ No newline at end of file diff --git a/src/carry.md b/src/carry.md index 346e07a..4a9815a 100644 --- a/src/carry.md +++ b/src/carry.md @@ -1,6 +1,6 @@ --- title: '/carry' -layout: base.njk +layout: default.njk lastmod: 2025-02-20T02:26:34.00-06:00 eleventyNavigation: key: '/carry' diff --git a/src/changelog.md b/src/changelog.md index 1cb07bb..8ab1d17 100644 --- a/src/changelog.md +++ b/src/changelog.md @@ -1,6 +1,6 @@ --- title: 'Changelog' -layout: base.njk +layout: default.njk lastmod: 2025-04-29T17:38:00.00-05:00 eleventyNavigation: key: 'Changelog' @@ -18,4 +18,5 @@ This is a list of changes to my website, organized by date. ## 0.0.2 (pending) - Added a media query to move the navigation sidebar to the top on smaller screens, to the right on larger screens -- Used fonts [Kurale](https://github.com/etunni/kurale) (display, headers), [Inclusive Sans](https://www.oliviaking.com/inclusivesans) (sans serif, body) \ No newline at end of file +- Used fonts [Kurale](https://github.com/etunni/kurale) (display, headers), [Inclusive Sans](https://www.oliviaking.com/inclusivesans) (sans serif, body) +- Rearranged top-level navigation diff --git a/src/feeds.md b/src/feeds.md index ab61dc9..bf4aaf8 100644 --- a/src/feeds.md +++ b/src/feeds.md @@ -1,6 +1,6 @@ --- title: '/feeds' -layout: base.njk +layout: default.njk lastmod: 2025-02-20T02:26:54.00-06:00 eleventyNavigation: key: '/feeds' diff --git a/src/ideas.md b/src/ideas.md index 7bbad37..daa4aa0 100644 --- a/src/ideas.md +++ b/src/ideas.md @@ -1,6 +1,6 @@ --- title: '/ideas' -layout: base.njk +layout: default.njk lastmod: 2025-02-20T02:26:54.00-06:00 eleventyNavigation: key: '/ideas' diff --git a/src/index.md b/src/index.md index 4ce25a0..068f2cf 100644 --- a/src/index.md +++ b/src/index.md @@ -1,7 +1,7 @@ --- title: 'Gil.Ink' -layout: base.njk -lastmod: 2025-04-28T08:00:00.00-06:00 +layout: home.njk +lastmod: 2025-04-30T01:15:00.00-05:00 eleventyNavigation: key: 'Home' order: -1 @@ -10,19 +10,3 @@ eleventyNavigation: # Howdy! My name's Gil ([he/they](https://en.pronouns.page/@kalanggam)). I write things, make games, and study engineering. I like building community offline and online. - -{% include 'snippets/socials.njk' %} - ---- - -## Updates - -{% include 'snippets/updates.njk' %} - ---- - -## Publications - -2022 Jul 28: ["Dear Mom, Akong Tanan"](https://www.mahalayasf.org/reflections/dear-mom-akong-tanan), _Mahalaya_ - ---- diff --git a/src/links.md b/src/links.md index 34d0af5..09cd446 100644 --- a/src/links.md +++ b/src/links.md @@ -1,8 +1,15 @@ --- -title: '/links' -layout: base.njk -lastmod: 2025-02-20T02:26:54.00-06:00 +title: 'Links' +layout: default.njk +lastmod: 2025-04-30T00:06:00.00-05:00 eleventyNavigation: - key: '/links' - parent: '/slashes' ---- \ No newline at end of file + key: 'Links' + order: 2 +--- +# Links + +## ogra\.ph collective +- [***Kersed***](https://kersed.net/) is my boyfriend Kern's website, and together we co-administer the collective's services. He's also the maintainer of a cool static site generator for webrings called [ringfairy](https://github.com/k3rs3d/ringfairy)! +- [***Rust Red River***](https://rustredriver.com/) is home to Dylan, our resident space engineer, musician, and writer. He's also got [a great album](https://kalviter.bandcamp.com/album/drifter) out on Bandcamp that I highly recommend checking out. + +[![Rust Red River](https://rustredriver.com/assets/webbutton.gif)](https://rustredriver.com/) \ No newline at end of file diff --git a/src/now.md b/src/now.md index 3051e9b..04535a4 100644 --- a/src/now.md +++ b/src/now.md @@ -1,10 +1,9 @@ --- -title: '/now' -layout: base.njk -lastmod: 2025-04-28T08:00:00.00-06:00 +title: "/now" +layout: default.njk +lastmod: 2025-04-30T00:44:00.00-05:00 eleventyNavigation: - key: '/now' - parent: '/slashes' + key: "/now" + parent: "/slashes" --- -{% include 'snippets/updates.njk' %} \ No newline at end of file diff --git a/src/slashes.md b/src/slashes.md index 6283ee6..3327e6c 100644 --- a/src/slashes.md +++ b/src/slashes.md @@ -1,6 +1,6 @@ --- title: '/slashes' -layout: base.njk +layout: default.njk lastmod: 2025-02-20T02:18:58.00-06:00 eleventyNavigation: key: '/slashes' diff --git a/src/tip.md b/src/tip.md index 513e3dc..761eeea 100644 --- a/src/tip.md +++ b/src/tip.md @@ -1,8 +1,8 @@ --- -title: '/tips' -layout: base.njk +title: '/tip' +layout: default.njk lastmod: 2025-02-20T02:26:54.00-06:00 eleventyNavigation: - key: '/tips' + key: '/tip' parent: '/slashes' --- \ No newline at end of file diff --git a/src/uses.md b/src/uses.md index 9129f07..5447321 100644 --- a/src/uses.md +++ b/src/uses.md @@ -1,6 +1,6 @@ --- title: '/uses' -layout: base.njk +layout: default.njk lastmod: 2025-02-20T02:26:54.00-06:00 eleventyNavigation: key: '/uses' diff --git a/src/why.md b/src/why.md index 4135eb0..5d1b587 100644 --- a/src/why.md +++ b/src/why.md @@ -1,6 +1,6 @@ --- title: '/why' -layout: base.njk +layout: default.njk lastmod: 2025-02-20T02:26:54.00-06:00 eleventyNavigation: key: '/why'