diff --git a/framework/font.ts b/framework/font.ts
index 07ff47ff7143e98e9bebe3f23f1d38f9b1bcd840..bc7e3594722facbe53b53bea51e179a927a2efb4 100644
--- a/framework/font.ts
+++ b/framework/font.ts
@@ -24,12 +24,14 @@ export async function buildFonts(p: progress.Ref, fonts: sg.Font[]) {
(x) => x[0],
);
function getArgs(vars: sg.FontVars) {
- return Object.entries(vars).map((x) => {
+ return Object.entries(vars).sort((x) =>
+ x[0] === "wght" || x[0] === "slnt" ? 1 : 0
+ ).map((x) => {
const lower = x[0].toLowerCase();
const k = lower === "wght" || lower === "slnt" ? lower : x[0];
const v = Array.isArray(x[1]) ? x[1].join(":") : x[1];
return `${k}=${v}`;
- }).sort();
+ });
}
function getHash(input: string, args: string[]) {
@@ -75,7 +77,7 @@ export async function buildFonts(p: progress.Ref, fonts: sg.Font[]) {
.toLowerCase();
const woff = path.join(temp, hash + ".woff2");
if (!fs.existsSync(woff)) {
- using _ = node.start(hash);
+ using _ = node.start(args.join(" "));
let file = baseFile;
if (subset.vars) {
file = await makeInstance(baseFile, subset.vars);
diff --git a/src/pages/index.marko b/src/pages/index.marko
index 1a8c9e7fdbdd51e425f2732a575ea4d3905fb3f7..326d769c57f20e0acb32b50387469d2131ca738e 100644
--- a/src/pages/index.marko
+++ b/src/pages/index.marko
@@ -15,7 +15,7 @@ export const meta = {
posts
song: in the summer (2025-01-01)
-
song: waterfalls (2025-01-01)
+
song: waterfalls (2025-08-01)
things
questions and answers
file browser
diff --git a/src/q+a/layout.tsx b/src/q+a/layout.tsx
index 9b63f252af54cc278ec050e67add9ce0489d21f0..06d41ebfd76a319f85b2514f6754895b8626b75e 100644
--- a/src/q+a/layout.tsx
+++ b/src/q+a/layout.tsx
@@ -16,7 +16,7 @@ export default function QuestionLayout({ children }: { children: any }) {
export const theme = {
fg: "#f0f0f0",
- bg: "#1a1a1a",
+ bg: "#1a1b1c",
primary: "#f5a9b8",
};
diff --git a/src/q+a/questions.css b/src/q+a/questions.css
index 5170b63552470313d243872afd0582a41a789a26..fe443e3e9aa54569c2d62d5c8fd73218292dc6fd 100644
--- a/src/q+a/questions.css
+++ b/src/q+a/questions.css
@@ -1,7 +1,7 @@
@font-face {
font-family: "recu";
src: url("/recqa.woff2") format("woff2");
- font-weight: 400 1000;
+ font-weight: 400 800;
font-style: normal;
font-display: swap;
font-variation-settings: "CASL" 0 1, "MONO" 0 1;
@@ -10,7 +10,7 @@
}
@font-face {
font-family: recu;
- src: url("/recqaexotic.woff2") format("woff2");
+ src: url("/recexotic.woff2") format("woff2");
font-weight: 400 800;
font-style: normal;
font-display: swap;
@@ -32,8 +32,6 @@
}
.qa {
- /* --a: #faa719; */
- /* --b: #ff3a32; */
--a: #5bcefa;
--b: #f5a9b8;
--as: #278bb3;
@@ -64,9 +62,9 @@
}
q- {
- color: white;
+ color: #fffff0;
--fg: white;
- font-weight: 600;
+ font-weight: 630;
font-size: 1.15em;
font-variation-settings: "CASL" 0, "MONO" 0;
}
diff --git a/src/site.ts b/src/site.ts
index a558d6c405917d76334f2d66de7bc16eddd731b3..cdc413784402be9e194d4c91872b25e69de45ac1 100644
--- a/src/site.ts
+++ b/src/site.ts
@@ -53,7 +53,7 @@ const recursiveVarsMono = { ...recursiveVars, MONO: 1 };
const recursiveVarsQuestion: sg.FontVars = {
...recursiveVars,
MONO: [0, 1],
- WGHT: [400, 1000],
+ WGHT: [400, 800],
};
const layoutFeatures = ["numr", "dnom", "frac"];
export const fonts: sg.Font[] = [
@@ -107,12 +107,7 @@ export const fonts: sg.Font[] = [
},
];
-export async function main() {
- await font.buildFonts(fonts);
-}
-
import * as path from "node:path";
-import * as font from "../framework/font.ts";
import type { Template as MetaTemplate } from "lib/render/meta.ts";
import type * as sg from "#sitegen";
import { nasRoot } from "./file-viewer/paths.ts";