Native iCloud apps for Windows and Linux, built in Rust. Notes, Reminders, Calendar, Contacts, Drive and Photos, offline and in sync with your iPhone.
Rust apple-notesapple-reminderscloudkitcrdtdesktop-appicloudicloud-calendaricloud-driveicloud-notesicloud-photosiphonelinuxlinux-desktoplocal-firstoffline-firstprivacyrusttauritauri-appwindows
Per-app Mac accents from Apple's macOS 27 kit (Notes yellow, Calendar red, rest blue; gold for sign-in), macOS 27 system colours; links never navigate the window — tel:/mailto:/web go to the system's app (fixes 'URL can't be shown'); reminders in Calendar in their list colour; double-click no longer flickers a popover; Ctrl+N late at night stays on today; filled buttons keep colour on hover
Yashwanth Kamireddi60bb41639a5e
diff --git a/.uiverify/calendar-dblclick.mjs b/.uiverify/calendar-dblclick.mjsnew file mode 100644index 0000000..f83cec7--- /dev/null+++ b/.uiverify/calendar-dblclick.mjs@@ -0,0 +1,32 @@+// A double-click on an event keeps its popover open and still: the second click used to+// close it and the release open it again — a flicker, every time.+import { engine } from "./engine.mjs";+import { SERVICES, installStub, openScreen } from "./stub.mjs";+const b = await engine.launch();+const ctx = await b.newContext({ viewport: { width: 1300, height: 850 } });+await ctx.addInitScript(installStub, { screen: "library", services: SERVICES, twoFactor: null, calendarFixture: true });+const page = await ctx.newPage();+await page.goto("http://localhost:4173", { waitUntil: "networkidle" });+await openScreen(page, "Calendar");+let failures = 0;+const ok = (p, m) => { console.log(`${p ? "PASS" : "FAIL"} ${m}`); if (!p) failures++; };+for (const [key, sel, name] of [["Control+2", ".cx-block", "Week"], ["Control+3", ".cx-item:not(.is-reminder)", "Month"]]) {+ await page.keyboard.press(key);+ await page.waitForTimeout(400);+ await page.evaluate(() => {+ window.__popChanges = 0;+ window.__watch?.disconnect();+ window.__watch = new MutationObserver((m) => {+ for (const r of m) for (const n of [...r.addedNodes, ...r.removedNodes]) if (n.nodeType === 1 && (n.matches?.(".cx-popover") || n.querySelector?.(".cx-popover"))) window.__popChanges++;+ });+ window.__watch.observe(document.body, { childList: true, subtree: true });+ });+ await page.locator(sel, { hasText: "Design review" }).first().dblclick();+ await page.waitForTimeout(300);+ const changes = await page.evaluate(() => window.__popChanges);+ ok(changes === 1 && (await page.locator(".cx-popover").count()) === 1, `${name}: a double-click opens the popover once, with no flicker [${changes} change(s)]`);+ await page.keyboard.press("Escape");+ await page.waitForTimeout(200);+}+await b.close();+process.exitCode = failures ? 1 : 0;diff --git a/.uiverify/calendar-reminder-colour.mjs b/.uiverify/calendar-reminder-colour.mjsnew file mode 100644index 0000000..1bafc75--- /dev/null+++ b/.uiverify/calendar-reminder-colour.mjs@@ -0,0 +1,26 @@+// Scheduled reminders in Calendar are drawn in their list's colour, as on the Mac — ring+// and words — in Month, Week and Day; a reminder whose list has none takes the system blue.+import { engine } from "./engine.mjs";+import { SERVICES, installStub, openScreen } from "./stub.mjs";+const b = await engine.launch();+const ctx = await b.newContext({ viewport: { width: 1300, height: 850 } });+await ctx.addInitScript(installStub, { screen: "library", services: SERVICES, twoFactor: null, calendarFixture: true, remindersFixture: true });+const page = await ctx.newPage();+await page.goto("http://localhost:4173", { waitUntil: "networkidle" });+await openScreen(page, "Calendar");+let failures = 0;+const ok = (p, m) => { console.log(`${p ? "PASS" : "FAIL"} ${m}`); if (!p) failures++; };+const colours = (sel) => page.evaluate((sel) => Object.fromEntries([...document.querySelectorAll(sel)].map((e) => [e.textContent.trim().slice(0, 12), getComputedStyle(e).getPropertyValue("--cal").trim()])), sel);+await page.keyboard.press("Control+3");+await page.waitForTimeout(500);+let seen = await colours(".cx-item.is-reminder");+ok(seen["Evening run"] === "#cc73e1" && seen["Water the pl"] === "#63da38", `Month draws each reminder in its list's colour ${JSON.stringify(seen)}`);+await page.keyboard.press("Control+2");+await page.waitForTimeout(500);+await page.evaluate(() => { document.querySelector(".cx-scroll").scrollTop = 4 * 48; });+seen = await colours(".cx-reminder");+ok(Object.values(seen).includes("#cc73e1"), `and Week ${JSON.stringify(seen)}`);+const ring = await page.evaluate(() => getComputedStyle(document.querySelector(".cx-reminder .cx-ring")).borderTopColor);+ok(ring !== "rgb(142, 142, 147)" && ring !== "rgba(0, 0, 0, 0)", `its ring in that colour ${ring}`);+await b.close();+process.exitCode = failures ? 1 : 0;diff --git a/.uiverify/stub.mjs b/.uiverify/stub.mjsindex dd7a51e..8f0a1f2 100644--- a/.uiverify/stub.mjs+++ b/.uiverify/stub.mjs@@ -41,11 +41,11 @@ export function installStub({ screen, services, twoFactor, calendarFixture, notetimezone: null, url: null, notes: null, etag: null },];const dueReminders = !calendarFixture ? [] : [- { guid: "r1", listGuid: "daily", title: "Water the plants", notes: null,+ { guid: "r1", listGuid: "l1", title: "Water the plants", notes: null,dueAt: base + DAY + 8 * HOUR, completedAt: null, priority: 1, etag: null },- { guid: "r2", listGuid: "health", title: "Evening run", notes: null,+ { guid: "r2", listGuid: "l2", title: "Evening run", notes: null,dueAt: base + 6 * HOUR, completedAt: null, priority: 0, etag: null },- { guid: "r3", listGuid: "daily", title: "Plan tomorrow", notes: null,+ { guid: "r3", listGuid: "l1", title: "Plan tomorrow", notes: null,dueAt: base + 13 * HOUR, completedAt: base + 13 * HOUR, priority: 0, etag: null },];const noteFolders = [diff --git a/Cargo.lock b/Cargo.lockindex 317732a..82bba35 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2083,6 +2083,25 @@ version = "2.12.2"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0"+[[package]]+name = "is-docker"+version = "0.2.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"+dependencies = [+ "once_cell",+]++[[package]]+name = "is-wsl"+version = "0.4.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"+dependencies = [+ "is-docker",+ "once_cell",+]+[[package]]name = "itoa"version = "1.0.18"@@ -2867,6 +2886,17 @@ version = "1.21.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"+[[package]]+name = "open"+version = "5.4.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "aa576c76302b7b808eecc68061e67336c47833ef9d22caa74dda10fa9675eebc"+dependencies = [+ "dunce",+ "is-wsl",+ "libc",+]+[[package]]name = "option-ext"version = "0.2.0"@@ -3238,6 +3268,7 @@ dependencies = ["tauri","tauri-build","tauri-plugin-dialog",+ "tauri-plugin-opener","tauri-plugin-single-instance","tempfile","tokio",@@ -4562,6 +4593,28 @@ dependencies = ["url",]+[[package]]+name = "tauri-plugin-opener"+version = "2.5.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "60d60366174b745b4ef5824b8bbc1c457fd08f0ce101ff643c0a49181a9f4e91"+dependencies = [+ "dunce",+ "glob",+ "objc2-app-kit",+ "objc2-foundation",+ "open",+ "schemars 0.8.22",+ "serde",+ "serde_json",+ "tauri",+ "tauri-plugin",+ "thiserror 2.0.20",+ "url",+ "windows 0.61.3",+ "zbus 5.19.0",+]+[[package]]name = "tauri-plugin-single-instance"version = "2.4.5"diff --git a/check.sh b/check.shindex 4a65870..b271c52 100755--- a/check.sh+++ b/check.sh@@ -65,6 +65,8 @@ step "contacts order" node .uiverify/contacts-order.mjsstep "contacts lists" node .uiverify/contacts-lists.mjsstep "drive keys" node .uiverify/drive-keys.mjsstep "drive drag" node .uiverify/drive-drag.mjs+step "reminder colours" node .uiverify/calendar-reminder-colour.mjs+step "calendar dblclick" node .uiverify/calendar-dblclick.mjsstep "contacts vcard" node .uiverify/contacts-vcard.mjsstep "contacts select" node .uiverify/contacts-select.mjsstep "calendar alerts" node .uiverify/calendar-alerts.mjsdiff --git a/crates/quince-icloud/src/notes.rs b/crates/quince-icloud/src/notes.rsindex 7f2a1a2..b2acd8d 100644--- a/crates/quince-icloud/src/notes.rs+++ b/crates/quince-icloud/src/notes.rs@@ -1572,12 +1572,12 @@ mod write_tests {serde_json::from_slice::<Value>(&modify.body).unwrap()["operations"][0]["record"].clone()}- /// The phone changed the very words being edited here: nothing is written, and the- /// phone's version stands until the person decides.+ /// The phone added to the very line being edited here: both additions are written, as+ /// Notes merges them — the phone's first — and neither device's words are lost.#[tokio::test]- async fn an_edit_over_a_phone_edit_in_the_same_place_writes_nothing() {+ async fn an_edit_over_a_phone_edit_in_the_same_place_keeps_both() {let server = server("Curtains\nmeasure the bay window twice").await;- let err = edit_cloudkit_from(+ let saved = edit_cloudkit_from(&reqwest::Client::new(),&server.uri(),vec![],@@ -1586,18 +1586,15 @@ mod write_tests {"Curtains\nmeasure the bay window once",).await- .unwrap_err();- assert!(- err.to_string().contains("changed on another device"),- "{err}"- );+ .unwrap();+ assert_eq!(saved, "Curtains\nmeasure the bay window twice once");let wrote = server.received_requests().await.unwrap().iter().any(|r| r.url.path().ends_with("/records/modify"));- assert!(!wrote, "nothing may be written over the phone's edit");+ assert!(wrote, "the merged note is written");}/// Apart, both survive: the phone's line and ours.diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.tomlindex 47dbde2..a618b18 100644--- a/src-tauri/Cargo.toml+++ b/src-tauri/Cargo.toml@@ -24,6 +24,7 @@ jiff = "0.2.37"uuid.workspace = truebase64 = "0.22"tauri-plugin-dialog = "2.7.3"+tauri-plugin-opener = "2"notify-rust = "4"zbus = "5"tauri-plugin-single-instance = "2"diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rsindex 3b469eb..3e629a0 100644--- a/src-tauri/src/main.rs+++ b/src-tauri/src/main.rs@@ -2626,6 +2626,33 @@ fn main() {show_window(app);})).plugin(tauri_plugin_dialog::init())+ .plugin(tauri_plugin_opener::init())+ // The window shows Quince and nothing else. A link to anywhere outside it — a phone+ // number, an address, a web page in a note or an event — goes to the app this+ // computer uses for it. Followed in place, a `tel:` link replaced the whole window+ // with "URL can't be shown", and there was no way back.+ .plugin(+ tauri::plugin::Builder::<tauri::Wry, ()>::new("links")+ .on_navigation(|webview, url| {+ let inside =+ matches!(url.scheme(), "tauri" | "quince" | "about" | "data" | "blob")+ || url+ .host_str()+ .is_some_and(|h| h == "tauri.localhost" || h == "localhost");+ if !inside {+ use tauri_plugin_opener::OpenerExt;+ if let Err(e) = webview+ .app_handle()+ .opener()+ .open_url(url.as_str(), None::<&str>)+ {+ eprintln!("could not open {url}: {e}");+ }+ }+ inside+ })+ .build(),+ )// Closing the window hides it rather than quitting, so reminders still ring. Quit is// in the tray. Where no tray could be made there is nowhere to come back from, so// there closing quits as it always did.diff --git a/src/main.tsx b/src/main.tsxindex fe6ed06..30140c9 100644--- a/src/main.tsx+++ b/src/main.tsx@@ -7,6 +7,20 @@ import "./styles/reminders.css";import "./styles/calendar.css";import "./styles/notes.css";+/*+ * Every link goes the one way out: as a navigation, which the window refuses and hands to+ * the app this computer uses for it (see the "links" plugin in main.rs). A link meant for a+ * new window would otherwise slip past that — WebKitGTK asks for a window instead — so it+ * is followed in place, where the refusal catches it.+ */+document.addEventListener("click", (e) => {+ const a = (e.target as HTMLElement | null)?.closest?.("a[href]") as HTMLAnchorElement | null;+ if (!a || e.defaultPrevented || a.target !== "_blank") return;+ e.preventDefault();+ window.location.assign(a.href);+ // Capturing, so a link whose own handler stops the click from spreading is covered too.+}, true);+ReactDOM.createRoot(document.getElementById("root")!).render(<React.StrictMode><App />diff --git a/src/screens/Library.tsx b/src/screens/Library.tsxindex 9e5cb34..363f481 100644--- a/src/screens/Library.tsx+++ b/src/screens/Library.tsx@@ -75,6 +75,15 @@ export function Library({ onSignOut }: { onSignOut: () => void }) {.catch((e) => setError(messageOf(e)));}, []);+ // The open app's accent belongs to the whole window — menus and popovers drawn over it+ // too — as each Mac app colours itself: Notes yellow, Calendar red, the rest blue.+ useEffect(() => {+ document.documentElement.dataset.app = selected ?? "";+ return () => {+ delete document.documentElement.dataset.app;+ };+ }, [selected]);+const choose = (key: string) => {setSelected(key);setSidebarOpen(false);diff --git a/src/screens/calendar/CalendarView.tsx b/src/screens/calendar/CalendarView.tsxindex a381ac8..4c24fa6 100644--- a/src/screens/calendar/CalendarView.tsx+++ b/src/screens/calendar/CalendarView.tsx@@ -142,7 +142,12 @@ type Draft = {* reminder there and then. It fills at once, lingers a moment so the tick is seen, and leaves* the schedule — Calendar shows no completed reminders.*/-const TickContext = createContext<{ ticked: Set<string>; tick: (r: Reminder) => void } | null>(null);+const TickContext = createContext<{ ticked: Set<string>; tick: (r: Reminder) => void; colour: (r: Reminder) => string } | null>(null);+/** A reminder's list colour, as Calendar on the Mac draws scheduled reminders in it. */+const useListColour = () => {+ const ctx = useContext(TickContext);+ return (r: Reminder) => ({ "--cal": ctx?.colour(r) ?? "var(--sys-blue)" }) as React.CSSProperties;+};function Ring({ reminder }: { reminder: Reminder }) {const ctx = useContext(TickContext);const done = ctx?.ticked.has(reminder.guid) ?? false;@@ -241,8 +246,11 @@ export function CalendarView() {const [events, setEvents] = useState<CalendarEvent[]>([]);const [due, setDue] = useState<Reminder[]>([]);const [ticked, setTicked] = useState<Set<string>>(() => new Set());+ /** Each Reminders list's colour, by list. */+ const [listColours, setListColours] = useState<Map<string, string>>(() => new Map());const tickValue = useMemo(() => ({ticked,+ colour: (r: Reminder) => listColours.get(r.listGuid) || "var(--sys-blue)",tick: (r: Reminder) => {setTicked((was) => new Set(was).add(r.guid));const untick = () => setTicked((was) => { const next = new Set(was); next.delete(r.guid); return next; });@@ -251,13 +259,15 @@ export function CalendarView() {(e) => { untick(); setError(messageOf(e)); },);},- }), [ticked]);+ }), [ticked, listColours]);const [calendars, setCalendars] = useState<Calendar[]>([]);const [hidden, setHidden] = useState<Set<string>>(() => readSet(HIDDEN_KEY));const [loaded, setLoaded] = useState(false);const [error, setError] = useState<string | null>(null);const [busy, setBusy] = useState(false);const [draft, setDraft] = useState<Draft | null>(null);+ const draftRef = useRef<Draft | null>(null);+ draftRef.current = draft;const [anchor, setAnchor] = useState<Anchor | null>(null);/** The last event deleted, held so the deletion can be taken back. */const [undo, setUndo] = useState<CalendarEvent | null>(null);@@ -293,11 +303,13 @@ export function CalendarView() {}, [view, selected, week, month]);const read = useCallback(async () => {- const [found, cals, reminders] = await Promise.all([+ const [found, cals, reminders, lists] = await Promise.all([api.calendarEvents(range.from, range.to),api.calendarList(),api.remindersDueBetween(range.from, range.to),+ api.reminderLists().catch(() => []),]);+ setListColours(new Map((Array.isArray(lists) ? lists : []).map((l) => [l.guid, l.colour && /^#[0-9a-f]{6}$/i.test(l.colour) ? l.colour : ""])));setEvents(Array.isArray(found) ? found : []);setCalendars(Array.isArray(cals) ? cals : []);// What is done is not on the schedule any more; Calendar hides completed reminders.@@ -493,6 +505,9 @@ export function CalendarView() {}, [undo]);const openDraft = (d: Draft, at: Anchor) => {+ // The event already open stays as it is: a second click — a double-click — closed it and+ // opened it again, and the popover flickered.+ if (d.guid && draftRef.current?.guid === d.guid) return;setDraft(d.guid ? d : { ...d, alerts: [], repeat: null });setAnchor(at);const guid = d.guid;@@ -518,7 +533,9 @@ export function CalendarView() {/** "New event": the next whole hour on the selected day, for an hour — Apple's default. */const newEvent = (e?: React.MouseEvent) => {const at = new Date(selected);- at.setHours(now.getHours() + 1, 0, 0, 0);+ // Late in the evening the next whole hour is tomorrow — in Week, often next week, off+ // the screen it was asked for on. It stays on the day: the last hour of it.+ at.setHours(Math.min(now.getHours() + 1, 23), 0, 0, 0);const button = (e?.currentTarget ?? document.querySelector('[aria-label="New event"]'))?.getBoundingClientRect()?? new DOMRect(window.innerWidth - 40, 40, 0, 0);// Under the button, never over the toolbar; in Day and Week it moves beside the new event@@ -990,6 +1007,7 @@ function MonthView({onCreate: (d: Date, at: Anchor) => void;onMore: (d: Date) => void;}) {+ const listColour = useListColour();const cell = useRef<HTMLButtonElement | null>(null);const focused = useRef(false);const inMonth = selected.getMonth();@@ -1095,6 +1113,7 @@ function MonthView({<li key={item.event.guid}><buttonclassName="cx-item"+ data-event={item.event.guid}style={{ "--cal": tint(calendars.get(item.event.calendarGuid)) } as React.CSSProperties}// Named in full, for the dot that is all a narrow cell shows.aria-label={`${item.event.title}, ${clock(item.event.startsAt)}`}@@ -1110,6 +1129,7 @@ function MonthView({<li key={item.reminder.guid}><spanclassName={`cx-item is-reminder${item.reminder.completedAt ? " is-done" : ""}`}+ style={listColour(item.reminder)}title={dots ? `${item.reminder.title} · ${clock(item.at)}` : undefined}><Ring reminder={item.reminder} />@@ -1191,6 +1211,7 @@ function TimeGrid({/** A new event being named in the popover, held on the grid where it was made. */pending?: { startsAt: number; endsAt: number; title: string } | null;}) {+ const listColour = useListColour();const scroller = useRef<HTMLDivElement | null>(null);const columnsEl = useRef<HTMLDivElement | null>(null);const [drag, setDrag] = useState<Drag | null>(null);@@ -1383,6 +1404,7 @@ function TimeGrid({{spans.map((s) => (<buttonkey={s.event.guid}+ data-event={s.event.guid}className={`cx-bar-event${s.continuesLeft ? " from-before" : ""}${s.continuesRight ? " to-after" : ""}`}style={{@@ -1448,6 +1470,7 @@ function TimeGrid({return (<buttonkey={p.event.guid}+ data-event={p.event.guid}className={`cx-block${moving || sizing ? " is-moving" : ""}${p.length < 45 ? " is-short" : ""}`}style={{@@ -1500,6 +1523,7 @@ function TimeGrid({key={r.guid}className={`cx-reminder${r.completedAt ? " is-done" : ""}`}style={{+ ...listColour(r),top: `${(m.top / 60) * HOUR}px`,left: `calc(${(m.column / m.columns) * 100}% + 4px)`,maxWidth: `calc(${100 / m.columns}% - 8px)`,@@ -1738,7 +1762,10 @@ function EventPopover({}};const onDown = (e: MouseEvent) => {- if (box.current && !box.current.contains(e.target as Node)) onClose();+ if (!box.current || box.current.contains(e.target as Node)) return;+ // A press on the event this is open for is not a press elsewhere: it keeps it open.+ if (draft.guid && (e.target as HTMLElement).closest?.(`[data-event="${CSS.escape(draft.guid)}"]`)) return;+ onClose();};window.addEventListener("keydown", onKey);window.addEventListener("mousedown", onDown);@@ -1746,7 +1773,7 @@ function EventPopover({window.removeEventListener("keydown", onKey);window.removeEventListener("mousedown", onDown);};- }, [onClose, onDelete, onNudge, editable, view, draft.allDay]);+ }, [onClose, onDelete, onNudge, editable, view, draft.allDay, draft.guid]);const set = (patch: Partial<Draft>) => onChange({ ...draft, ...patch });@@ -1977,6 +2004,7 @@ function DayPane({onOpen: (e: CalendarEvent, at: Anchor) => void;children?: React.ReactNode;}) {+ const listColour = useListColour();const from = seconds(day);const to = seconds(addDays(day, 1));const today = events.filter((e) => e.startsAt < to && e.endsAt > from);@@ -1989,6 +2017,7 @@ function DayPane({<li key={e.guid}><buttonclassName="cx-pane-event"+ data-event={e.guid}style={{ "--cal": tint(calendars.get(e.calendarGuid)) } as React.CSSProperties}onClick={(ev) => onOpen(e, pointOf(ev.currentTarget))}>@@ -2011,7 +2040,7 @@ function DayPane({{allDay.map((e) => row(e, "all-day"))}{timed.map((e) => row(e, `${clock(e.startsAt)} – ${clock(e.endsAt)}`))}{due.map((r) => (- <li key={r.guid} className="cx-pane-reminder">+ <li key={r.guid} className="cx-pane-reminder" style={listColour(r)}><Ring reminder={r} /><span className="cx-pane-title">{r.title}</span><span className="cx-pane-when">{clock(r.dueAt ?? 0)}</span>diff --git a/src/styles/app.css b/src/styles/app.cssindex c32ca13..a540933 100644--- a/src/styles/app.css+++ b/src/styles/app.css@@ -4,7 +4,7 @@z-index: 0;pointer-events: none;background:- radial-gradient(110% 80% at 8% -10%, color-mix(in srgb, var(--gold) 7%, transparent), transparent 58%),+ radial-gradient(110% 80% at 8% -10%, color-mix(in srgb, var(--accent) 7%, transparent), transparent 58%),radial-gradient(90% 70% at 100% 108%, color-mix(in srgb, var(--text) 5%, transparent), transparent 52%);}@@ -66,8 +66,8 @@.field-group:hover { border-color: var(--field-edge-hover); }.field-group:focus-within {- border-color: var(--gold);- box-shadow: var(--shadow-field), 0 0 0 3px var(--gold-ring);+ border-color: var(--accent);+ box-shadow: var(--shadow-field), 0 0 0 3px var(--accent-ring);}.field-group input {@@ -95,7 +95,7 @@.primary {border: 0;border-radius: var(--r-field);- background: var(--gold-deep);+ background: var(--accent-deep);color: #fff;font: inherit;font-size: var(--t-13);@@ -105,14 +105,14 @@transition: background 130ms var(--ease), transform 130ms var(--ease);}-.primary:hover:not(:disabled) { background: #6a4c12; }-.primary:active:not(:disabled) { transform: scale(0.985); }+/* A Mac button keeps its colour under the pointer; pressing darkens its own colour. */+.primary:active:not(:disabled) { background: color-mix(in srgb, var(--accent-deep) 84%, #000); transform: scale(0.985); }.primary:disabled {background: color-mix(in srgb, var(--text) 11%, transparent);color: var(--text-3);cursor: default;}-.primary:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: 2px; }+.primary:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: 2px; }/* A secondary button, in the macOS shape: a hairline-bordered plateau with a quiet fill.It used to be bare coloured text that underlined on hover, which reads as a link — so@@ -137,7 +137,7 @@}.quiet:disabled { color: var(--text-3); cursor: default; }-.quiet:focus-visible { outline: none; border-color: var(--gold); box-shadow: 0 0 0 3px var(--gold-ring); }+.quiet:focus-visible { outline: none; border-color: var(--accent); box-shadow: 0 0 0 3px var(--accent-ring); }/* The sign-in screen's button is the one thing on the screen, so it takes the width andthe weight. Everywhere else it is one control among several. */@@ -237,8 +237,8 @@}.code input:focus {- border-color: var(--gold);- box-shadow: var(--shadow-field), 0 0 0 3px var(--gold-ring);+ border-color: var(--accent);+ box-shadow: var(--shadow-field), 0 0 0 3px var(--accent-ring);}/* ---- library ----------------------------------------------------------------- */@@ -317,7 +317,7 @@background: #34c759;}-.sync-dot.working { background: var(--gold); }+.sync-dot.working { background: var(--accent); }.sync-dot.trouble { background: #ff9f0a; }.sync-label {@@ -373,7 +373,7 @@border: 0;background: none;box-shadow: none;- color: var(--gold);+ color: var(--accent-strong);padding: 4px 8px;}@@ -437,7 +437,7 @@border: 0; border-radius: 7px; background: none; box-shadow: none; color: var(--text-2); cursor: pointer;}.sidebar-fold:hover { background: color-mix(in srgb, var(--text) 8%, transparent); color: var(--text); }-.sidebar-fold:focus-visible { outline: 3px solid var(--gold-ring); }+.sidebar-fold:focus-visible { outline: 3px solid var(--accent-ring); }/* Folded: the icons alone, centred, names gone; the foot keeps only its status dot. */@media (min-width: 901px) {.is-rail .sidebar { width: 60px; }@@ -451,8 +451,8 @@@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); }-.nav-item[aria-current="true"] { background: var(--gold-tint); color: var(--gold-strong); font-weight: 550; }-.nav-item:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: -1px; }+.nav-item[aria-current="true"] { background: var(--accent-tint); color: var(--accent-strong); font-weight: 550; }+.nav-item:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: -1px; }.nav-toggle {margin-top: 6px;@@ -540,7 +540,7 @@color: var(--text);cursor: default;}- .sidebar-toggle:focus-visible { outline: 3px solid var(--gold-ring); }+ .sidebar-toggle:focus-visible { outline: 3px solid var(--accent-ring); }.is-sidebar-open .sidebar-scrim {position: absolute;z-index: 25;@@ -565,13 +565,13 @@border: 0;border-radius: 7px;background: none;- color: var(--gold);+ color: var(--accent-strong);font: inherit;font-size: var(--t-15);cursor: default;}.compact-back span { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }- .compact-back:focus-visible { outline: 3px solid var(--gold-ring); }+ .compact-back:focus-visible { outline: 3px solid var(--accent-ring); }}.content h1 { margin: 0 0 6px; font-size: var(--t-28); font-weight: 600; letter-spacing: -0.022em; }/*@@ -645,7 +645,7 @@}.chev:hover { background: color-mix(in srgb, var(--text) 7%, var(--field)); }-.chev:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: 1px; }+.chev:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: 1px; }.today-btn {height: 24px;@@ -660,7 +660,7 @@}.today-btn:hover { background: color-mix(in srgb, var(--text) 7%, var(--field)); }-.today-btn:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: 1px; }+.today-btn:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: 1px; }.cal-actions { display: flex; align-items: center; gap: 12px; }@@ -679,7 +679,7 @@/* White on the standard gold falls below 4.5:1, so today's badge uses a deeper shade. */.daynum.is-today {- background: var(--gold-deep);+ background: var(--accent-deep);color: #fff;font-weight: 650;}@@ -739,8 +739,8 @@}.rem-list:hover { background: color-mix(in srgb, var(--text) 6%, transparent); }-.rem-list[aria-current="true"] { background: var(--gold-tint); font-weight: 550; }-.rem-list:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: -1px; }+.rem-list[aria-current="true"] { background: var(--accent-tint); font-weight: 550; }+.rem-list:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: -1px; }.rem-list-name { flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }/* A reminder in the calendar reads as a task, not an event: a ring rather than a dot. */@@ -766,7 +766,7 @@border-color: var(--text-3);}-.pin { color: var(--gold); font-size: 9px; margin-right: 5px; vertical-align: 2px; }+.pin { color: var(--accent); font-size: 9px; margin-right: 5px; vertical-align: 2px; }.quiet.danger { color: var(--danger); }@@ -798,8 +798,8 @@}.contacts-list-glyph { flex: none; color: var(--text-2); }.contacts-lists .notes-folder-row.is-drop .notes-folder {- background: var(--gold-tint);- box-shadow: inset 0 0 0 2px var(--gold);+ background: var(--accent-tint);+ box-shadow: inset 0 0 0 2px var(--accent);}.contacts-list-picker { display: none; margin-bottom: 8px; }.contacts-list-picker .picker { width: 100%; }@@ -844,7 +844,7 @@outline: none;}-.contacts-search:focus { border-color: var(--gold); box-shadow: 0 0 0 3px var(--gold-ring); }+.contacts-search:focus { border-color: var(--accent); box-shadow: 0 0 0 3px var(--accent-ring); }.contacts-search::placeholder { color: var(--text-3); }.contact-rows { list-style: none; margin: 0; padding: 0; overflow-y: auto; min-height: 0; }@@ -868,9 +868,9 @@.contact-row:hover { background: color-mix(in srgb, var(--text) 5%, transparent); }/* As macOS selects: the accent with white text while the list has focus, grey after. */.contact-row[aria-current="true"] { background: color-mix(in srgb, var(--text) 11%, transparent); }-.contact-rows:focus-within .contact-row[aria-current="true"] { background: var(--gold); color: #fff; }+.contact-rows:focus-within .contact-row[aria-current="true"] { background: var(--accent); color: var(--on-accent); }.contact-rows:focus-within .contact-row[aria-current="true"] .avatar:not(:has(img)) { background: rgba(255, 255, 255, 0.28); color: #fff; }-.contact-row:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: -1px; }+.contact-row:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: -1px; }.contact-row-name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }/* Several picked: their faces fanned, the count, and what can be done to all of them. */.contact-many { display: flex; flex-direction: column; align-items: center; gap: 14px; padding-top: 48px; text-align: center; }@@ -879,7 +879,7 @@.contact-many h2 { margin: 0; font-size: var(--t-17); }/* "me" beside this person's own card, as Contacts marks it. */.contact-me { margin-left: auto; color: var(--text-3); font-size: var(--t-11); }-.contact-rows:focus-within .contact-row[aria-current="true"] .contact-me { color: rgba(255, 255, 255, 0.82); }+.contact-rows:focus-within .contact-row[aria-current="true"] .contact-me { color: var(--on-accent-2); }.avatar {width: 26px;@@ -960,7 +960,7 @@color: var(--text-2);padding: 4px 0;}-.contact-methods a { color: var(--gold); text-decoration: none; }+.contact-methods a { color: var(--accent-strong); text-decoration: none; }.contact-methods a:hover { text-decoration: underline; }.contact-notes { margin-top: 20px; color: var(--text-2); white-space: pre-wrap; }@@ -989,7 +989,7 @@.crumb:hover { background: color-mix(in srgb, var(--text) 7%, transparent); color: var(--text); }.crumb[aria-current="true"] { color: var(--text); font-weight: 600; }-.crumb:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: 1px; }+.crumb:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: 1px; }.crumb-sep { color: var(--text-3); padding: 0 1px; }.drive-rows { list-style: none; margin: 8px 0 0; padding: 0; overflow-y: auto; min-height: 0; }@@ -1056,7 +1056,7 @@}.drive-row-hit:disabled { cursor: default; }-.drive-row-hit:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: -1px; }+.drive-row-hit:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: -1px; }/* One width for every row, whether it has three actions or four, so the columns before itline up down the list — a file's extra Download had pushed its size and date left. */@@ -1082,11 +1082,11 @@font-size: var(--t-13);color: var(--text);background: var(--field);- border: 1px solid var(--gold);+ border: 1px solid var(--accent);border-radius: var(--r-field);padding: 4px 8px;outline: none;- box-shadow: 0 0 0 3px var(--gold-ring);+ box-shadow: 0 0 0 3px var(--accent-ring);}.drive-row-new {@@ -1100,7 +1100,7 @@.drive-saved {margin: 6px 0 0;font-size: var(--t-11);- color: var(--gold-strong);+ color: var(--accent-strong);animation: rem-moved-in 240ms var(--ease-spring) both;}@@ -1149,7 +1149,7 @@.drive-action:hover { background: color-mix(in srgb, var(--text) 10%, transparent); color: var(--text); }.drive-action.danger:hover { background: color-mix(in srgb, var(--danger) 14%, transparent); color: var(--danger); }-.drive-action:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: -1px; }+.drive-action:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: -1px; }.drive-action:disabled { opacity: 0.4; cursor: default; }/* A button whose icon sits with its label rather than replacing it. */@@ -1171,11 +1171,11 @@display: grid;place-items: center;border-radius: var(--r-plateau);- border: 2px dashed var(--gold-ring);- background: color-mix(in srgb, var(--gold-tint) 70%, transparent);+ border: 2px dashed var(--accent-ring);+ background: color-mix(in srgb, var(--accent-tint) 70%, transparent);-webkit-backdrop-filter: blur(2px);backdrop-filter: blur(2px);- color: var(--gold-strong);+ color: var(--accent-strong);font-size: var(--t-13);font-weight: 600;pointer-events: none;@@ -1290,8 +1290,8 @@.picker-button:focus-visible {outline: none;- border-color: var(--gold);- box-shadow: 0 0 0 3px var(--gold-ring);+ border-color: var(--accent);+ box-shadow: 0 0 0 3px var(--accent-ring);}.picker-value {@@ -1346,14 +1346,14 @@outline: none;}-.picker-menu li.is-active { background: var(--gold); color: #fff; }+.picker-menu li.is-active { background: var(--accent); color: var(--on-accent); }.picker-menu li.is-active .picker-check { color: #fff; }.picker-check {flex: none;width: 14px;text-align: center;- color: var(--gold-strong);+ color: var(--accent-strong);font-size: var(--t-11);}@@ -1392,7 +1392,7 @@box-shadow: 0 1px 2px rgba(0, 0, 0, 0.14), 0 0 0 0.5px var(--glass-edge);}-.segment:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: 1px; }+.segment:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: 1px; }/* ── Editing a contact ──────────────────────────────────────────────────────────────────The card and the editor are the same surface: the same measure, the same rhythm, so@@ -1438,8 +1438,8 @@.contact-form input:focus,.contact-form textarea:focus {- border-color: var(--gold);- box-shadow: 0 0 0 3px var(--gold-ring);+ border-color: var(--accent);+ box-shadow: 0 0 0 3px var(--accent-ring);}.contact-form textarea { resize: vertical; }@@ -1591,7 +1591,7 @@.disclosure > summary:hover { color: var(--text-2); }.disclosure > summary:focus-visible {outline: none;- box-shadow: 0 0 0 3px var(--gold-ring);+ box-shadow: 0 0 0 3px var(--accent-ring);}.disclosure-body {@@ -1644,7 +1644,7 @@cursor: default;}.upload-menu button:hover,-.upload-menu button:focus-visible { background: var(--gold); color: #fff; outline: none; }+.upload-menu button:focus-visible { background: var(--accent); color: var(--on-accent); outline: none; }/* The corner list of files going up, like a browser's downloads. */.upload-tray {@@ -1684,7 +1684,7 @@font-weight: 600;cursor: default;}-.upload-tray-close:focus-visible { outline: 3px solid var(--gold-ring); }+.upload-tray-close:focus-visible { outline: 3px solid var(--accent-ring); }.upload-bar {height: 4px;@@ -1697,7 +1697,7 @@display: block;height: 100%;border-radius: inherit;- background: var(--gold);+ background: var(--accent);transition: width 200ms var(--ease);}.upload-bar.small { height: 3px; margin: 4px 0 0; }@@ -1718,7 +1718,7 @@.upload-name { font-size: var(--t-13); }.upload-where { color: var(--text-3); font-size: var(--t-11); }.upload-state { color: var(--text-2); font-size: var(--t-11); font-variant-numeric: tabular-nums; }-.upload-row.is-done .upload-state { color: var(--gold-strong); font-size: var(--t-13); font-weight: 700; }+.upload-row.is-done .upload-state { color: var(--accent-strong); font-size: var(--t-13); font-weight: 700; }.upload-row.is-failed .upload-state,.upload-row.is-failed .upload-where { color: var(--danger); }@@ -1752,7 +1752,7 @@cursor: default;}.notice-close:hover { background: color-mix(in srgb, var(--text) 10%, transparent); color: var(--text); }-.notice-close:focus-visible { outline: 3px solid var(--gold-ring); }+.notice-close:focus-visible { outline: 3px solid var(--accent-ring); }/* A screen that failed to draw, in place of the screen — the rest of the app carries on. */.screen-failed { max-width: 46ch; margin: 64px auto 0; text-align: center; color: var(--text-2); }diff --git a/src/styles/calendar.css b/src/styles/calendar.cssindex 1f6466d..a561236 100644--- a/src/styles/calendar.css+++ b/src/styles/calendar.css@@ -166,7 +166,7 @@background: color-mix(in srgb, var(--text) 7%, transparent);color: var(--text-3);}-.cx-search:focus-within { box-shadow: 0 0 0 3px var(--gold-ring); }+.cx-search:focus-within { box-shadow: 0 0 0 3px var(--accent-ring); }.cx-search input { flex: 1; min-width: 0; border: 0; background: none; color: var(--text); font: inherit; font-size: var(--t-13); outline: none; }.cx-search input::placeholder { color: var(--text-3); }@container cx-page (max-width: 860px) { .cx-search { width: 120px; } }@@ -324,17 +324,18 @@}.cx-item:hover { background: color-mix(in srgb, var(--cal, var(--text)) 14%, transparent); }.cx-dot { width: 7px; height: 7px; border-radius: 50%; background: var(--cal); }+/* A reminder's ring and its words in its list's colour, as Calendar on the Mac draws them. */.cx-ring {position: relative; flex: none; width: 10px; height: 10px; padding: 0; margin: 0;- border: 1.3px solid var(--text-3); border-radius: 50%; box-sizing: border-box;+ border: 1.3px solid var(--cal, var(--text-3)); border-radius: 50%; box-sizing: border-box;background: none; box-shadow: none; cursor: pointer;transition: background 140ms ease, border-color 140ms ease, transform 140ms ease;}/* A target a finger or a trackpad can find, larger than the ring it draws. */.cx-ring::before { content: ""; position: absolute; inset: -6px; }-.cx-ring:hover { border-color: var(--text); }+.cx-ring:hover { background: color-mix(in srgb, var(--cal, var(--text)) 22%, transparent); }.cx-ring:active { transform: scale(0.85); }-.cx-ring.is-ticked { background: var(--sys-blue, #0a84ff); border-color: var(--sys-blue, #0a84ff); }+.cx-ring.is-ticked { background: var(--cal, var(--sys-blue)); border-color: var(--cal, var(--sys-blue)); }.cx-ring:focus-visible { outline: 2px solid var(--sys-blue); outline-offset: 2px; }.cx-item-title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }.cx-item-time { color: var(--text-3); font-variant-numeric: tabular-nums; }@@ -728,7 +729,7 @@cursor: default;}.cx-pane-event:hover { background: color-mix(in srgb, var(--cal) 24%, transparent); }-.cx-pane-event:focus-visible { outline: 3px solid var(--gold-ring); }+.cx-pane-event:focus-visible { outline: 3px solid var(--accent-ring); }.cx-pane-title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: var(--t-13); font-weight: 600; }.cx-pane-when, .cx-pane-where { color: var(--text-2); font-size: var(--t-11); font-variant-numeric: tabular-nums; }.cx-pane-reminder { display: grid; grid-template-columns: 10px minmax(0, 1fr) auto; align-items: center; gap: 8px; padding: 4px 10px; font-size: var(--t-13); }@@ -752,3 +753,10 @@@media (prefers-color-scheme: dark) {.cx-block, .cx-bar-event { color: color-mix(in srgb, var(--cal) 45%, #fff); }}++/* Reminders' words take their list's colour, deepened to read in light and lifted in dark. */+.cx-reminder, .cx-item.is-reminder .cx-item-title, .cx-pane-reminder .cx-pane-title { color: color-mix(in srgb, var(--cal, var(--text)) 62%, #000); }+@media (prefers-color-scheme: dark) {+ .cx-reminder, .cx-item.is-reminder .cx-item-title, .cx-pane-reminder .cx-pane-title { color: color-mix(in srgb, var(--cal, var(--text)) 50%, #fff); }+}+.cx-reminder.is-done, .cx-item.is-reminder.is-done .cx-item-title { color: var(--text-3); }diff --git a/src/styles/notes.css b/src/styles/notes.cssindex d3571a3..b21e61c 100644--- a/src/styles/notes.css+++ b/src/styles/notes.css@@ -44,9 +44,9 @@}.notes-folder:hover { background: color-mix(in srgb, var(--text) 6%, transparent); }.notes-folder[aria-current="true"] { background: color-mix(in srgb, var(--text) 12%, transparent); }-.notes-folder:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: -1px; }+.notes-folder:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: -1px; }/* Apple's folders are drawn in the accent, which in Notes is its yellow — here, quince gold. */-.notes-folder-glyph { flex: none; color: var(--gold); }+.notes-folder-glyph { flex: none; color: var(--accent); }.notes-folder-name { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }.notes-folder-count { color: var(--text-3); font-variant-numeric: tabular-nums; }@@ -93,7 +93,7 @@}.notes-icon:hover { background: color-mix(in srgb, var(--text) 8%, transparent); color: var(--text); }.notes-icon.danger:hover { color: var(--danger); }-.notes-icon:focus-visible { outline: 3px solid var(--gold-ring); }+.notes-icon:focus-visible { outline: 3px solid var(--accent-ring); }.notes-icon:disabled { opacity: 0.45; }.notes-search {@@ -110,7 +110,7 @@outline: none;}.notes-search::placeholder { color: var(--text-3); }-.notes-search:focus-visible { box-shadow: 0 0 0 3px var(--gold-ring); }+.notes-search:focus-visible { box-shadow: 0 0 0 3px var(--accent-ring); }.notes-folder-picker { display: none; margin-bottom: 8px; }.notes-folder-picker .picker { width: 100%; }@@ -154,10 +154,10 @@/* 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-current="true"] { background: color-mix(in srgb, var(--text) 11%, transparent); box-shadow: none; }-.note-rows:focus-within .note-row[aria-current="true"] { background: var(--gold); color: #fff; }+.note-rows:focus-within .note-row[aria-current="true"] { background: var(--accent); color: var(--on-accent); }.note-rows:focus-within .note-row[aria-current="true"] .note-row-when,-.note-rows:focus-within .note-row[aria-current="true"] .note-row-snippet { color: rgba(255, 255, 255, 0.82); }-.note-row:focus-visible { outline: 3px solid var(--gold-ring); outline-offset: -1px; }+.note-rows:focus-within .note-row[aria-current="true"] .note-row-snippet { color: var(--on-accent-2); }+.note-row:focus-visible { outline: 3px solid var(--accent-ring); outline-offset: -1px; }.note-row-title {overflow: hidden;text-overflow: ellipsis;@@ -264,10 +264,10 @@ textarea.note-title::placeholder { color: var(--text-3); }.notes-folder-row:hover .notes-folder-more, .notes-folder-row.is-menu .notes-folder-more,.notes-folder-more:focus-visible { opacity: 1; }.notes-folder-row:hover .notes-folder-count, .notes-folder-row.is-menu .notes-folder-count { visibility: hidden; }-.notes-folder-rename { width: 100%; box-sizing: border-box; border: 1px solid var(--gold); background: var(--bg); color: var(--text); font: inherit; outline: none; }+.notes-folder-rename { width: 100%; box-sizing: border-box; border: 1px solid var(--accent); background: var(--bg); color: var(--text); font: inherit; outline: none; }.notes-new-folder {display: flex; align-items: center; gap: 6px; margin-top: auto; padding: 8px; border: 0;- background: none; box-shadow: none; color: var(--gold); font: inherit; font-size: var(--t-13); cursor: pointer;+ background: none; box-shadow: none; color: var(--accent-strong); font: inherit; font-size: var(--t-13); cursor: pointer;}.notes-new-folder:hover { text-decoration: underline; }/* A note as Notes sets it, from Apple's own runs. Sizes after Notes on macOS: title 24,@@ -288,11 +288,11 @@ textarea.note-title::placeholder { color: var(--text-3); }background: none; box-shadow: none; cursor: pointer; transition: background 120ms ease, border-color 120ms ease;}.nf-check.is-done .nf-circle {- border-color: var(--gold); background: var(--gold)+ border-color: var(--accent); background: var(--accent)url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'><path d='M4 8.2l2.6 2.6L12 5.4' fill='none' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/></svg>") center/12px no-repeat;}.nf-check.is-done > span:last-child { color: var(--text-3); }-.note-formatted a { color: var(--gold); text-decoration: underline; }+.note-formatted a { color: var(--accent-strong); text-decoration: underline; }/* Aa, as Notes writes it on its toolbar. */.notes-aa { font-weight: 600; font-size: 14px; letter-spacing: -0.02em; width: auto; padding-inline: 8px; }@@ -309,7 +309,7 @@ textarea.note-title::placeholder { color: var(--text-3); }line-height: 1.55;overflow-wrap: anywhere;white-space: pre-wrap;- caret-color: var(--notes-accent, var(--gold));+ caret-color: var(--accent);counter-reset: nf-num;}.note-rich .nf-p { margin: 0; min-height: 1.55em; padding-inline-start: calc(var(--indent, 0) * 1.5em); position: relative; }@@ -350,17 +350,17 @@ textarea.note-title::placeholder { color: var(--text-3); }cursor: pointer; transition: background-color 120ms ease, border-color 120ms ease;}.note-rich .nf-p[data-style="103"][data-checked="true"]::before {- border-color: var(--notes-accent, var(--gold));- background: var(--notes-accent, var(--gold))+ border-color: var(--accent);+ background: var(--accent)url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'><path d='M4 8.2l2.6 2.6L12 5.4' fill='none' stroke='white' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/></svg>") center/12px no-repeat;}.note-rich .nf-p[data-style="103"][data-checked="true"] { color: var(--text-3); }-.note-rich a { color: var(--notes-accent, var(--gold)); text-decoration: underline; }+.note-rich a { color: var(--accent-strong); text-decoration: underline; }.note-rich .nf-attachment {display: inline-block; padding: 0 6px; margin: 0 1px; border-radius: 5px;background: color-mix(in srgb, var(--text) 8%, transparent); color: var(--text-2); font-size: var(--t-13);}-.note-rich ::selection { background: color-mix(in srgb, var(--notes-accent, var(--gold)) 32%, transparent); }+.note-rich ::selection { background: color-mix(in srgb, var(--accent) 32%, transparent); }.notes-icon.is-on { background: color-mix(in srgb, var(--text) 10%, transparent); }/* ---- Aa ----------------------------------------------------------------------------@@ -383,7 +383,7 @@ textarea.note-title::placeholder { color: var(--text-3); }color: var(--text); font: inherit; font-size: 16px; cursor: default;}.fp-mark:hover { background: color-mix(in srgb, var(--text) 7%, transparent); }-.fp-mark[aria-pressed="true"] { background: color-mix(in srgb, var(--notes-accent, var(--gold)) 22%, transparent); color: var(--notes-accent-strong, var(--gold-strong)); }+.fp-mark[aria-pressed="true"] { background: color-mix(in srgb, var(--accent) 22%, transparent); color: var(--accent-strong); }.fp-styles { display: flex; flex-direction: column; }.fp-style {display: grid; grid-template-columns: 22px auto 1fr; align-items: center; column-gap: 2px;diff --git a/src/styles/reminders.css b/src/styles/reminders.cssindex 974969e..36a5710 100644--- a/src/styles/reminders.css+++ b/src/styles/reminders.css@@ -7,18 +7,18 @@:root {/* Apple's system colours, which are what its built-in views are drawn in. They shiftbetween light and dark, so they are not the same six hex values in both. */- --sys-blue: #007aff;- --sys-red: #ff3b30;+ --sys-blue: #0088ff;+ --sys-red: #ff383c;--sys-gray: #8e8e93;- --sys-orange: #ff9500;+ --sys-orange: #ff8d28;}@media (prefers-color-scheme: dark) {:root {- --sys-blue: #0a84ff;- --sys-red: #ff453a;+ --sys-blue: #0091ff;+ --sys-red: #ff4245;--sys-gray: #98989d;- --sys-orange: #ff9f0a;+ --sys-orange: #ff9230;}}@@ -277,7 +277,7 @@justify-content: space-between;gap: 16px;padding: 2px 14px 10px 0;- color: var(--accent);+ color: var(--accent-strong);}.rx-head h1 {margin: 0;@@ -428,7 +428,7 @@}.rx-due.overdue { color: var(--sys-red); }.rx-repeat { display: inline-flex; gap: 3px; }-.rx-moved { color: var(--accent); font-weight: 600; }+.rx-moved { color: var(--accent-strong); font-weight: 600; }/* Info and flag wait at the end of the row until it is pointed at. A flag that is set isinformation, not a control, so it stays. */diff --git a/src/styles/tokens.css b/src/styles/tokens.cssindex 1f5ecc0..fe478f7 100644--- a/src/styles/tokens.css+++ b/src/styles/tokens.css@@ -1,18 +1,30 @@-/* Quince design tokens.+/* Quince design tokens, after Apple's macOS 27 kit (docs/macos27-kit.md).The idiom is macOS, because familiarity is what earns trust from someone being asked for- their Apple ID. The accent is not Apple's system blue: it's quince gold, from the fruit the- app is named after, and it is the only saturated colour anywhere in the chrome. */+ their Apple ID. Each app takes its own Mac accent, as Apple's apps colour themselves —+ Notes yellow, Calendar red, the rest the system blue — set on <html data-app> by the+ window, so a menu or popover drawn over an app takes its colour too. Quince gold is the+ brand: the app icon and the sign-in. */:root {color-scheme: light dark;--gold: #c8912a;--gold-strong: #a9781f;- --gold-tint: rgba(200, 145, 42, 0.13);- --gold-ring: rgba(200, 145, 42, 0.32);- /* Passes 4.5:1 against white, for text sitting on a filled accent. */--gold-deep: #7d5a16;+ /* The accent: `--accent` fills and draws glyphs; `-strong` is accent text on the window,+ at 4.5:1 or better; `-deep` a filled control under white text, also 4.5:1. Apple's own+ macOS 27 blue (#0088ff) carries white text at 3.5:1, so filled controls take the deeper+ shade and keep the same hue. */+ --accent: #0088ff;+ --accent-strong: #0068d6;+ --accent-deep: #0068d6;+ --accent-tint: color-mix(in srgb, var(--accent) 14%, transparent);+ --accent-ring: color-mix(in srgb, var(--accent) 34%, transparent);+ /* Text on a filled accent — white, or on Notes' yellow the near-black Notes uses. */+ --on-accent: #fff;+ --on-accent-2: rgba(255, 255, 255, 0.82);+--bg: #f5f5f7;--sheet: #ffffff;--text: #1d1d1f;@@ -60,7 +72,17 @@-apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;}+/* Notes: Apple's yellow; its text and filled controls a deep gold that reads on white. */+:root[data-app="notes"] { --accent: #ffcc00; --accent-strong: #8a6800; --accent-deep: #8a6800; --on-accent: #1d1d1f; --on-accent-2: rgba(0, 0, 0, 0.62); }+/* Before any app is open — signing in — the brand's own gold. */+:root:not([data-app]) { --accent: var(--gold); --accent-strong: var(--gold-deep); --accent-deep: var(--gold-deep); }+/* Calendar: Apple's red. */+:root[data-app="calendar"] { --accent: #ff383c; --accent-strong: #d70015; --accent-deep: #d70015; }+@media (prefers-color-scheme: dark) {+ :root { --accent: #0091ff; --accent-strong: #0091ff; --accent-deep: #0068d6; }+ :root[data-app="notes"] { --accent: #ffd600; --accent-strong: #ffd600; --accent-deep: #8a6800; --on-accent: #1d1d1f; --on-accent-2: rgba(0, 0, 0, 0.62); }+ :root[data-app="calendar"] { --accent: #ff4245; --accent-strong: #ff4245; --accent-deep: #d70015; }:root {--bg: #1c1c1e;--sheet: #2c2c2e;