Skip to content

Native iCloud apps for Windows and Linux, built in Rust. Notes, Reminders, Calendar, Contacts, Drive and Photos, offline and in sync with your iPhone.

One design language across the apps: rhythm, type, states, controls

Yashwanth Kamireddifaeb94130c04
diff --git a/.uiverify/design-empty.mjs b/.uiverify/design-empty.mjs
new file mode 100644
index 0000000..2634e96
--- /dev/null
+++ b/.uiverify/design-empty.mjs
@@ -0,0 +1,15 @@
+// Not a check: every screen with no data, to look at its empty state. node design-empty.mjs <dir> [scheme]
+import { engine } from "./engine.mjs";
+import { SERVICES, installStub, openScreen } from "./stub.mjs";
+const [out = (await import("node:os")).tmpdir(), scheme = "light"] = process.argv.slice(2);
+const b = await engine.launch();
+const ctx = await b.newContext({ viewport: { width: 1400, height: 850 }, colorScheme: scheme });
+await ctx.addInitScript(installStub, { screen: "library", services: SERVICES, twoFactor: null });
+const p = await ctx.newPage();
+await p.goto(process.env.BASE ?? "http://localhost:4173", { waitUntil: "networkidle" });
+for (const s of ["Reminders", "Notes", "Drive", "Calendar", "Contacts", "Photos"]) {
+ await openScreen(p, s);
+ await p.waitForTimeout(500);
+ await p.screenshot({ path: `${out}/empty-${s}-${scheme}.png` });
+}
+await b.close();
diff --git a/.uiverify/design-language.mjs b/.uiverify/design-language.mjs
new file mode 100644
index 0000000..bcd5f4e
--- /dev/null
+++ b/.uiverify/design-language.mjs
@@ -0,0 +1,165 @@
+// One design language across the apps: what the kit and tokens promise, held in every screen.
+// - every screen's head starts on the same line: pane titles, column hairlines, source-list headings
+// - a chosen row is the one --fill-selected everywhere, and firms up under Increase Contrast
+// - a pop-up button is the control height and takes the shell's focus ring
+// - small motion stays within 160ms; Drive's row lines are straight, inset hairlines
+// - an empty contact list says so in the middle of its column; "Not synced yet" has a grey dot
+// BASE=http://localhost:4201 node .uiverify/design-language.mjs
+import { engine } from "./engine.mjs";
+import { SERVICES, installStub, openScreen } from "./stub.mjs";
+
+const BASE = process.env.BASE ?? "http://localhost:4173";
+let failures = 0;
+const ok = (p, m) => { console.log(`${p ? "PASS" : "FAIL"} ${m}`); if (!p) failures++; };
+const b = await engine.launch();
+
+async function open(opts = {}, scheme = "light") {
+ const ctx = await b.newContext({ viewport: { width: 1400, height: 850 }, colorScheme: scheme });
+ await ctx.addInitScript(installStub, { screen: "library", services: SERVICES, twoFactor: null, ...opts });
+ const page = await ctx.newPage();
+ await page.goto(BASE, { waitUntil: "networkidle" });
+ return page;
+}
+const fixtures = { calendarFixture: true, notesFixture: true, contactsFixture: true, driveFixture: true, remindersFixture: true };
+const go = async (page, s) => {
+ if (s === "Settings") await page.locator(".sidebar-account").click();
+ else await openScreen(page, s);
+ await page.waitForTimeout(400);
+};
+// What the visible screen's head measures: its title's top, its tallest hairline's top, its first
+// source-list heading's left edge.
+const head = (page) => page.evaluate(() => {
+ const slot = [...document.querySelectorAll("main.content .screen-slot")].find((e) => !e.hidden) ?? document.querySelector("main.content");
+ const vis = (el) => el.getClientRects().length && getComputedStyle(el).visibility !== "hidden";
+ const h1 = [...slot.querySelectorAll("h1")].find(vis);
+ const rule = [...slot.querySelectorAll("*")].find((e) => vis(e) && parseFloat(getComputedStyle(e).borderRightWidth) > 0 && e.getBoundingClientRect().height > 300);
+ const heading = [...slot.querySelectorAll(".side-heading")].find(vis);
+ return {
+ title: h1 ? Math.round(h1.getBoundingClientRect().top) : null,
+ rule: rule ? Math.round(rule.getBoundingClientRect().top) : null,
+ heading: heading ? Math.round(heading.getBoundingClientRect().left) : null,
+ };
+});
+// A colour as the engine resolves it, for comparing a row's fill against a token.
+const resolve = (page, value) => page.evaluate((v) => {
+ const probe = document.createElement("div");
+ probe.style.background = v;
+ document.body.appendChild(probe);
+ const c = getComputedStyle(probe).backgroundColor;
+ probe.remove();
+ return c;
+}, value);
+
+// ---- one line for every screen's head --------------------------------------------------------
+{
+ const page = await open(fixtures);
+ const tops = {}, rules = {}, headings = {};
+ for (const s of ["Reminders", "Notes", "Drive", "Contacts", "Photos", "Settings"]) {
+ await go(page, s);
+ const m = await head(page);
+ tops[s] = m.title;
+ if (m.rule !== null && s !== "Settings") rules[s] = m.rule; // Settings has no columns
+ if (m.heading !== null) headings[s] = m.heading;
+ }
+ ok(new Set(Object.values(tops)).size === 1, `every pane title starts on one line ${JSON.stringify(tops)}`);
+ ok(new Set(Object.values(rules)).size === 1, `every column's hairline starts on that line too ${JSON.stringify(rules)}`);
+ await go(page, "Calendar");
+ const cal = await head(page);
+ if (cal.heading !== null) headings.Calendar = cal.heading;
+ if (cal.rule !== null) rules.Calendar = cal.rule;
+ ok(new Set(Object.values(headings)).size === 1, `every source list's first heading starts at one inset ${JSON.stringify(headings)}`);
+ ok(cal.rule === Object.values(tops)[0], `Calendar's column starts there as well [${cal.rule}]`);
+
+ // ---- one selection ----------------------------------------------------------------------
+ const selected = await resolve(page, "var(--fill-selected)");
+ const chosen = {};
+ await go(page, "Notes");
+ chosen["the app sidebar"] = await page.locator(".nav-item[aria-current='true']").evaluate((el) => getComputedStyle(el).backgroundColor);
+ chosen["a source row"] = await page.locator(".source-row[aria-current='true']").first().evaluate((el) => getComputedStyle(el).backgroundColor);
+ chosen["a note"] = await page.locator(".note-row[aria-selected='true']").first().evaluate((el) => getComputedStyle(el).backgroundColor);
+ await go(page, "Contacts");
+ await page.locator(".contact-row[aria-selected='true']").first().waitFor();
+ // Focus elsewhere, so the list draws its resting selection (the grey one).
+ await page.locator(".contacts-search input, .search-field input").first().focus();
+ chosen["a contact"] = await page.locator(".contact-row[aria-selected='true']").first().evaluate((el) => getComputedStyle(el).backgroundColor);
+ const off = Object.entries(chosen).filter(([, c]) => c !== selected);
+ ok(off.length === 0, `a chosen row is --fill-selected everywhere [${selected}${off.length ? `; off: ${JSON.stringify(Object.fromEntries(off))}` : ""}]`);
+
+ // Under Increase Contrast (the desktop's setting, data-contrast) the selection firms up with the token.
+ await page.evaluate(() => document.documentElement.setAttribute("data-contrast", "more"));
+ const firm = await resolve(page, "var(--fill-selected)");
+ const contact = await page.locator(".contact-row[aria-selected='true']").first().evaluate((el) => getComputedStyle(el).backgroundColor);
+ const nav = await page.locator(".nav-item[aria-current='true']").evaluate((el) => getComputedStyle(el).backgroundColor);
+ ok(firm !== selected && contact === firm && nav === firm, `under Increase Contrast the selection firms up in the lists too [${selected} → ${firm}; contact ${contact}, sidebar ${nav}]`);
+ await page.evaluate(() => document.documentElement.removeAttribute("data-contrast"));
+
+ // ---- controls ---------------------------------------------------------------------------
+ await go(page, "Settings");
+ const control = await page.evaluate(() => parseFloat(getComputedStyle(document.documentElement).getPropertyValue("--h-control")));
+ const pickers = await page.locator(".settings .picker-button:visible").evaluateAll((els) => els.map((e) => Math.round(e.getBoundingClientRect().height)));
+ ok(pickers.length > 0 && pickers.every((h) => h === control), `Settings' pop-up buttons are the control height [${pickers.join(", ")} vs ${control}]`);
+ const tracks = await page.locator(".settings .segmented:visible").evaluateAll((els) => els.map((e) => Math.round(e.getBoundingClientRect().height)));
+ ok(tracks.every((h) => h === control), `a segmented control is the control height [${tracks.join(", ")}]`);
+ const weight = await page.locator(".settings-title").evaluate((el) => getComputedStyle(el).fontWeight);
+ ok(weight === "700", `Settings' title has the weight it asks for [${weight}]`);
+ // The pop-up button's keyboard focus: the shell's ring, not a translucent glow.
+ const picker = page.locator(".settings .picker-button:visible").first();
+ await picker.focus();
+ await page.keyboard.press("Shift+Tab");
+ await page.keyboard.press("Tab");
+ const ring = await page.evaluate(() => {
+ const el = document.activeElement;
+ if (!el?.classList.contains("picker-button")) return null;
+ const cs = getComputedStyle(el);
+ return { style: cs.outlineStyle, width: cs.outlineWidth };
+ });
+ ok(ring?.style === "solid" && ring?.width === "2px", `a focused pop-up button takes the shell's focus ring ${JSON.stringify(ring)}`);
+
+ // ---- motion stays small -----------------------------------------------------------------
+ const motion = await page.evaluate(() => {
+ const ms = (v) => Math.max(...v.split(",").map((s) => parseFloat(s) * (s.trim().endsWith("ms") ? 1 : 1000)));
+ const quiet = document.querySelector(".quiet");
+ const knob = document.querySelector(".switch-knob, span.switch");
+ const knobStyle = knob ? getComputedStyle(knob, knob.matches("span.switch") ? "::after" : null) : null;
+ return { press: quiet ? ms(getComputedStyle(quiet).transitionDuration) : null, knob: knobStyle ? ms(knobStyle.transitionDuration) : null };
+ });
+ ok(motion.press !== null && motion.press <= 160, `a button springs back within 160ms [${motion.press}ms]`);
+ ok(motion.knob === null || motion.knob <= 160, `a switch's knob slides within 160ms [${motion.knob}ms]`);
+
+ // ---- Drive's lines ----------------------------------------------------------------------
+ await go(page, "Drive");
+ const line = await page.locator(".drive-rows .drive-row").first().evaluate((el) => {
+ const after = getComputedStyle(el, "::after");
+ return { border: getComputedStyle(el).borderBottomWidth, left: after.left, height: after.height, content: after.content };
+ });
+ ok(line.border === "0px" && line.content !== "none" && parseFloat(line.left) > 0, `Drive's row line is its own inset hairline, not the rounded row's border ${JSON.stringify(line)}`);
+ const font = await page.locator(".drive-name").first().evaluate((el) => getComputedStyle(el).fontFamily);
+ ok(/Adwaita Sans/.test(font), `the type stack offers a face with every weight before system-ui [${font.slice(0, 90)}]`);
+ await page.context().close();
+}
+
+// ---- empty and idle ---------------------------------------------------------------------------
+{
+ const page = await open({});
+ await go(page, "Contacts");
+ const placed = await page.evaluate(() => {
+ const col = document.querySelector(".contacts-list");
+ const line = col?.querySelector(".empty-state");
+ if (!col || !line) return null;
+ const c = col.getBoundingClientRect(), l = line.getBoundingClientRect();
+ return { share: ((l.top + l.bottom) / 2 - c.top) / c.height };
+ });
+ ok(placed !== null && placed.share > 0.25 && placed.share < 0.65, `an empty contact list says so in the middle of its column, as Notes does ${JSON.stringify(placed)}`);
+ await go(page, "Drive");
+ const dot = await page.evaluate(() => {
+ const text = document.querySelector(".sidebar-sync-text")?.textContent;
+ const d = document.querySelector(".sidebar-sync .sync-dot");
+ return { text, cls: d?.className, colour: d && getComputedStyle(d).backgroundColor };
+ });
+ const gray = await resolve(page, "var(--sys-gray)");
+ ok(dot.text === "Not synced yet" && /\bidle\b/.test(dot.cls) && dot.colour === gray, `"Not synced yet" sits by a grey dot, not the all-clear green ${JSON.stringify(dot)}`);
+ await page.context().close();
+}
+
+await b.close();
+process.exitCode = failures ? 1 : 0;
diff --git a/.uiverify/design-measure.mjs b/.uiverify/design-measure.mjs
new file mode 100644
index 0000000..b1fbf40
--- /dev/null
+++ b/.uiverify/design-measure.mjs
@@ -0,0 +1,40 @@
+// Not a check: measures what the design language should hold the same across apps —
+// pane titles, column tops, source-list headings, row heights, control heights.
+// node .uiverify/design-measure.mjs [scheme] (BASE= the preview server)
+import { engine } from "./engine.mjs";
+import { SERVICES, installStub, openScreen } from "./stub.mjs";
+const [scheme = "light"] = process.argv.slice(2);
+const b = await engine.launch();
+const ctx = await b.newContext({ viewport: { width: 1400, height: 850 }, colorScheme: scheme });
+await ctx.addInitScript(installStub, { screen: "library", services: SERVICES, twoFactor: null,
+ calendarFixture: true, notesFixture: true, contactsFixture: true, driveFixture: true, remindersFixture: true });
+const p = await ctx.newPage();
+await p.goto(process.env.BASE ?? "http://localhost:4173", { waitUntil: "networkidle" });
+const out = {};
+for (const s of ["Reminders", "Notes", "Drive", "Calendar", "Contacts", "Photos", "Settings"]) {
+ if (s === "Settings") await p.locator(".sidebar-account").click();
+ else await openScreen(p, s);
+ await p.waitForTimeout(400);
+ out[s] = await p.evaluate(() => {
+ const main = document.querySelector("main.content:not([hidden])") ?? document.querySelector("main.content");
+ const slot = [...main.querySelectorAll(".screen-slot")].find((e) => !e.hidden) ?? main;
+ const r = (el) => { if (!el) return null; const b = el.getBoundingClientRect(); const cs = getComputedStyle(el);
+ return { cls: el.className?.baseVal ?? el.className, x: Math.round(b.left), y: Math.round(b.top), w: Math.round(b.width), h: Math.round(b.height), fs: cs.fontSize, fw: cs.fontWeight, br: cs.borderRadius }; };
+ const vis = (el) => el.getClientRects().length && getComputedStyle(el).visibility !== "hidden";
+ const all = (sel) => [...slot.querySelectorAll(sel)].filter(vis);
+ const h1 = all("h1")[0];
+ const seps = [...slot.querySelectorAll("*")].filter((e) => vis(e) && parseFloat(getComputedStyle(e).borderRightWidth) > 0 && e.getBoundingClientRect().height > 300).map(r);
+ const heads = all(".side-heading").slice(0, 1).map(r);
+ const rowSel = [".source-row", ".note-row", ".contact-row", ".drive-row", ".rx-row", ".settings-row", ".px-source"];
+ const rows = Object.fromEntries(rowSel.map((s) => [s, all(s).slice(0, 2).map((e) => Math.round(e.getBoundingClientRect().height))]).filter(([, v]) => v.length));
+ const ctl = {};
+ for (const s of [".icon-button", ".tool", ".toolbar-group", ".quiet", ".primary", ".search-field", ".picker-button", ".segment"]) {
+ const hs = [...new Set(all(s).map((e) => Math.round(e.getBoundingClientRect().height) + "/" + getComputedStyle(e).borderRadius))];
+ if (hs.length) ctl[s] = hs;
+ }
+ const firstCol = slot.firstElementChild?.firstElementChild;
+ return { h1: r(h1), heads, seps, rows, ctl, firstCol: r(firstCol) };
+ });
+}
+console.log(JSON.stringify(out, null, 1));
+await b.close();
diff --git a/src/components/Account.tsx b/src/components/Account.tsx
index 2420ca0..57132d9 100644
--- a/src/components/Account.tsx
+++ b/src/components/Account.tsx
@@ -96,6 +96,8 @@ export function AccountCard({ current, onOpen, app }: { current: boolean; onOpen
working = syncing;
status = syncing ? "Syncing…" : failed ? "Some things didn't update" : freshness(report?.asOf ?? null);
}
+ // Nothing synced yet, or the service is not there: the dot does not say all is well.
+ const idle = app ? own.unavailable || own.lastSyncedAt === null : !report?.asOf;
// The first name, as the menu bar greets someone: a full name did not fit the sidebar and
// ended in "…". Settings shows it whole.
const name = account?.name?.split(/\s+/)[0] ?? account?.email ?? "Settings";
@@ -132,7 +134,7 @@ export function AccountCard({ current, onOpen, app }: { current: boolean; onOpen
title={working ? full ?? status : `${full ?? status}. Click to update now`}
aria-label={working ? full ?? status : `${full ?? status}. Update now`}
>
- <span className={`sync-dot ${failed ? "trouble" : working ? "working" : "clean"}`} aria-hidden="true" />
+ <span className={`sync-dot ${failed ? "trouble" : working ? "working" : idle ? "idle" : "clean"}`} aria-hidden="true" />
<span className="sidebar-sync-text" aria-hidden="true">{status}</span>
<span className="sidebar-sync-now" aria-hidden="true">Update Now</span>
</button>
diff --git a/src/components/SyncStatus.tsx b/src/components/SyncStatus.tsx
index 9f2b6fa..6151596 100644
--- a/src/components/SyncStatus.tsx
+++ b/src/components/SyncStatus.tsx
@@ -18,7 +18,7 @@ export function SyncStatus() {
const [showTrouble, setShowTrouble] = useState(false);
const failed = report?.services.filter((s) => s.outcome === "failed") ?? [];
- const state = error || failed.length > 0 ? "trouble" : syncing ? "working" : "clean";
+ const state = error || failed.length > 0 ? "trouble" : syncing ? "working" : report?.asOf ? "clean" : "idle";
const label = syncing ? "Updating…" : freshness(report?.asOf ?? null);
return (
diff --git a/src/styles/app.css b/src/styles/app.css
index 83788f1..db405e5 100644
--- a/src/styles/app.css
+++ b/src/styles/app.css
@@ -200,10 +200,10 @@
margin: 0 auto;
max-width: 40ch;
color: var(--text-2);
- font-size: 0.75rem;
+ font-size: var(--t-12);
line-height: 1.5;
}
-.sheet-status > .assurance { max-width: none; font-size: 0.75rem; line-height: 1.6; }
+.sheet-status > .assurance { max-width: none; font-size: var(--t-12); line-height: 1.6; }
.sheet-foot { margin-top: 28px; display: grid; justify-items: center; gap: 4px; }
@@ -221,7 +221,7 @@
/* A step darker than secondary text: on the panel's tint, --text-2 falls just short of
4.5:1. */
color: color-mix(in srgb, var(--text) 74%, var(--bg));
- font-size: 0.75rem;
+ font-size: var(--t-12);
line-height: 1.5;
}
.help strong { color: var(--text); font-weight: 600; }
@@ -258,7 +258,7 @@
padding: 0;
text-align: center;
font: inherit;
- font-size: 1.5rem;
+ font-size: var(--t-24);
font-weight: 500;
font-variant-numeric: tabular-nums;
color: var(--text);
@@ -348,29 +348,21 @@
transition: background 140ms var(--ease);
}
-.sync-row:hover:not(:disabled) { background: rgba(0, 0, 0, 0.05); }
+.sync-row:hover:not(:disabled) { background: var(--fill-hover); }
.sync-row:disabled { cursor: default; }
-@media (prefers-color-scheme: dark) {
- :root:not([data-theme="light"]) .sync-row:hover:not(:disabled) {
- background: rgba(255, 255, 255, 0.07);
- }
-}
-/* The same, when Settings chooses Dark whatever the system says. */
-:root[data-theme="dark"] .sync-row:hover:not(:disabled) {
- background: rgba(255, 255, 255, 0.07);
- }
-
.sync-dot {
flex: none;
width: 6px;
height: 6px;
border-radius: var(--r-pill);
- background: #34c759;
+ background: var(--sys-green);
}
.sync-dot.working { background: var(--accent); }
-.sync-dot.trouble { background: #ff9f0a; }
+.sync-dot.trouble { background: var(--sys-orange); }
+/* Nothing to vouch for yet — never synced, or not available: grey, not the all-clear green. */
+.sync-dot.idle { background: var(--sys-gray); }
.sync-label {
flex: 1;
@@ -385,7 +377,7 @@
line-height: 1;
}
-.sync-glyph.spinning { animation: sync-spin 900ms linear infinite; }
+.sync-glyph.spinning { animation: sync-spin 800ms linear infinite; }
@keyframes sync-spin {
to { transform: rotate(360deg); }
@@ -477,13 +469,13 @@
}
@media (max-width: 900px) { .sidebar-fold { display: none; } }
@media (prefers-reduced-motion: reduce) { .content, .sidebar, .nav-item { transition: none; } }
-.nav-item:hover { background: color-mix(in srgb, var(--text) 6%, transparent); transition: background-color var(--motion-hover) var(--motion-ease-out); }
+.nav-item:hover { background: var(--fill-hover); transition: background-color var(--motion-hover) var(--motion-ease-out); }
/* Pressed: a shade deeper at once, as a Mac sidebar row darkens under the click. */
-.nav-item:active:not([aria-current="true"]) { background: color-mix(in srgb, var(--text) 12%, transparent); transition: none; }
+.nav-item:active:not([aria-current="true"]) { background: var(--fill-press); transition: none; }
/* The current app: a neutral highlight, as a Tahoe sidebar draws one, the label unchanged in
colour. Tinting it with the app's accent made three apps — Reminders, Drive, Contacts —
select in the same blue; the icon is what tells them apart. */
-.nav-item[aria-current="true"] { background: color-mix(in srgb, var(--text) 10%, transparent); color: var(--text); font-weight: 590; transition: none; }
+.nav-item[aria-current="true"] { background: var(--fill-selected); color: var(--text); font-weight: 590; transition: none; }
.nav-item:focus-visible { outline: var(--focus-ring); outline-offset: -1px; }
.badge {
@@ -497,7 +489,7 @@
.content {
height: 100%;
overflow-y: auto;
- padding: 28px 34px 28px var(--side, 220px);
+ padding: var(--pane-top) 34px 28px var(--side, 220px);
/* No transition: folding the sidebar slides the content on the compositor instead
(Library's slideContent) — a padding animated here re-laid out the whole screen on
every frame. */
@@ -601,7 +593,7 @@
/* Opacity only, short, and not held afterwards ("backwards", not "both"): a sheet that moved
or scaled in sat in an animated compositor layer, and WebKitGTK on Hyprland flickers those. */
-.enter-sheet { animation: sheet-in 200ms ease-out backwards; }
+.enter-sheet { animation: sheet-in 160ms ease-out backwards; }
@media (prefers-reduced-motion: reduce) { .enter-sheet { animation: none; } }
/* The library simply appears: a whole-window animation, held at its last frame forever by
"both", kept the entire app inside an animated layer of WebKitGTK's — and every animation
@@ -616,7 +608,8 @@
.contacts {
display: grid;
- grid-template-columns: 190px minmax(230px, 300px) minmax(0, 1fr);
+ /* The lists' column is the other apps' source list: the same inset either side of its rows. */
+ grid-template-columns: 202px minmax(230px, 300px) minmax(0, 1fr);
height: 100%;
min-height: 0;
}
@@ -627,7 +620,7 @@
gap: 1px;
min-height: 0;
overflow-y: auto;
- padding: 2px 12px 12px 0;
+ padding: var(--source-pad);
margin-right: 14px;
border-right: var(--hairline) solid var(--separator);
}
@@ -665,6 +658,10 @@
/* The list and the letter index beside it share what is left of the column's height. */
.contact-rows-wrap { display: flex; flex: 1 1 auto; min-height: 0; }
+/* With no one to show, the line saying so takes the column, centred as Notes centres its own —
+ after the rows' wrapper, which otherwise took the height and left it at the foot. */
+.contact-rows-wrap:has(~ .empty-state) { flex: none; }
+.contacts-list > .empty-state { flex: 1; justify-content: center; padding-bottom: 18vh; }
.contact-rows { position: relative; flex: 1 1 auto; min-width: 0; list-style: none; margin: 0; padding: 0; overflow-y: auto; min-height: 0; }
/* A long address book lays out and paints only the rows in view. */
.contact-rows > li:not(.contact-letter) { content-visibility: auto; contain-intrinsic-size: auto 38px; }
@@ -675,7 +672,7 @@
}
.contact-index button {
flex: 0 1 18px; min-height: 0; padding: 0; border: 0; background: none;
- color: var(--accent-strong); font: inherit; font-size: 0.625rem; font-weight: 600; line-height: 1;
+ color: var(--accent-strong); font: inherit; font-size: var(--t-10); font-weight: 600; line-height: 1;
cursor: pointer;
}
.contact-index button:hover { color: var(--text); }
@@ -696,9 +693,9 @@
cursor: pointer;
}
-.contact-row:hover { background: color-mix(in srgb, var(--text) 5%, transparent); }
+.contact-row:hover { background: var(--fill-hover); }
/* As macOS selects: the accent with white text while the list has focus, grey after. */
-.contact-row[aria-selected="true"] { background: color-mix(in srgb, var(--text) 11%, transparent); }
+.contact-row[aria-selected="true"] { background: var(--fill-selected); }
.contact-rows.is-focused .contact-row[aria-selected="true"] { background: var(--accent-fill); color: var(--on-accent); }
.contact-rows.is-focused .contact-row[aria-selected="true"] .avatar:not(:has(img)) { background: rgba(255, 255, 255, 0.28); color: #fff; }
.contact-row:focus-visible { outline: var(--focus-ring); outline-offset: -1px; }
@@ -864,7 +861,7 @@
align-content: start;
}
.drive-rows.is-grid .drive-row { position: relative; flex-direction: column; border-bottom: 0; height: 100%; }
-.drive-rows.is-grid .drive-row:hover { background: color-mix(in srgb, var(--text) 6%, transparent); }
+.drive-rows.is-grid .drive-row:hover { background: var(--fill-hover); }
.drive-rows.is-grid .drive-row-hit {
display: flex; flex-direction: column; align-items: center; justify-content: flex-start;
gap: 8px; padding: 14px 8px 10px; text-align: center; height: 100%;
@@ -889,15 +886,28 @@
hover — the same shape reminders and lists already use, so Drive reads as one app rather
than a bolted-on browser. */
.drive-row {
+ position: relative;
display: flex;
align-items: center;
gap: 6px;
width: 100%;
- border-bottom: var(--hairline) solid var(--separator);
border-radius: var(--r-field);
}
+/* The line under a row is drawn apart from it, inset from its rounded ends: as a border of the
+ rounded row it curved up into both corners. None under a selection, which has its own edge. */
+.drive-rows:not(.is-grid) .drive-row:not(.drive-head, .drive-row-new)::after {
+ content: "";
+ position: absolute;
+ left: 10px;
+ right: 10px;
+ bottom: 0;
+ height: var(--hairline);
+ background: var(--separator);
+ pointer-events: none;
+}
+.drive-rows:not(.is-grid) .drive-row.is-selected::after { visibility: hidden; }
-.drive-row:hover { background: color-mix(in srgb, var(--text) 5%, transparent); }
+.drive-row:hover { background: var(--fill-hover); }
.drive-row.is-busy { opacity: 0.6; }
.drive-row-hit {
@@ -1066,24 +1076,21 @@
color: var(--text);
/* macOS 27's pop-up button: a soft fill with no outline, rounded concentric with the
popover or panel it sits in. */
- background: color-mix(in srgb, var(--text) 6%, transparent);
+ background: var(--fill);
border: 0;
border-radius: 8px;
box-shadow: none;
- min-height: 26px;
+ min-height: var(--h-control);
padding: 4px 9px;
cursor: pointer;
text-align: left;
}
-.picker-button:hover:not(:disabled) { background: color-mix(in srgb, var(--text) 10%, transparent); }
+.picker-button:hover:not(:disabled) { background: var(--fill-raised-hover); }
.picker-button:disabled { color: var(--text-3); cursor: default; }
-.picker-button:focus-visible {
- outline: none;
- border-color: var(--accent);
- box-shadow: 0 0 0 3px var(--accent-ring);
-}
+/* The shell's one focus ring (tokens.css): the translucent accent glow it had read at 1.5:1. */
+.picker-button:focus-visible { outline: var(--focus-ring); outline-offset: 1px; }
.picker-value {
flex: 1;
@@ -1367,7 +1374,7 @@
padding: 12px 14px;
border-radius: 12px;
color: var(--text-2);
- font-size: 0.75rem;
+ font-size: var(--t-12);
background: color-mix(in srgb, var(--text) 4%, transparent);
max-height: min(210px, 34vh);
overflow-y: auto;
@@ -1519,16 +1526,16 @@
}
.row-menu-label { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; }
/* The check column: a Mac menu marks a choice that is on with a check before its name. */
-.row-menu-check { flex: none; width: 12px; margin: 0 -6px 0 -4px; font-size: 12px; font-weight: 600; text-align: center; }
-.row-menu-chevron { flex: none; margin-right: -4px; font-size: 15px; line-height: 1; color: var(--text-2); }
+.row-menu-check { flex: none; width: 12px; margin: 0 -6px 0 -4px; font-size: var(--t-12); font-weight: 600; text-align: center; }
+.row-menu-chevron { flex: none; margin-right: -4px; font-size: var(--t-15); line-height: 1; color: var(--text-2); }
.row-menu-item.is-active { background: var(--sys-blue-deep, #0068d6); color: #fff; }
.row-menu-item.is-active .row-menu-chevron { color: #fff; }
/* The danger red that reads on a menu at 4.5:1; the system red read at 3.6:1. */
.row-menu-item.is-danger { color: var(--danger); }
.row-menu-item.is-danger.is-active { background: var(--danger-deep, #c1121f); color: #fff; }
.row-menu-sep { height: var(--hairline); margin: 4px 8px; background: var(--separator); }
-.drive-more { font-size: 9px; letter-spacing: 1px; }
-.drive-row.is-menu { background: color-mix(in srgb, var(--text) 8%, transparent); }
+.drive-more { font-size: 0.5625rem; letter-spacing: 1px; }
+.drive-row.is-menu { background: var(--fill-hover); }
.drive-row.is-menu .drive-row-actions { opacity: 1; }
/* Selected, as Finder marks it: the accent behind the row, its text in white. */
/* The deep accent: white names on the system blue read at 3.5:1. */
@@ -1540,7 +1547,7 @@
/* "Focused" is a class the list sets as the focus comes into it and leaves, not :focus-within:
WebKit restyled every row under a :focus-within ancestor at each move of the focus between
rows — 130 ms an arrow press in a folder of thousands. The same for Contacts' list. */
-.drive-rows:not(.is-grid):not(.is-focused) .drive-row.is-selected { background: color-mix(in srgb, var(--text) 11%, transparent); }
+.drive-rows:not(.is-grid):not(.is-focused) .drive-row.is-selected { background: var(--fill-selected); }
.drive-rows:not(.is-grid):not(.is-focused) .drive-row.is-selected .drive-name { color: var(--text); }
.drive-rows:not(.is-grid):not(.is-focused) .drive-row.is-selected .drive-meta { color: var(--text-2); }
.drive-rows:not(.is-grid):not(.is-focused) .drive-row.is-selected .drive-more { color: var(--text); }
@@ -1601,7 +1608,8 @@
.drive-head { display: none; }
}
-.drive-meta.is-soon { color: var(--sys-red, #ff453a); }
+/* In the text red: the system red as 11px text read at 3.4:1 on the window. */
+.drive-meta.is-soon { color: var(--danger); }
/* A folder or a folder up the path with something held over it, as Finder lights one. */
.drive-row.is-drop { background: color-mix(in srgb, var(--sys-blue, #0a84ff) 16%, transparent); box-shadow: inset 0 0 0 2px var(--sys-blue, #0a84ff); }
@@ -1617,19 +1625,19 @@
padding: 6px 8px; border: 0; border-radius: var(--r-field); background: none;
color: var(--text); font: inherit; text-align: left; cursor: pointer;
}
-.sidebar-account:hover { background: color-mix(in srgb, var(--text) 6%, transparent); transition: background-color var(--motion-hover) var(--motion-ease-out); }
-.sidebar-account:active:not([aria-current="true"]) { background: color-mix(in srgb, var(--text) 12%, transparent); transition: none; }
-.sidebar-account[aria-current="true"] { background: color-mix(in srgb, var(--text) 10%, transparent); transition: none; }
+.sidebar-account:hover { background: var(--fill-hover); transition: background-color var(--motion-hover) var(--motion-ease-out); }
+.sidebar-account:active:not([aria-current="true"]) { background: var(--fill-press); transition: none; }
+.sidebar-account[aria-current="true"] { background: var(--fill-selected); transition: none; }
.sidebar-account:focus-visible { outline: var(--focus-ring); outline-offset: -1px; }
.sidebar-account-name { font-size: var(--t-13); font-weight: 590; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
/* Apple's monogram: initials on a soft grey gradient disc. */
.account-avatar {
flex: none; display: grid; place-items: center; width: 30px; height: 30px; border-radius: 50%;
background: linear-gradient(180deg, #a5a5ab, #85858b); color: #fff;
- font-size: 12px; font-weight: 600; letter-spacing: 0.02em;
+ font-size: var(--t-12); font-weight: 600; letter-spacing: 0.02em;
box-shadow: inset 0 var(--hairline) 0 rgba(255, 255, 255, 0.35);
}
-.account-avatar.is-large { width: 56px; height: 56px; font-size: 21px; }
+.account-avatar.is-large { width: 56px; height: 56px; font-size: 1.3125rem; }
.account-avatar { overflow: hidden; position: relative; }
/* A face over its initials (components/Face): the photo fades in once decoded, or is simply
@@ -1649,7 +1657,7 @@
/* ── Settings, as System Settings lays it out ─────────────────────────────────────────── */
.settings { max-width: 640px; margin: 0 auto; padding-bottom: 40px; }
-.settings-title { margin: 4px 0 18px; font-size: var(--t-28); font-weight: 700; letter-spacing: -0.02em; }
+.content .settings-title { margin: 0 0 18px; font-size: var(--t-28); font-weight: 700; letter-spacing: -0.02em; }
.settings-heading { margin: 22px 12px 6px; font-size: var(--t-13); font-weight: 600; color: var(--text-2); }
.settings-group {
border-radius: 12px;
@@ -1810,10 +1818,10 @@
}
.sidebar-sync-text, .sidebar-sync-now { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.sidebar-sync-now { position: absolute; left: 47px; right: 8px; opacity: 0; color: var(--text); }
-.sidebar-sync:hover:not(:disabled) { background: color-mix(in srgb, var(--text) 6%, transparent); }
+.sidebar-sync:hover:not(:disabled) { background: var(--fill-hover); }
.sidebar-sync:hover:not(:disabled) .sidebar-sync-text { opacity: 0; }
.sidebar-sync:hover:not(:disabled) .sidebar-sync-now { opacity: 1; }
-.sidebar-sync:active:not(:disabled) { background: color-mix(in srgb, var(--text) 10%, transparent); }
+.sidebar-sync:active:not(:disabled) { background: var(--fill-press); }
.sidebar-sync:focus-visible { outline: var(--focus-ring); outline-offset: -1px; }
.sidebar-sync.is-trouble { color: var(--danger); }
/* Working: the dot becomes a small ring turning in place — the same spot, the same size. */
diff --git a/src/styles/calendar.css b/src/styles/calendar.css
index 5445c29..b97224c 100644
--- a/src/styles/calendar.css
+++ b/src/styles/calendar.css
@@ -4,7 +4,6 @@
display: flex;
flex-direction: column;
overflow: hidden;
- padding-top: 18px;
/* The calendar lays itself out by the room it has, not the window's: the app's own sidebar
takes a share of the window, so a window-sized rule came in far too late. */
container: cx-page / inline-size;
@@ -25,7 +24,7 @@
flex-direction: column;
justify-content: space-between;
min-height: 0;
- padding: 4px 14px 10px;
+ padding: var(--source-pad);
border-right: var(--hairline) solid var(--separator);
overflow-y: auto;
}
@@ -65,7 +64,7 @@
}
.cx-minimonth-head > span:last-child { display: inline-flex; gap: 2px; }
.cx-minimonth-grid { display: grid; grid-template-columns: repeat(7, 1fr); row-gap: 1px; }
-.cx-minimonth-wd { color: var(--text-3); font-size: 0.625rem; font-weight: 600; text-align: center; line-height: 20px; }
+.cx-minimonth-wd { color: var(--text-3); font-size: var(--t-10); font-weight: 600; text-align: center; line-height: 20px; }
.cx-minimonth-day {
position: relative;
justify-self: center;
@@ -77,7 +76,7 @@
background: none;
color: var(--text);
font: inherit;
- font-size: 0.6875rem;
+ font-size: var(--t-11);
font-variant-numeric: tabular-nums;
cursor: default;
}
@@ -122,7 +121,7 @@
flex: 1 1 100%;
min-width: 0;
margin: 2px 0 0;
- font-size: 1.75rem;
+ font-size: var(--t-28);
font-weight: 400;
letter-spacing: -0.02em;
white-space: nowrap;
@@ -357,7 +356,7 @@
font-size: var(--t-13);
cursor: default;
}
-.cx-col-num { font-size: 1.25rem; font-weight: 400; color: var(--text); font-variant-numeric: tabular-nums; }
+.cx-col-num { font-size: var(--t-20); font-weight: 400; color: var(--text); font-variant-numeric: tabular-nums; }
.cal-col-head.is-today .cx-col-num {
min-width: 28px;
padding: 0 6px;
@@ -548,7 +547,7 @@
.cx { grid-template-columns: 1fr; }
.cx-side { display: none; }
.cal-year { grid-template-columns: repeat(2, minmax(0, 1fr)); }
- .cx .cx-title { font-size: 1.375rem; }
+ .cx .cx-title { font-size: var(--t-22); }
.cx-title-full { display: none; }
.cx-title-brief { display: inline; }
.cx-bar { gap: 10px 12px; padding-inline: 0; }
@@ -752,7 +751,7 @@
}
/* New Calendar: a quiet + at the end of the iCloud heading, as the Mac's sidebar has. */
-.cx-side-heading { display: flex; align-items: center; justify-content: space-between; margin-top: 10px; padding-right: 0; }
+.cx-side-heading { display: flex; align-items: center; justify-content: space-between; margin-top: var(--source-gap); padding-right: 0; }
.cx-side-heading:first-child { margin-top: 0; }
/* An event's time zone: its city, with the offset quieter beside it; a field that finds one. */
@@ -786,7 +785,7 @@
/* ---- sidebar groups: iCloud, Subscriptions, Other — each folds away -------------------- */
-.cx-group { display: flex; align-items: center; justify-content: space-between; margin-top: 10px; }
+.cx-group { display: flex; align-items: center; justify-content: space-between; margin-top: var(--source-gap); }
.cx-group:first-child { margin-top: 0; }
.cx-group .cx-side-heading {
display: inline-flex; align-items: center; gap: 4px; margin: 0; padding: 2px 8px 2px 4px; border: 0;
@@ -795,13 +794,13 @@
}
.cx-group .cx-side-heading:hover { color: var(--text-2); }
.cx-group .cx-side-heading:focus-visible { outline: var(--focus-ring); outline-offset: -1px; }
-.cx-fold { flex: none; transition: transform 120ms ease; }
+.cx-fold { flex: none; transition: transform var(--motion-small) var(--motion-ease-out); }
.cx-side-heading[aria-expanded="false"] .cx-fold { transform: rotate(-90deg); }
@media (prefers-reduced-motion: reduce) { .cx-fold { transition: none; } }
.cx-cal-problem {
flex: none; display: grid; place-items: center; width: 16px; height: 16px; border-radius: 50%;
background: color-mix(in srgb, var(--sys-orange, #ff9500) 22%, transparent); color: var(--sys-orange, #c76b00);
- font-size: 10px; font-weight: 700;
+ font-size: var(--t-10); font-weight: 700;
}
/* New Calendar Subscription: a small panel in the sidebar, where the subscription will be. */
@@ -920,7 +919,7 @@
.cx-guest-mark {
width: 16px; height: 16px; border-radius: 50%;
display: grid; place-items: center;
- font-size: 10px; font-weight: 700; line-height: 1; color: #fff;
+ font-size: var(--t-10); font-weight: 700; line-height: 1; color: #fff;
box-shadow: inset 0 0 0 var(--hairline) color-mix(in srgb, var(--text) 25%, transparent);
}
.cx-guest-mark.is-accepted { background: #1f8034; box-shadow: none; }
diff --git a/src/styles/intake.css b/src/styles/intake.css
index d476b3a..03dc311 100644
--- a/src/styles/intake.css
+++ b/src/styles/intake.css
@@ -22,7 +22,7 @@
.ix-list li { display: grid; gap: 1px; padding: 8px 12px; }
.ix-list li + li { border-top: var(--hairline) solid var(--separator); }
.ix-title { font-size: var(--t-13); font-weight: 500; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.ix-sub { font-size: 0.75rem; color: var(--text-2); line-height: 1.35; }
+.ix-sub { font-size: var(--t-12); color: var(--text-2); line-height: 1.35; }
.ix-list li.is-skipped .ix-title { color: var(--text-3); }
.ix-list li.is-refused .ix-title { color: var(--text-3); text-decoration: line-through; text-decoration-color: var(--text-3); }
.ix-list li.is-refused .ix-sub { color: var(--text-2); }
@@ -77,6 +77,6 @@ html:has(.qc), html:has(.qc) body, html:has(.qc) #root { height: 100%; margin: 0
border-top: var(--hairline) solid var(--separator);
min-width: 0;
}
-.qc-note { font-size: 0.75rem; color: var(--text-3); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.qc-note { font-size: var(--t-12); color: var(--text-3); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
.qc-error { color: var(--danger); }
.qc-link { padding: 0; font-size: inherit; }
diff --git a/src/styles/kit.css b/src/styles/kit.css
index ed9a348..3931a4c 100644
--- a/src/styles/kit.css
+++ b/src/styles/kit.css
@@ -43,8 +43,8 @@
/* A quiet fill, no outline (Button/Radius 1000 from Large up in Apple's kit). */
.quiet { background: var(--fill); color: var(--text); }
-.quiet:hover:not(:disabled) { background: color-mix(in srgb, var(--text) 11%, transparent); }
-.quiet:active:not(:disabled) { background: color-mix(in srgb, var(--text) 16%, transparent); }
+.quiet:hover:not(:disabled) { background: var(--fill-raised-hover); }
+.quiet:active:not(:disabled) { background: var(--fill-raised-press); }
.quiet:disabled { color: var(--text-3); cursor: default; }
.quiet.danger { color: var(--danger); }
.quiet.danger:hover:not(:disabled) { background: color-mix(in srgb, var(--danger) 12%, transparent); }
@@ -258,7 +258,7 @@ textarea.field { padding-block: 5px; resize: vertical; }
/* The highlight is the row's, not its button's alone: the ⋯ over the row took the hover off
the button, and the highlight blinked out and back. Held while the row's menu is open. */
.source-row:hover, :is(:hover, .is-menu) > .source-row:has(~ .row-more) { background: var(--fill-hover); }
-.source-row[aria-current="true"] { background: var(--fill-press); }
+.source-row[aria-current="true"] { background: var(--fill-selected); }
.source-row:focus-visible { outline: var(--focus-ring); outline-offset: -1px; }
.source-row[data-drop], .is-drop > .source-row { background: var(--accent-tint); outline: 2px solid var(--accent); outline-offset: -2px; }
.source-name { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
@@ -318,7 +318,7 @@ textarea.field { padding-block: 5px; resize: vertical; }
background: var(--accent);
transform-origin: left center;
transform: scaleX(0);
- transition: transform 200ms var(--ease);
+ transition: transform var(--motion-small) var(--motion-ease-out);
}
.progress.is-instant > span { transition: none; }
.progress.is-waiting > span { width: 30%; transform: none; animation: progress-finding 1.2s var(--ease) infinite alternate; }
@@ -542,6 +542,8 @@ textarea.field { padding-block: 5px; resize: vertical; }
border-radius: var(--r-pill);
cursor: pointer;
}
+/* Its track and segments together come to the control height. */
+.segmented:not(.toolbar-group) .segment { min-height: calc(var(--h-control) - 4px); padding-block: 0; }
.segment:hover { color: var(--text); }
.segment[aria-pressed="true"] {
background: var(--sheet);
@@ -575,7 +577,7 @@ textarea.field { padding-block: 5px; resize: vertical; }
border-radius: 50%;
background: #fff;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), 0 0 0 var(--hairline) rgba(0, 0, 0, 0.06);
- transition: translate var(--spring-snappy-d) var(--spring-snappy);
+ transition: translate var(--motion-small) var(--motion-ease-out);
}
/* A switch drawn for a checkbox carries its knob itself. */
span.switch::after { content: ""; }
diff --git a/src/styles/notes.css b/src/styles/notes.css
index a777fda..d8c796f 100644
--- a/src/styles/notes.css
+++ b/src/styles/notes.css
@@ -1,6 +1,6 @@
/* Notes, laid out the way Apple Notes is: folders, the list, the note. */
-.content[data-screen="notes"] { display: flex; flex-direction: column; overflow: hidden; padding-top: 18px; }
+.content[data-screen="notes"] { display: flex; flex-direction: column; overflow: hidden; }
.notes {
flex: 1;
@@ -24,7 +24,7 @@
gap: 1px;
min-height: 0;
overflow-y: auto;
- padding: 2px 12px 12px;
+ padding: var(--source-pad);
border-right: var(--hairline) solid var(--separator);
}
/* Apple's folders are drawn in the accent, which in Notes is its yellow — here, quince gold. */
@@ -77,10 +77,10 @@
box-shadow: inset 0 1px 0 var(--separator);
border-radius: 0 0 8px 8px;
}
-.note-row:hover { background: color-mix(in srgb, var(--text) 5%, transparent); }
+.note-row:hover { background: var(--fill-hover); }
/* The selection as macOS draws it: the accent, text in white, while the list has focus;
a quiet grey once focus is elsewhere — in the note being written, say. */
-.note-row[aria-selected="true"] { background: color-mix(in srgb, var(--text) 11%, transparent); box-shadow: none; }
+.note-row[aria-selected="true"] { background: var(--fill-selected); box-shadow: none; }
.note-rows:focus-within .note-row[aria-selected="true"] { background: var(--accent); color: var(--on-accent); }
.note-rows:focus-within .note-row[aria-selected="true"] .note-row-when,
.note-rows:focus-within .note-row[aria-selected="true"] .note-row-snippet { color: var(--on-accent-2); }
@@ -158,7 +158,7 @@
.note-editor .note-title {
margin: 0 0 6px;
overflow: hidden;
- font-size: 1.5rem;
+ font-size: var(--t-24);
font-weight: 700;
letter-spacing: -0.015em;
line-height: 1.25;
@@ -202,7 +202,7 @@ textarea.note-title::placeholder { color: var(--text-3); }
.note-read { cursor: text; outline: none; }
.note-formatted { font-size: var(--t-15); line-height: 1.55; overflow-wrap: anywhere; }
.note-formatted p, .note-formatted h2, .note-formatted h3, .note-formatted h4, .note-formatted pre { margin: 0; }
-.nf-title { font-size: 1.5rem; font-weight: 700; letter-spacing: -0.015em; line-height: 1.3; margin-top: 6px !important; }
+.nf-title { font-size: var(--t-24); font-weight: 700; letter-spacing: -0.015em; line-height: 1.3; margin-top: 6px !important; }
.nf-heading { font-size: 1.1875rem; font-weight: 700; line-height: 1.35; margin-top: 4px !important; }
.nf-subheading { font-size: 1rem; font-weight: 600; }
.nf-mono { font-family: ui-monospace, "SF Mono", "JetBrains Mono", monospace; font-size: 0.8438rem; white-space: pre-wrap; }
@@ -249,11 +249,11 @@ textarea.note-title::placeholder { color: var(--text-3); }
content: attr(data-placeholder);
content: "New Note";
position: absolute; inset-inline-start: 0; top: 0;
- color: var(--text-3); pointer-events: none; font-size: 1.5rem; font-weight: 700;
+ color: var(--text-3); pointer-events: none; font-size: var(--t-24); font-weight: 700;
}
/* The title, explicit or — Notes' own rule — the first line when it has no style. */
.note-rich .nf-p[data-style="0"],
-.note-rich .nf-p:first-child[data-style="none"] { font-size: 1.5rem; font-weight: 700; letter-spacing: -0.015em; line-height: 1.3; margin-bottom: 6px; }
+.note-rich .nf-p:first-child[data-style="none"] { font-size: var(--t-24); font-weight: 700; letter-spacing: -0.015em; line-height: 1.3; margin-bottom: 6px; }
.note-rich .nf-p[data-style="1"] { font-size: 1.1875rem; font-weight: 700; line-height: 1.35; margin-top: 4px; }
.note-rich .nf-p[data-style="2"] { font-size: 1rem; font-weight: 600; }
.note-rich .nf-p[data-style="4"] { font-family: ui-monospace, "SF Mono", "JetBrains Mono", monospace; font-size: 0.8438rem; }
@@ -352,9 +352,9 @@ textarea.note-title::placeholder { color: var(--text-3); }
.fp-style:focus-visible { outline: var(--focus-ring); outline-offset: -2px; }
.fp-style:not(:has(.fp-list-mark)) > span:last-child { grid-column: 2 / 4; }
.fp-check { display: grid; place-items: center; color: var(--text); }
-.fp-title { font-size: 1.375rem; font-weight: 700; letter-spacing: -0.01em; }
+.fp-title { font-size: var(--t-22); font-weight: 700; letter-spacing: -0.01em; }
.fp-heading { font-size: 1.125rem; font-weight: 700; }
-.fp-subheading { font-size: 0.9375rem; font-weight: 600; }
+.fp-subheading { font-size: var(--t-15); font-weight: 600; }
.fp-mono { font-family: ui-monospace, "SF Mono", "JetBrains Mono", monospace; font-size: 0.875rem; }
.fp-list-mark { width: 16px; color: var(--text-2); }
@@ -412,7 +412,7 @@ textarea.note-title::placeholder { color: var(--text-3); }
.nf-file { display: inline-flex; align-items: center; gap: 10px; max-width: 360px; padding: 8px 12px; border: 0; border-radius: 12px; background: color-mix(in srgb, var(--text) 6%, transparent); color: var(--text); font: inherit; font-size: var(--t-13); cursor: pointer; }
.nf-file:hover { background: color-mix(in srgb, var(--text) 10%, transparent); }
.nf-file-glyph { flex: none; display: grid; place-items: center; min-width: 30px; height: 30px; padding: 0 4px; border-radius: 8px; background: var(--accent); color: var(--on-accent); font-size: 0.5625rem; font-weight: 700; letter-spacing: 0.02em; }
-.nf-file.is-audio .nf-file-glyph, .nf-file.is-video .nf-file-glyph { font-size: 13px; }
+.nf-file.is-audio .nf-file-glyph, .nf-file.is-video .nf-file-glyph { font-size: var(--t-13); }
.nf-file-name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.nf-file-meta { flex: none; color: var(--text-3); font-size: var(--t-11); }
@@ -514,7 +514,7 @@ textarea.note-title::placeholder { color: var(--text-3); }
background: color-mix(in srgb, var(--accent) 16%, transparent);
color: var(--accent-strong);
}
-.note-lock-title { margin: 0; color: var(--text); font-size: 1.0625rem; font-weight: 650; letter-spacing: -0.01em; }
+.note-lock-title { margin: 0; color: var(--text); font-size: var(--t-17); font-weight: 650; letter-spacing: -0.01em; }
.note-lock-lede { margin: 0 0 12px; color: var(--text-2); font-size: var(--t-13); }
.note-lock-form { display: flex; flex-direction: column; gap: 8px; width: min(100%, 248px); }
.note-lock-field { width: 100%; text-align: center; }
diff --git a/src/styles/photos.css b/src/styles/photos.css
index 61ab561..4490222 100644
--- a/src/styles/photos.css
+++ b/src/styles/photos.css
@@ -3,7 +3,7 @@
/* The screen fills the window as Notes does, so the sidebar's divider runs the full height
and only the library scrolls. */
-.content[data-screen="photos"] { display: flex; flex-direction: column; overflow: hidden; padding-top: 18px; }
+.content[data-screen="photos"] { display: flex; flex-direction: column; overflow: hidden; }
.px {
/* An app's own words are not text to select, as in Photos; a field still takes typing. */
@@ -21,13 +21,13 @@
flex-direction: column;
gap: 1px;
min-height: 0;
- padding: 4px 10px 10px;
+ padding: var(--source-pad);
border-right: var(--hairline) solid var(--separator);
overflow-y: auto;
}
.px-glyph { flex: none; color: var(--accent); }
.px-albums { display: flex; flex-direction: column; gap: 1px; }
-.px-side-gap { margin-top: 14px; }
+.px-side-gap { margin-top: var(--source-gap); }
.px-side-row { display: flex; align-items: center; justify-content: space-between; margin-top: 10px; }
.px-side-row .px-side-heading { margin-bottom: 4px; }
@@ -43,7 +43,7 @@
flex-wrap: wrap;
align-items: flex-start;
gap: 8px;
- padding: 12px 16px 0 18px;
+ padding: 0 16px 0 18px;
pointer-events: none;
}
.px-bar > * { pointer-events: auto; }
@@ -212,7 +212,7 @@
align-items: center;
gap: 3px;
color: #fff;
- font-size: 0.6875rem;
+ font-size: var(--t-11);
font-weight: 600;
font-variant-numeric: tabular-nums;
text-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
@@ -466,7 +466,7 @@
border-radius: 5px;
background: rgba(0, 0, 0, 0.55);
color: #fff;
- font-size: 0.625rem;
+ font-size: var(--t-10);
font-weight: 600;
line-height: 15px;
font-variant-numeric: tabular-nums;
@@ -496,7 +496,7 @@
.px-parent-row .px-parent { flex: 1; min-width: 0; }
.px-parent-row .px-side-add { position: absolute; right: 6px; }
.px-parent { padding-left: 2px; }
-.px-chevron { flex: none; color: var(--text-3); transition: transform 180ms var(--spring-quick); }
+.px-chevron { flex: none; color: var(--text-3); transition: transform var(--motion-small) var(--motion-ease-out); }
.px-parent[aria-expanded="true"] .px-chevron { transform: rotate(90deg); }
.px-children { display: flex; flex-direction: column; gap: 1px; }
.px-children .px-source, .px-children .px-naming { padding-left: 30px; }
@@ -736,7 +736,7 @@
border: 2.5px solid rgba(255, 255, 255, 0.28);
border-top-color: #fff;
box-shadow: 0 0 12px rgba(0, 0, 0, 0.35);
- animation: px-spin 0.9s linear infinite;
+ animation: px-spin 800ms linear infinite;
pointer-events: none;
}
@keyframes px-spin { to { rotate: 360deg; } }
diff --git a/src/styles/reminders.css b/src/styles/reminders.css
index d9e64a8..ed4cb46 100644
--- a/src/styles/reminders.css
+++ b/src/styles/reminders.css
@@ -23,7 +23,7 @@
overflow-y: auto;
/* The same inset on both sides, so the search field, tiles and lists sit centred in the
column rather than hard against its left edge. */
- padding: 2px 12px 16px;
+ padding: var(--source-pad);
border-right: var(--hairline) solid var(--separator);
}
@@ -48,13 +48,13 @@
padding: 8px 9px 7px;
border: 0;
border-radius: 10px;
- background: color-mix(in srgb, var(--text) 7%, transparent);
+ background: var(--fill);
color: var(--text);
font: inherit;
text-align: left;
cursor: default;
}
-.rx-tile:hover { background: color-mix(in srgb, var(--text) 10%, transparent); }
+.rx-tile:hover { background: var(--fill-raised-hover); }
.rx-tile:focus-visible { outline: var(--focus-ring); outline-offset: 1px; }
.rx-tile-glyph {
@@ -126,7 +126,7 @@
.rx-group-row { width: 100%; }
.rx-group-row .rx-list-name { font-weight: 600; }
-.rx-chevron { display: grid; place-items: center; color: var(--text-3); transition: transform 180ms var(--ease); }
+.rx-chevron { display: grid; place-items: center; color: var(--text-3); transition: transform var(--motion-small) var(--motion-ease-out); }
.rx-chevron svg { width: 12px; height: 12px; }
.rx-group-row[aria-expanded="true"] .rx-chevron { transform: rotate(90deg); }
@@ -142,7 +142,7 @@
overflow: hidden;
border: 0;
border-radius: 999px;
- background: color-mix(in srgb, var(--text) 7%, transparent);
+ background: var(--fill);
color: var(--text);
font: inherit;
font-size: var(--t-13);
@@ -150,10 +150,10 @@
white-space: nowrap;
cursor: default;
}
-.rx-tag-chip:hover { background: color-mix(in srgb, var(--text) 11%, transparent); }
+.rx-tag-chip:hover { background: var(--fill-raised-hover); }
.rx-tag-chip:focus-visible { outline: var(--focus-ring); outline-offset: 1px; }
.rx-tag-chip[aria-current="true"] { background: color-mix(in srgb, var(--sys-blue) 86%, #000); color: #fff; }
-.rx-side-heading { margin-top: 14px; }
+.rx-side-heading { margin-top: var(--source-gap); }
.rx-side-heading:first-of-type { margin-top: 0; }
.rx-new-list { display: flex; margin-top: 4px; }
@@ -173,7 +173,7 @@
.rx-main > * { max-width: 960px; }
/* The view's name in its own colour (the kit's pane head). */
-.rx-head { padding: 2px 14px 10px 0; }
+.rx-head { padding: 0 14px 10px 0; }
.rx-head h1 { color: var(--accent-strong); }
.rx-capped {