From c6127c07e00c83bcc088d3713ee9a87ab0b91d12 Mon Sep 17 00:00:00 2001 From: m1ka Date: Fri, 1 May 2026 03:18:38 +0200 Subject: [PATCH] Change fonts, reimplement qoute system from old m1kadev --- bricks/base-header.thtml | 6 +++++- bricks/extended-footer.thtml | 3 +-- bricks/navbar.thtml | 14 +++++++++----- kethel/lib/bricks.ex | 4 ++-- kethel/package-lock.json | 2 +- pages/blog.fxg | 3 +++ pages/colophon.fxg | 2 +- pages/index.fxg | 4 ++-- scripts/fetch-greet.js | 7 +++++++ scripts/rotate-colon-three.js | 4 ---- static/nowhere.html | 16 ++++++++++++++++ styles/base.css | 35 ++++++++++++++++++++++------------ styles/colophon.css | 11 +++++++++++ styles/index.css | 35 ++++------------------------------ templates/base.thtml | 1 - templates/pages/colophon.thtml | 3 +-- templates/pages/index.thtml | 4 ++-- templates/thoughts.thtml | 4 +--- 18 files changed, 89 insertions(+), 69 deletions(-) create mode 100644 pages/blog.fxg create mode 100644 scripts/fetch-greet.js delete mode 100644 scripts/rotate-colon-three.js create mode 100644 static/nowhere.html create mode 100644 styles/colophon.css diff --git a/bricks/base-header.thtml b/bricks/base-header.thtml index 9734669c1738f1376695a57558c3c3617a5b4f87..71bbc911c38981c4f046c3e085c4bbf6d0d34e1f 100644 --- a/bricks/base-header.thtml +++ b/bricks/base-header.thtml @@ -1,4 +1,8 @@ - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/bricks/extended-footer.thtml b/bricks/extended-footer.thtml index 1765ce810c01c56f17127a9104a18d9902bf7bef..b89c9b2d2cbc32332631540822da4baf28e12145 100644 --- a/bricks/extended-footer.thtml +++ b/bricks/extended-footer.thtml @@ -2,6 +2,5 @@
{{ &extended_build_info }}
All content on this website is licensed under CC-BY-SA-4.0, unless otherwise noted.
-proudly not powered by wordpress. -
+proudly not powered by wordpress diff --git a/bricks/navbar.thtml b/bricks/navbar.thtml index 8bc4be72ce5090c886c5ff6e852df0e52a33a334..6a828afff6f7ff6171135bd6864eae240d0f6107 100644 --- a/bricks/navbar.thtml +++ b/bricks/navbar.thtml @@ -1,18 +1,22 @@
- www.m1kadev.nl + www.m1kadev.nl
diff --git a/kethel/lib/bricks.ex b/kethel/lib/bricks.ex index 4bc0c08109f956d2efbeaafbff1f2e01468ef3f9..61bebfa5f1624be879ca2a3639cc88c8187b861b 100644 --- a/kethel/lib/bricks.ex +++ b/kethel/lib/bricks.ex @@ -29,8 +29,8 @@ defmodule Bricks do """ extended_footer = """ - Built from commit #{git_commit |> String.trim()}, using lightningcss #{lcss_version |> String.trim()}, - html-minifier-next version #{hmn_version |> String.trim()}, uglifyjs version #{ujs_version |> String.trim()}, on #{e_build_date |> String.trim()}. + Built from commit #{git_commit |> String.trim()}, using #{lcss_version |> String.trim()}, + html-minifier-next version #{hmn_version |> String.trim()}, #{ujs_version |> String.trim()}, on #{e_build_date |> String.trim()}. """ Map.merge(%{build_info: footer, extended_build_info: extended_footer}, from_files) diff --git a/kethel/package-lock.json b/kethel/package-lock.json index 88c8118395de8e807ea422785b6c5de26870c14f..db7a63ad808fab6fd453b7bb5af33d027603dc02 100644 --- a/kethel/package-lock.json +++ b/kethel/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "kethel", "version": "0.1.0", - "license": "MIT", + "license": "AGPL-3.0-or-later", "dependencies": { "html-minifier-next": "^4.17.0", "lightningcss-cli": "^1.30.2", diff --git a/pages/blog.fxg b/pages/blog.fxg new file mode 100644 index 0000000000000000000000000000000000000000..f9b8912635c297108d78ba85f4519102fc76cd6e --- /dev/null +++ b/pages/blog.fxg @@ -0,0 +1,3 @@ +===== blog ===== + +comic son :) diff --git a/pages/colophon.fxg b/pages/colophon.fxg index 301d1065849e2fc566c486b2a0b23083b483903a..30e57081af3516f58fbb1e259b02bf8830ac1c7e 100644 --- a/pages/colophon.fxg +++ b/pages/colophon.fxg @@ -4,7 +4,7 @@ you're looking at a <#https://en.wiktionary.org/wiki/beautiful#English beautiful ===== fonts ===== -this website is intended to be set in //New York//, an <#https://developer.apple.com/fonts/ Apple system font>, with Georgia, and then the CSS standard serif fonts, as fallback fonts for sans-serif fonts, i use //SF Pro//, also an Apple system font, with //Tahoma//, and then the CSS sans-serif as fallback fonts. +this website's main text is set in //Merriweather//, a serif font optimised for screens. All headers and other sans-serif elements are set in //Geom//. ===== technical ===== diff --git a/pages/index.fxg b/pages/index.fxg index 3b91a58b5bf77b9029b0b39598ad920a72f91ab3..aff82615c502d388ed7751485698f5586cbdc2d6 100644 --- a/pages/index.fxg +++ b/pages/index.fxg @@ -1,6 +1,6 @@ -====== haii :3 i'm mika !! ====== +====== haii !! i'm mika! ====== -haii! i'm mika (also //m1ka//, //m1kadev//). i'm a (mostly backend) developer from <#https://wikipedia.org/wiki/The_Netherlands The Netherlands>. besides programming, i also like to play music and cook. +haii! i'm mika (also sometimes //m1ka//, //m1kadev//). i'm a (mostly backend) developer from <#https://wikipedia.org/wiki/The_Netherlands The Netherlands>. besides programming, i also like to play music and cook. ===== about me ===== diff --git a/scripts/fetch-greet.js b/scripts/fetch-greet.js new file mode 100644 index 0000000000000000000000000000000000000000..c0b2ddfcc90d15708996cdccc9aa20f0633cc57c --- /dev/null +++ b/scripts/fetch-greet.js @@ -0,0 +1,7 @@ +// TOOD: proper CORS-ing on api.m1kadev.bl +addEventListener("DOMContentLoaded", async ev => { + const greetElement = document.getElementById("greet"); + const request = await fetch("https://api.m1kadev.nl/greet"); + const repsonse = await request.json(); + greetElement.innerHTML = repsonse.qoute; // this is misspelled in the prod api LMAAO +}); \ No newline at end of file diff --git a/scripts/rotate-colon-three.js b/scripts/rotate-colon-three.js deleted file mode 100644 index c1214bbff5ba0cd3e5e5fcf05bc91a64e308cf7a..0000000000000000000000000000000000000000 --- a/scripts/rotate-colon-three.js +++ /dev/null @@ -1,4 +0,0 @@ -addEventListener("DOMContentLoaded", _ => { - const header = document.getElementsByTagName("main").item(0).children[0]; - header.innerHTML = "haii 3 i'm mika !!"; -}); \ No newline at end of file diff --git a/static/nowhere.html b/static/nowhere.html new file mode 100644 index 0000000000000000000000000000000000000000..d6336e39d4c7a501cf3f6c1f37f3bbcd3df262f0 --- /dev/null +++ b/static/nowhere.html @@ -0,0 +1,16 @@ + + + + 404 Not Found + + + +
+

