From cfad2f86c123c2b16fcc3af91ec44054d2971ab5 Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Mon, 16 Nov 2026 22:16:27 -0500 Subject: [PATCH] Replace the type tokens with a heading, body, and label ramp on the 4px grid --- packages/app/playground/views.html | 4 +-- packages/app/src/code/element.ts | 2 +- packages/app/src/collab/editor.ts | 2 +- packages/app/src/pages/dom/styles.ts | 6 ++-- packages/app/src/platform/dom/header.ts | 8 ++--- .../app/src/platform/dom/import-dialog.ts | 4 +-- packages/app/src/shell/dom/compact.ts | 4 +-- packages/app/src/shell/dom/floating.ts | 2 +- packages/app/src/shell/dom/shell.ts | 2 +- packages/app/src/shell/dom/stack.ts | 4 +-- packages/app/src/views/agent.ts | 2 +- packages/app/src/views/browser.ts | 6 ++-- packages/app/src/views/processes.ts | 2 +- packages/app/src/views/project.ts | 8 ++--- packages/app/src/views/terminal.ts | 2 +- packages/web/fixtures/icons.html | 2 +- packages/web/fixtures/menu.html | 2 +- packages/web/fixtures/split.html | 2 +- packages/web/fixtures/tabs.html | 2 +- packages/web/src/menu/element.ts | 4 +-- packages/web/src/tabs/element.ts | 4 +-- packages/web/src/tokens/raw.css | 8 ++--- packages/web/src/tokens/semantic.css | 35 ++++++++++++------- packages/web/src/tree/element.ts | 2 +- 24 files changed, 64 insertions(+), 55 deletions(-) diff --git a/packages/app/playground/views.html b/packages/app/playground/views.html index 580c18f..7709a0d 100644 --- a/packages/app/playground/views.html +++ b/packages/app/playground/views.html @@ -5,10 +5,10 @@ nibling views diff --git a/packages/app/src/code/element.ts b/packages/app/src/code/element.ts index 138045b..d4c270f 100644 --- a/packages/app/src/code/element.ts +++ b/packages/app/src/code/element.ts @@ -80,7 +80,7 @@ const theme = EditorView.theme({ height: "100%", color: fg, backgroundColor: background, - font: "var(--nib-font-code, 13px/1.55 ui-monospace, SFMono-Regular, Menlo, Consolas, monospace)", + font: "var(--nib-font-code, 14px/20px ui-monospace, SFMono-Regular, Menlo, Consolas, monospace)", colorScheme: "light dark", }, "&.cm-focused": { outline: "none" }, diff --git a/packages/app/src/collab/editor.ts b/packages/app/src/collab/editor.ts index f17e437..7ba6ec6 100644 --- a/packages/app/src/collab/editor.ts +++ b/packages/app/src/collab/editor.ts @@ -12,7 +12,7 @@ export const PRESENCE_COLORS = ["#e5484d", "#0090ff", "#30a46c", "#f76b15", "#8e const presenceTheme = EditorView.theme({ // Labels sit above the cursor so they don't cover the next line. - ".loro-cursor::before": { top: "-1.5em", fontSize: "11px", padding: "1px 4px", opacity: "1" }, + ".loro-cursor::before": { top: "-1.5em", fontSize: "var(--nib-font-size-label, 12px)", padding: "1px 4px", opacity: "1" }, ...Object.fromEntries( PRESENCE_COLORS.flatMap((color, i) => [ [`.loro-cursor.nib-user-${i}, .loro-cursor.nib-user-${i}::before`, { backgroundColor: color, color: "white" }], diff --git a/packages/app/src/pages/dom/styles.ts b/packages/app/src/pages/dom/styles.ts index 35409ec..84ad5c0 100644 --- a/packages/app/src/pages/dom/styles.ts +++ b/packages/app/src/pages/dom/styles.ts @@ -8,7 +8,7 @@ export const pageSheet = sheet(` overflow: auto; background: var(--nib-color-canvas); color: var(--nib-color-text); - font: var(--nib-font-ui); + font: var(--nib-font-body); } main { display: grid; @@ -17,7 +17,7 @@ export const pageSheet = sheet(` margin-inline: auto; padding: var(--nib-space-xl) var(--nib-space-lg); } - h1 { margin: 0; font-size: var(--nib-font-size-title); font-weight: var(--nib-font-weight-strong); } + h1 { margin: 0; font: var(--nib-font-heading); font-weight: var(--nib-font-weight-strong); font-variation-settings: var(--nib-font-variation-heading); } h2 { margin: 0 0 var(--nib-space-sm); font-size: inherit; font-weight: var(--nib-font-weight-strong); } h3 { margin: 0; font-size: inherit; font-weight: var(--nib-font-weight-strong); } p { margin: 0; } @@ -95,7 +95,7 @@ export const pageSheet = sheet(` border-radius: var(--nib-radius-md); background: var(--nib-color-surface); color: var(--nib-color-text); - font: var(--nib-font-ui); + font: var(--nib-font-body); } dialog:modal { overscroll-behavior: contain; width: min(28rem, 100% - 2 * var(--nib-space-lg)); box-sizing: border-box; } dialog::backdrop { background: var(--nib-color-scrim); overflow: hidden; overscroll-behavior: contain; } diff --git a/packages/app/src/platform/dom/header.ts b/packages/app/src/platform/dom/header.ts index 516e752..19e61b9 100644 --- a/packages/app/src/platform/dom/header.ts +++ b/packages/app/src/platform/dom/header.ts @@ -17,7 +17,7 @@ const headerSheet = sheet(` background: var(--nib-color-surface); color: var(--nib-color-text); border-block-end: var(--nib-size-border) solid var(--nib-color-border); - font: var(--nib-font-ui); + font: var(--nib-font-body); } [part="bar"] { display: flex; @@ -57,7 +57,7 @@ const headerSheet = sheet(` } button:hover, button[aria-expanded="true"] { background: var(--nib-color-hover); } button:disabled { color: var(--nib-color-text-muted); } - .caret { color: var(--nib-color-text-muted); font-size: var(--nib-font-size-icon); } + .caret { color: var(--nib-color-text-muted); font-size: var(--nib-size-glyph); } [part="account"] { padding-inline: var(--nib-space-2xs) var(--nib-space-sm); border-color: transparent; background: none; border-radius: var(--nib-size-avatar-small); } .avatar { display: inline-grid; @@ -69,7 +69,7 @@ const headerSheet = sheet(` object-fit: cover; background: var(--nib-color-selected); color: var(--nib-color-text); - font-size: var(--nib-font-size-small); + font: var(--nib-font-label); font-weight: var(--nib-font-weight-strong); } .handle { max-width: 16rem; overflow: hidden; text-overflow: ellipsis; } @@ -96,7 +96,7 @@ const headerSheet = sheet(` border-radius: var(--nib-radius-md); background: var(--nib-color-surface); color: var(--nib-color-text); - font: var(--nib-font-ui); + font: var(--nib-font-body); white-space: normal; } dialog:modal { overscroll-behavior: contain; width: min(24rem, 100% - 2 * var(--nib-space-lg)); box-sizing: border-box; } diff --git a/packages/app/src/platform/dom/import-dialog.ts b/packages/app/src/platform/dom/import-dialog.ts index 43a2f9b..1f54688 100644 --- a/packages/app/src/platform/dom/import-dialog.ts +++ b/packages/app/src/platform/dom/import-dialog.ts @@ -8,7 +8,7 @@ import type { Platform } from "../state.ts"; const REFS_DEBOUNCE_MS = 300; const importSheet = sheet(` - dialog { padding: var(--nib-space-lg); border: var(--nib-size-border) solid var(--nib-color-border); border-radius: var(--nib-radius-md); background: var(--nib-color-surface); color: var(--nib-color-text); font: var(--nib-font-ui); } + dialog { padding: var(--nib-space-lg); border: var(--nib-size-border) solid var(--nib-color-border); border-radius: var(--nib-radius-md); background: var(--nib-color-surface); color: var(--nib-color-text); font: var(--nib-font-body); } dialog:modal { overscroll-behavior: contain; width: min(28rem, 100% - 2 * var(--nib-space-lg)); max-height: min(34rem, 100% - 2 * var(--nib-space-lg)); box-sizing: border-box; display: flex; flex-direction: column; } dialog::backdrop { background: var(--nib-color-scrim); overflow: hidden; overscroll-behavior: contain; } h2 { margin-block: 0 var(--nib-space-md); font-size: inherit; font-weight: var(--nib-font-weight-strong); } @@ -54,7 +54,7 @@ const importSheet = sheet(` /* The branch and directory pickers replace .body: a filter field, a count, an always-on root choice, and a list. */ .picker { display: grid; gap: var(--nib-space-sm); min-height: 0; overflow: hidden; grid-template-rows: auto auto auto 1fr; } - .count { margin: 0; color: var(--nib-color-text-muted); font-size: var(--nib-font-size-small); } + .count { margin: 0; color: var(--nib-color-text-muted); font: var(--nib-font-label); } .root-choice { justify-self: start; border: 0; diff --git a/packages/app/src/shell/dom/compact.ts b/packages/app/src/shell/dom/compact.ts index 43c38e4..1107e28 100644 --- a/packages/app/src/shell/dom/compact.ts +++ b/packages/app/src/shell/dom/compact.ts @@ -31,7 +31,7 @@ export const compactSheet = sheet(` [part="keys"][hidden] { display: none; } button[part~="key"] { flex: none; - font-family: var(--nib-font-family-code); + font-family: var(--nib-font-family-mono); touch-action: manipulation; } button[part~="key"]:active { background: var(--nib-color-hover); } @@ -105,7 +105,7 @@ export const compactSheet = sheet(` border-inline-end: var(--nib-size-border) solid var(--nib-color-border); background: var(--nib-color-canvas); color: var(--nib-color-text); - font: var(--nib-font-ui); + font: var(--nib-font-body); /* The compact root lets pointer events through; the drawer inherits from it even in the top layer. */ pointer-events: auto; } diff --git a/packages/app/src/shell/dom/floating.ts b/packages/app/src/shell/dom/floating.ts index 2d77e26..049d748 100644 --- a/packages/app/src/shell/dom/floating.ts +++ b/packages/app/src/shell/dom/floating.ts @@ -34,7 +34,7 @@ const PAGE_CSS = ` display: flex; background: var(--nib-color-canvas); color: var(--nib-color-text); - font: var(--nib-font-ui); + font: var(--nib-font-body); } nib-stack > div { position: relative; } nib-tabpanel { position: absolute; inset: 0; display: flex; overflow: hidden; } diff --git a/packages/app/src/shell/dom/shell.ts b/packages/app/src/shell/dom/shell.ts index 259226d..5b715e0 100644 --- a/packages/app/src/shell/dom/shell.ts +++ b/packages/app/src/shell/dom/shell.ts @@ -107,7 +107,7 @@ const shellSheet = sheet(` overflow: hidden; background: var(--nib-color-canvas); color: var(--nib-color-text); - font: var(--nib-font-ui); + font: var(--nib-font-body); } [part="frame"] { position: absolute; inset: 0; } /* diff --git a/packages/app/src/shell/dom/stack.ts b/packages/app/src/shell/dom/stack.ts index cfa77f6..d6615f2 100644 --- a/packages/app/src/shell/dom/stack.ts +++ b/packages/app/src/shell/dom/stack.ts @@ -30,10 +30,10 @@ export const SECTION_CSS = ` padding-inline: var(--nib-space-2xs); border-block-start: var(--nib-size-border) solid var(--nib-color-border); color: var(--nib-color-text); - font-size: var(--nib-font-size-compact); + font: var(--nib-font-label); font-weight: var(--nib-font-weight-strong); text-transform: uppercase; - letter-spacing: 0.04em; + letter-spacing: var(--nib-font-tracking-caps); cursor: pointer; user-select: none; pointer-events: auto; diff --git a/packages/app/src/views/agent.ts b/packages/app/src/views/agent.ts index 23e099c..a453b25 100644 --- a/packages/app/src/views/agent.ts +++ b/packages/app/src/views/agent.ts @@ -3,7 +3,7 @@ import type { Files } from "../files.ts"; import type { Unsubscribe } from "../shell/workbench.ts"; const agentSheet = sheet(` - :host { display: flex; flex-direction: column; overflow: hidden; container: nib-agent / size; font: var(--nib-font-ui); } + :host { display: flex; flex-direction: column; overflow: hidden; container: nib-agent / size; font: var(--nib-font-body); } [part="log"] { flex: 1; margin: 0; diff --git a/packages/app/src/views/browser.ts b/packages/app/src/views/browser.ts index 7c1b616..838c272 100644 --- a/packages/app/src/views/browser.ts +++ b/packages/app/src/views/browser.ts @@ -35,7 +35,7 @@ const browserSheet = sheet(` background: none; color: var(--nib-color-text-muted); font: inherit; - font-size: var(--nib-font-size-icon); + font-size: var(--nib-size-glyph); } [part="chrome"] button:hover:enabled { color: var(--nib-color-text); background: var(--nib-color-hover); } [part="chrome"] button:disabled { opacity: 0.4; } @@ -51,7 +51,7 @@ const browserSheet = sheet(` border-radius: var(--nib-radius-sm); background: var(--nib-color-canvas); color: var(--nib-color-text); - font: var(--nib-font-ui); + font: var(--nib-font-body); } [part="chrome"] :focus-visible { outline: var(--nib-size-focus-ring) solid var(--nib-color-focus-ring); outline-offset: calc(-1 * var(--nib-size-focus-ring)); } @media (pointer: coarse) { @@ -80,7 +80,7 @@ const browserSheet = sheet(` color: var(--nib-color-text); } iframe:focus-visible { outline: var(--nib-size-focus-ring) solid var(--nib-color-focus-ring); outline-offset: calc(-1 * var(--nib-size-focus-ring)); } - [part="status"], [part="empty"] { flex: 1; margin: 0; padding: var(--nib-space-md); font: var(--nib-font-ui); color: var(--nib-color-text-muted); } + [part="status"], [part="empty"] { flex: 1; margin: 0; padding: var(--nib-space-md); font: var(--nib-font-body); color: var(--nib-color-text-muted); } [part="empty"] h2 { margin: 0 0 var(--nib-space-xs); font: inherit; font-weight: var(--nib-font-weight-strong); color: var(--nib-color-text); } [part="empty"] p { margin: 0; } `); diff --git a/packages/app/src/views/processes.ts b/packages/app/src/views/processes.ts index 6bba9a3..07a1411 100644 --- a/packages/app/src/views/processes.ts +++ b/packages/app/src/views/processes.ts @@ -8,7 +8,7 @@ import type { Unsubscribe, Workbench } from "../shell/workbench.ts"; import { openBrowser } from "./browser.ts"; const processesSheet = sheet(` - :host { display: flex; flex-direction: column; overflow: auto; container: nib-processes / inline-size; font: var(--nib-font-ui); } + :host { display: flex; flex-direction: column; overflow: auto; container: nib-processes / inline-size; font: var(--nib-font-body); } [part="scripts"] { display: flex; flex-wrap: wrap; diff --git a/packages/app/src/views/project.ts b/packages/app/src/views/project.ts index 5cd316b..06c72fc 100644 --- a/packages/app/src/views/project.ts +++ b/packages/app/src/views/project.ts @@ -7,7 +7,7 @@ import type { Unsubscribe } from "../shell/workbench.ts"; export type ProjectSource = Pick; const projectInfoSheet = sheet(` - :host { display: block; overflow: auto; box-sizing: border-box; padding: var(--nib-space-sm); font: var(--nib-font-ui); color: var(--nib-color-text); } + :host { display: block; overflow: auto; box-sizing: border-box; padding: var(--nib-space-sm); font: var(--nib-font-body); color: var(--nib-color-text); } [part="owner"] { display: flex; align-items: center; gap: var(--nib-space-xs); margin-block-end: var(--nib-space-xs); } .avatar { width: var(--nib-size-avatar-small); @@ -17,7 +17,7 @@ const projectInfoSheet = sheet(` object-fit: cover; background: var(--nib-color-selected); color: var(--nib-color-text); - font-size: var(--nib-font-size-small); + font: var(--nib-font-label); font-weight: var(--nib-font-weight-strong); display: inline-grid; place-items: center; @@ -27,7 +27,7 @@ const projectInfoSheet = sheet(` a:focus-visible { outline: var(--nib-size-focus-ring) solid var(--nib-color-focus-ring); outline-offset: var(--nib-size-border); } [part="name"] { display: block; margin-block-end: var(--nib-space-xs); font-weight: var(--nib-font-weight-strong); } dl { margin: 0; display: grid; gap: var(--nib-space-2xs); } - dt { color: var(--nib-color-text-muted); font-size: var(--nib-font-size-small); } + dt { color: var(--nib-color-text-muted); font: var(--nib-font-label); } dd { margin: 0; } [part="hint"] { margin: var(--nib-space-2xs) 0 0; color: var(--nib-color-text-muted); } .tags { display: flex; flex-wrap: wrap; gap: var(--nib-space-2xs); } @@ -35,7 +35,7 @@ const projectInfoSheet = sheet(` border: var(--nib-size-border) solid var(--nib-color-border); border-radius: var(--nib-radius-sm); padding-inline: var(--nib-space-xs); - font-size: var(--nib-font-size-small); + font: var(--nib-font-label); } `); diff --git a/packages/app/src/views/terminal.ts b/packages/app/src/views/terminal.ts index 6039e9f..d39b29a 100644 --- a/packages/app/src/views/terminal.ts +++ b/packages/app/src/views/terminal.ts @@ -184,7 +184,7 @@ export class TerminalElement extends HTMLElement implements EditingTarget { #look(): { fontSize: number; fontFamily: string; theme: ITheme } { const style = getComputedStyle(this.#probe); return { - fontSize: parseFloat(style.fontSize) || 13, + fontSize: parseFloat(style.fontSize) || 12, fontFamily: style.fontFamily, theme: { foreground: style.color, background: style.backgroundColor, cursor: style.color, selectionBackground: style.outlineColor }, }; diff --git a/packages/web/fixtures/icons.html b/packages/web/fixtures/icons.html index 60e2a6f..c52302c 100644 --- a/packages/web/fixtures/icons.html +++ b/packages/web/fixtures/icons.html @@ -4,7 +4,7 @@ nib-icon fixture diff --git a/packages/web/fixtures/menu.html b/packages/web/fixtures/menu.html index dac8f92..f11f0e1 100644 --- a/packages/web/fixtures/menu.html +++ b/packages/web/fixtures/menu.html @@ -4,7 +4,7 @@ nib-menu fixture diff --git a/packages/web/fixtures/split.html b/packages/web/fixtures/split.html index feb47c7..42100e1 100644 --- a/packages/web/fixtures/split.html +++ b/packages/web/fixtures/split.html @@ -14,7 +14,7 @@ flex-direction: column; background: var(--nib-color-canvas); color: var(--nib-color-text); - font: var(--nib-font-ui); + font: var(--nib-font-body); } nib-split#outer { flex: 1; diff --git a/packages/web/fixtures/tabs.html b/packages/web/fixtures/tabs.html index 586ddcc..ce07767 100644 --- a/packages/web/fixtures/tabs.html +++ b/packages/web/fixtures/tabs.html @@ -8,7 +8,7 @@ margin: 0; background: var(--nib-color-canvas); color: var(--nib-color-text); - font: var(--nib-font-ui); + font: var(--nib-font-body); } /* A narrow stack-shaped container to force the tablist's overflow and container queries. */ #stack { diff --git a/packages/web/src/menu/element.ts b/packages/web/src/menu/element.ts index 6323a91..6c6df35 100644 --- a/packages/web/src/menu/element.ts +++ b/packages/web/src/menu/element.ts @@ -26,7 +26,7 @@ const menuSheet = sheet(` border-radius: var(--nib-radius-md); background: var(--nib-color-surface); color: var(--nib-color-text); - font: var(--nib-font-ui); + font: var(--nib-font-body); box-shadow: 0 var(--nib-space-xs) var(--nib-space-lg) color-mix(in srgb, var(--nib-color-scrim) 50%, transparent); } ::slotted(hr) { @@ -308,7 +308,7 @@ const groupSheet = sheet(` [part="label"] { padding: var(--nib-space-xs) var(--nib-space-sm) var(--nib-space-2xs); color: var(--nib-color-text-muted); - font-size: var(--nib-font-size-small); + font: var(--nib-font-label); } `); diff --git a/packages/web/src/tabs/element.ts b/packages/web/src/tabs/element.ts index a79fbd6..5368e6c 100644 --- a/packages/web/src/tabs/element.ts +++ b/packages/web/src/tabs/element.ts @@ -31,7 +31,7 @@ const tabSheet = sheet(` min-width: 0; flex: 0 1 auto; border-right: var(--nib-size-border) solid var(--nib-color-border); - font: var(--nib-font-ui); + font: var(--nib-font-body); color: var(--nib-color-text); cursor: default; } @@ -51,7 +51,7 @@ const tabSheet = sheet(` display: inline-flex; align-items: center; cursor: default; - font-size: var(--nib-font-size-icon); + font-size: var(--nib-size-glyph); color: var(--nib-color-text-muted); } [part="close"][hidden] { display: none; } diff --git a/packages/web/src/tokens/raw.css b/packages/web/src/tokens/raw.css index c9c4421..9400767 100644 --- a/packages/web/src/tokens/raw.css +++ b/packages/web/src/tokens/raw.css @@ -57,15 +57,13 @@ --nib-raw-font-sans: "Inter", "Inter Fallback", system-ui, sans-serif; --nib-raw-font-serif: "Fraunces", "Fraunces Fallback", Georgia, serif; --nib-raw-font-mono: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; - --nib-raw-font-size-10: 10px; - --nib-raw-font-size-11: 11px; --nib-raw-font-size-12: 12px; - --nib-raw-font-size-13: 13px; + --nib-raw-font-size-14: 14px; --nib-raw-font-size-20: 20px; --nib-raw-font-weight-400: 400; --nib-raw-font-weight-600: 600; - --nib-raw-line-height-tight: 1.4; - --nib-raw-line-height-code: 1.5; + --nib-raw-line-height-tight: 1.2; + --nib-raw-line-height-normal: 1.4; --nib-raw-mix-faint: 6%; --nib-raw-mix-soft: 18%; diff --git a/packages/web/src/tokens/semantic.css b/packages/web/src/tokens/semantic.css index 8a447f6..27b3f83 100644 --- a/packages/web/src/tokens/semantic.css +++ b/packages/web/src/tokens/semantic.css @@ -43,8 +43,9 @@ /* The narrowest a tab gets before its label ellipsizes. */ --nib-size-tab-min: round(var(--nib-raw-size-64), var(--nib-grid)); --nib-size-indent: var(--nib-raw-size-12); - /* A file or folder icon in a tree row. */ + /* A file or folder icon in a tree row, and a small control's glyph, such as a tab's close button. */ --nib-size-file-icon: var(--nib-raw-size-16); + --nib-size-glyph: var(--nib-raw-size-12); /* The smallest comfortable target for a finger. Rounds up: an override that shrank it would clip it. */ --nib-size-touch-target: round(up, var(--nib-raw-size-48), var(--nib-grid)); /* The activity bar along the shell edge, and the bar that marks its pressed button. */ @@ -66,17 +67,27 @@ --nib-radius-sm: var(--nib-raw-radius-1); --nib-radius-md: var(--nib-raw-radius-2); - /* Type. */ - --nib-font-family-ui: var(--nib-raw-font-sans); - --nib-font-family-code: var(--nib-raw-font-mono); - --nib-font-size-ui: var(--nib-raw-font-size-13); - --nib-font-size-small: var(--nib-raw-font-size-12); - --nib-font-size-compact: var(--nib-raw-font-size-11); - --nib-font-size-icon: var(--nib-raw-font-size-10); - --nib-font-size-title: var(--nib-raw-font-size-20); + /* + * Type: one font shorthand per role. Line heights round up to the fine grid, so a theme that + * changes a size still lands every baseline on a 4px step. + */ + --nib-font-family-sans: var(--nib-raw-font-sans); + --nib-font-family-serif: var(--nib-raw-font-serif); + --nib-font-family-mono: var(--nib-raw-font-mono); + --nib-font-size-heading: var(--nib-raw-font-size-20); + --nib-font-size-body: var(--nib-raw-font-size-14); + --nib-font-size-label: var(--nib-raw-font-size-12); + --nib-font-size-code: var(--nib-raw-font-size-14); + --nib-font-size-terminal: var(--nib-raw-font-size-12); --nib-font-weight-normal: var(--nib-raw-font-weight-400); --nib-font-weight-strong: var(--nib-raw-font-weight-600); - --nib-font-ui: var(--nib-font-size-ui) / var(--nib-raw-line-height-tight) var(--nib-font-family-ui); - --nib-font-code: var(--nib-font-size-ui) / var(--nib-raw-line-height-code) var(--nib-font-family-code); - --nib-font-terminal: var(--nib-font-size-small) / var(--nib-raw-line-height-tight) var(--nib-font-family-code); + --nib-font-heading: var(--nib-font-size-heading) / round(up, var(--nib-font-size-heading) * var(--nib-raw-line-height-tight), var(--nib-grid-fine)) var(--nib-font-family-serif); + --nib-font-body: var(--nib-font-size-body) / round(up, var(--nib-font-size-body) * var(--nib-raw-line-height-normal), var(--nib-grid-fine)) var(--nib-font-family-sans); + --nib-font-label: var(--nib-font-size-label) / round(up, var(--nib-font-size-label) * var(--nib-raw-line-height-tight), var(--nib-grid-fine)) var(--nib-font-family-sans); + --nib-font-code: var(--nib-font-size-code) / round(up, var(--nib-font-size-code) * var(--nib-raw-line-height-normal), var(--nib-grid-fine)) var(--nib-font-family-mono); + --nib-font-terminal: var(--nib-font-size-terminal) / round(up, var(--nib-font-size-terminal) * var(--nib-raw-line-height-tight), var(--nib-grid-fine)) var(--nib-font-family-mono); + /* Fraunces' soft cut. The font shorthand resets variations, so set this after it. */ + --nib-font-variation-heading: "SOFT" 50, "WONK" 0; + /* Uppercase labels open up a little. */ + --nib-font-tracking-caps: 0.04em; } diff --git a/packages/web/src/tree/element.ts b/packages/web/src/tree/element.ts index 020b654..363f922 100644 --- a/packages/web/src/tree/element.ts +++ b/packages/web/src/tree/element.ts @@ -42,7 +42,7 @@ const itemSheet = sheet(` background: none; color: inherit; font: inherit; - font-size: var(--nib-font-size-icon); + font-size: var(--nib-size-glyph); padding: var(--nib-space-none) var(--nib-space-xs); } :host(:not(:hover, :focus-visible, :state(selected))) ::slotted([slot="action"]) { visibility: hidden; } -- knotmirror 0.0.1