From bb9436fee3dc00ac845bd9a54cd4ffd55c90adf3 Mon Sep 17 00:00:00 2001 From: wires Date: Tue, 1 Apr 2025 19:54:42 -0400 Subject: [PATCH] lots more little typography tweaks --- assets/style.css | 126 ++++++++++-------- assets/syntax.css | 2 +- content/_index.md | 4 +- content/zosimos/workflow.md | 10 +- .../_default/_markup/render-codeblock.html | 2 +- layouts/_default/single.html | 4 +- layouts/_default/taxonomy.html | 2 +- layouts/_default/term.html | 5 +- layouts/partials/head.html | 2 + 9 files changed, 89 insertions(+), 68 deletions(-) diff --git a/assets/style.css b/assets/style.css index 200f8d3..167c29e 100644 --- a/assets/style.css +++ b/assets/style.css @@ -28,42 +28,13 @@ body { max-width: 50rem; padding: 2rem; margin: 0 auto; - line-height: 1.6; + line-height: 1.8; background: var(--bg); color: var(--fg); font-family: serif; } -h1, -h2, -h3, -h4 { - margin-block-end: 0.25em; - line-height: 1.3; - font-family: sans-serif; - - a, - a:visited { - color: var(--fg); - text-decoration: none; - } - - a:hover { - color: var(--link); - text-decoration: underline; - } -} - -ul { - margin-block-start: 0; -} - -p { - margin-block-start: 0; - text-align: justify; - hyphens: auto; -} - +/* structural stuff */ #main-nav { line-height: 1.3; @@ -80,35 +51,16 @@ p { } #site-title { - font-family: sans-serif; - font-weight: bold; font-size: 150%; - line-height: 1.3; margin: 0; } footer { - margin: 2em 0 0; + margin: 1.5rem 0 0; } header { - margin-bottom: 1em; - - h1 { - margin: 0; - font-size: 2em; - } -} - -a, -a:visited { - color: var(--link); -} - -hr { - border: none; - height: 1px; - background: var(--overlay); + margin: 0 0 1.5rem; } .chroma { @@ -119,7 +71,71 @@ hr { overflow-x: auto; } -code { - font-size: 125%; - hyphens: none; +article h1 { + margin: 0; + font-size: 2em; +} + +h1 { + font-size: 150%; +} + +h1, +h2, +h3, +h4 { + margin: 1.5rem 0 0.5rem; + + a, + a:visited { + color: var(--fg); + text-decoration: none; + } + + a:hover { + color: var(--link); + text-decoration: underline; + } +} + +#site-title, +h1, +h2, +h3, +h4 { + line-height: 1.3; + font-family: sans-serif; + font-weight: bold; +} + +/* normal type stuff */ + +p { + margin: 0.5rem 0 0; +} + +p + p { + margin-block-start: 1.5rem; +} + +a, +a:visited { + color: var(--link); +} + +ul { + margin-block-start: 0; +} + +hr { + border: none; + height: 1px; + background: var(--overlay); +} + +code { + /* what a horrible hack*/ + font-family: monospace, serif; + font-size: 90%; + white-space: preserve nowrap; } diff --git a/assets/syntax.css b/assets/syntax.css index db001aa..d21717e 100644 --- a/assets/syntax.css +++ b/assets/syntax.css @@ -1,6 +1,6 @@ :root { --chroma-bg: #000; - --comment: #6c7086; + --comment: #7f849c; --cyan: #8be9fd; --green: #50fa7b; --orange: #ffb86c; diff --git a/content/_index.md b/content/_index.md index 0576859..e73a990 100644 --- a/content/_index.md +++ b/content/_index.md @@ -6,7 +6,5 @@ languages, and distributed systems. My favorite languages to work with are Zig, Rust, Erlang, and the venerable C. I want to build high performance and fault tolerant systems, and to help make the web a more free and decentralized place. -

I'm currently looking for work. If you want to talk, you can reach me at -wires@wires.systems. -

+[`wires@wires.systems`](mailto:wires@wires.systems). diff --git a/content/zosimos/workflow.md b/content/zosimos/workflow.md index 114426f..24b2378 100644 --- a/content/zosimos/workflow.md +++ b/content/zosimos/workflow.md @@ -8,7 +8,7 @@ Programming my own OS has been a dream of mine for years, but my attempts always end up going the same way: writing some code that can run in a virtual machine, learning some interesting stuff about x86_64, and then giving up before I even reach userspace. Now I find myself called again by the siren song, but I'm -determined to not go down the same road again ... so I'm doing it on an arm +determined to not go down the same road again... so I'm doing it on an arm machine this time. I ended up settling on the Raspberry Pi 4B, since the price was reasonable and the large community makes it easy to find answers to any question I might have. But before I can set out to build the greatest OS ever, @@ -25,9 +25,10 @@ itself, and while nothing in this post is particularly difficult, I have reason to believe it'll keep up even as the complexity increases. I won't go into detail about the actual code since 1\. it's extremely trivial -and 2\. it's not the main focus of this post. All that matters is that it -consists of some Zig code, an assembly stub, and a linker script to put it all -together. In our `build.zig` file we therefore write: +and 2\. it's not the main focus of this post, but you can find it [here][code]. +All that matters is that it consists of some Zig code, an assembly stub, and +a linker script to put it all together. In our `build.zig` file we therefore +write: ```zig const std = @import("std"); @@ -86,6 +87,7 @@ files ourselves, but we can do better! want a different filename. [1]: https://git.wires.systems/wires/zosimos/src/commit/8466e9b4d2fbca85d53d8dadc87914b4766c43de/src +[code]: https://git.wires.systems/wires/zosimos/src/commit/b6b96f651f060ae6cff9e4e184799bb354ce6d07 [7]: https://www.raspberrypi.com/documentation/computers/config_txt.html ## Fetching Firmware diff --git a/layouts/_default/_markup/render-codeblock.html b/layouts/_default/_markup/render-codeblock.html index 9bfc3b1..f3912ad 100644 --- a/layouts/_default/_markup/render-codeblock.html +++ b/layouts/_default/_markup/render-codeblock.html @@ -1 +1 @@ -
{{ (transform.HighlightCodeBlock .).Inner }}
+
{{ (transform.HighlightCodeBlock .).Inner }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 9d119b8..6499907 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -13,6 +13,6 @@ {{ .TableOfContents }} - {{ end }} {{ .Content }} {{ partial "tags.html" . }} + {{ end }} {{ .Content }} -{{ end }} +{{ partial "tags.html" . }} {{ end }} diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index 75b0b34..9828f28 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -1,5 +1,5 @@ {{ define "main" }} -

{{ .Title }}

+

{{ .Title }}