404 Not Found

+
+
+
nginx/1.28.3
+

<- return

+ + + \ No newline at end of file diff --git a/styles/base.css b/styles/base.css index c953e16b59bd1b1a1c7ab29c6535456dff848386..cc95495873b827800b17b7fddd708ad328600747 100644 --- a/styles/base.css +++ b/styles/base.css @@ -1,9 +1,9 @@ :root { - --serif-font: "New York", "Georgia", serif; - --sans-serif-font: "SF Pro", "Tahoma", sans-serif; + --serif-font: "Merriweather", serif; + --sans-serif-font: "Geom", sans-serif; color-scheme: light dark; - --fg-color: light-dark(#0A0A0A, #FFFFFF); - --bg-color: light-dark(#e9e9e9, #1c1c1d); + --fg-color: light-dark(#0A0A0A, #eee); + --bg-color: light-dark(#e9e9e9, #212121); --accent-color: #ee41b4; } @@ -25,8 +25,9 @@ h6 { margin: 0; border-bottom: .1rem solid var(--fg-color); padding: .5rem; - font-weight: normal; + font-weight: 500; font-style: italic; + font-stretch: condensed; } a { @@ -53,12 +54,12 @@ header { margin-left: auto; } -#wordmark>span>i { +#wordmark>span>span { text-align: left; display: block; } -#wordmark>span>span { +#wordmark>span>i { text-align: left; display: block; font-family: var(--sans-serif-font); @@ -129,6 +130,10 @@ img#codeberg { @media (min-width: 900px) { + footer>#build-info { + padding: 0; + } + .link-group { flex-direction: column; padding: .5rem; @@ -174,17 +179,23 @@ img#codeberg { footer { padding: .5rem; + border-bottom: .1rem solid var(--fg-color); + display: flex; } footer>#build-info { - display: inline; - padding-right: calc(-450px + 100%); + width: 450px; + display: inline-block; } footer>#links { border-top: 0 solid transparent; - display: inline; - float: right; + display: inline-block; + padding: 0; + margin-top: auto; + margin-bottom: auto; + margin-left: auto; + padding-right: .5em; } -} +} \ No newline at end of file diff --git a/styles/colophon.css b/styles/colophon.css new file mode 100644 index 0000000000000000000000000000000000000000..80fb497a7cff456b68b507f0fae89bcd1d981cc6 --- /dev/null +++ b/styles/colophon.css @@ -0,0 +1,11 @@ +@keyframes blink { + 50% { + opacity: 0; + } +} + +footer>div::after { + content: "_"; + font-family: var(--sans-serif-font); + animation: blink 1s steps(1) infinite; +} \ No newline at end of file diff --git a/styles/index.css b/styles/index.css index 37fca593c1e5934b1573c39e5793c4f17ab96750..ec2eb3c140c8b7ff9d37f8f98dd842f9a433c4e3 100644 --- a/styles/index.css +++ b/styles/index.css @@ -1,32 +1,5 @@ -@keyframes rotate { - 0% { - transform: rotate(90deg) scaleY(-1); - } - - 50% { - transform: rotate(90deg) scaleY(1); - } - - 100% { - transform: rotate(90deg) scaleY(-1); - } -} - -#colon-three { - display: inline-block; - font-style: normal; - font-family: "Comic Sans MS", "Comic Sans", "Comic Neue", sans-serif; - - animation-name: rotate; - animation-duration: 90s; - animation-iteration-count: infinite; - animation-timing-function: steps(1); -} - -#colon-three::before { - content: ":"; -} - -#colon-three:hover::before { - content: ";"; +#greet { + writing-mode: vertical-rl; + border-bottom: 0; + border-left: .1rem solid var(--fg-color); } \ No newline at end of file diff --git a/templates/base.thtml b/templates/base.thtml index d3758d4d5edb33f5874a11bb7bafaeed69b60dcc..f41a7859f188e9c65553c0cb0c148af4a5d96487 100644 --- a/templates/base.thtml +++ b/templates/base.thtml @@ -3,7 +3,6 @@ {{ &base_header }} - {{ location }} - m1kadev {{ &ogp }} diff --git a/templates/pages/colophon.thtml b/templates/pages/colophon.thtml index 9d366436a73662194b0223b4ca583c4e87ea6660..05196cc3db4570dba44521caebc30efe2b3d8a81 100644 --- a/templates/pages/colophon.thtml +++ b/templates/pages/colophon.thtml @@ -5,8 +5,7 @@ {{ &base_header }} {{ location }} - m1kadev {{ &ogp }} - - + diff --git a/templates/pages/index.thtml b/templates/pages/index.thtml index b083845037d6bafb1e1006bb34934f44d593fd36..031cd1dcf15b4aa556dc3eaf855e006f2a40f39b 100644 --- a/templates/pages/index.thtml +++ b/templates/pages/index.thtml @@ -3,14 +3,13 @@ {{ &base_header }} - - + {{ location }} - m1kadev {{ &ogp }} @@ -22,5 +21,6 @@ {{ &fxg_content }} {{ &footer }} +

placehoders are nice :)

\ No newline at end of file diff --git a/templates/thoughts.thtml b/templates/thoughts.thtml index dbac7da06cb320b2a804cbc6126501fcc58024e7..f9c72131b45c3a4393a4e3ad9564038600721a4a 100644 --- a/templates/thoughts.thtml +++ b/templates/thoughts.thtml @@ -14,9 +14,7 @@

my thoughts :3

{{ &fxg_content }} - + {{ &footer }}
\ No newline at end of file