diff --git a/apps/site/package.json b/apps/site/package.json index 8d6b14ee..4e7d00f1 100644 --- a/apps/site/package.json +++ b/apps/site/package.json @@ -12,7 +12,7 @@ "dev": "portless", "dev:app": "sh -lc 'trap \"kill 0\" INT TERM EXIT; astro dev --host 127.0.0.1 --port ${PORT:-4320} & wrangler pages dev .wrangler/dev-static --ip 127.0.0.1 --port 4321 & wait'", "build": "pnpm build:site && pnpm build:functions", - "build:site": "astro build && pagefind --site dist --output-subdir pagefind", + "build:site": "astro build && tsx scripts/minify-public-scripts.ts && pagefind --site dist --output-subdir pagefind", "build:functions": "wrangler pages functions build functions --outdir .wrangler/worker", "preview": "wrangler dev --local", "sync": "astro sync", @@ -59,6 +59,7 @@ "astro-icon": "catalog:", "fast-xml-parser": "catalog:", "ical.js": "catalog:", + "sharp": "catalog:", "sitemap": "catalog:", "tailwindcss": "catalog:", "zod": "catalog:" @@ -79,6 +80,7 @@ "alex": "catalog:", "astro": "catalog:", "cspell": "catalog:", + "esbuild": "catalog:", "eslint": "catalog:", "html-validate": "catalog:", "pagefind": "catalog:", diff --git a/apps/site/playwright.config.ts b/apps/site/playwright.config.ts index 85494732..3098394a 100644 --- a/apps/site/playwright.config.ts +++ b/apps/site/playwright.config.ts @@ -1,5 +1,4 @@ -// Visual-regression screenshot harness. See tests/README.md for usage, -// baseline policy, and the cross-platform pixel-hinting caveat. +// Screenshot and behavior harness; baseline policy: tests/README.md. import { defineConfig, devices } from '@playwright/test'; // AUDIT_PORT lets the baseline orchestrator pick a non-default port so it @@ -38,7 +37,7 @@ export default defineConfig({ { name: 'ui-contracts', testMatch: - /(body-links|color-contracts|event-metadata|footer-colophon|header-current|not-found-search|print-layout|typography-contracts)\.spec\.ts$/, + /(campaign-events|body-links|color-contracts|event-metadata|footer-colophon|header-current|not-found-search|print-layout|typography-contracts)\.spec\.ts$/, use: { ...devices['Desktop Chrome'] }, }, { diff --git a/apps/site/scripts/minify-public-scripts.ts b/apps/site/scripts/minify-public-scripts.ts new file mode 100644 index 00000000..5fde32d3 --- /dev/null +++ b/apps/site/scripts/minify-public-scripts.ts @@ -0,0 +1,19 @@ +import { readdir, readFile, writeFile } from 'node:fs/promises'; +import { resolve } from 'node:path'; +import { transform } from 'esbuild'; + +const directory = resolve('dist/scripts'); +const files = (await readdir(directory)).filter((file) => file.endsWith('.js')); + +for (const file of files) { + const path = resolve(directory, file); + const { code } = await transform(await readFile(path, 'utf8'), { + loader: 'js', + minify: true, + target: 'es2022', + sourcefile: file, + }); + await writeFile(path, code); +} + +process.stdout.write(`Minified ${files.length} public interaction scripts.\n`); diff --git a/apps/site/src/assets/home/arts-district-meeting-september-2026.jpg b/apps/site/src/assets/home/arts-district-meeting-september-2026.jpg new file mode 100644 index 00000000..da7cecf5 Binary files /dev/null and b/apps/site/src/assets/home/arts-district-meeting-september-2026.jpg differ diff --git a/apps/site/src/assets/home/first-friday-september-2026.jpg b/apps/site/src/assets/home/first-friday-september-2026.jpg new file mode 100644 index 00000000..4ac6bba2 Binary files /dev/null and b/apps/site/src/assets/home/first-friday-september-2026.jpg differ diff --git a/apps/site/src/assets/home/sources.json b/apps/site/src/assets/home/sources.json new file mode 100644 index 00000000..a5c86a66 --- /dev/null +++ b/apps/site/src/assets/home/sources.json @@ -0,0 +1,18 @@ +[ + { + "file": "first-friday-september-2026.jpg", + "source": "https://drive.google.com/file/d/1ohmz0cdyHBrVEBLQMi2MdqPdOESwFtTD/view", + "archiveFolder": "First Friday Stuffs", + "capturedAt": "2026-09-05T01:57:44Z", + "captionLocation": "First Friday, Arts District", + "photographer": null + }, + { + "file": "arts-district-meeting-september-2026.jpg", + "source": "https://drive.google.com/file/d/1FaL6YLgUm48M_dcHpPiEfRV57hklZDTg/view", + "archiveFolder": "Arts District Tony Meeting", + "capturedAt": "2026-09-11T21:25:37Z", + "captionLocation": "Arts District", + "photographer": null + } +] diff --git a/apps/site/src/assets/transit/downtown-loop-september-2026.jpg b/apps/site/src/assets/transit/downtown-loop-september-2026.jpg new file mode 100644 index 00000000..8efc81f5 Binary files /dev/null and b/apps/site/src/assets/transit/downtown-loop-september-2026.jpg differ diff --git a/apps/site/src/assets/transit/route-109-riders-july-2026.jpg b/apps/site/src/assets/transit/route-109-riders-july-2026.jpg new file mode 100644 index 00000000..b5111eb8 Binary files /dev/null and b/apps/site/src/assets/transit/route-109-riders-july-2026.jpg differ diff --git a/apps/site/src/assets/transit/sources.json b/apps/site/src/assets/transit/sources.json new file mode 100644 index 00000000..74c1e2d7 --- /dev/null +++ b/apps/site/src/assets/transit/sources.json @@ -0,0 +1,19 @@ +{ + "status": "User-selected photos for the LVBT website preview", + "photos": [ + { + "file": "route-109-riders-july-2026.jpg", + "originalFilename": "PXL_20260729_235107466.jpg", + "taken": "2026-07-29T16:51:07-07:00", + "description": "People waiting by RTC Route 109 North at Harry Reid International Airport", + "source": "https://photos.google.com/search/Cg1MYXMgVmVnYXMgYnVzIg8KDUxhcyBWZWdhcyBidXMoxuiOzpA0OAM%3D/relevance/photo/AF1QipPuz2Ep1pQY-gHqAyzMkMNGxhkvXeRhDeDBDITz" + }, + { + "file": "downtown-loop-september-2026.jpg", + "originalFilename": "PXL_20260921_231506311.MP.jpg", + "taken": "2026-09-21T16:15:06-07:00", + "description": "Downtown Loop shuttle framed by a street tree in Las Vegas", + "source": "https://photos.google.com/search/Cg1MYXMgVmVnYXMgYnVzIg8KDUxhcyBWZWdhcyBidXMoxuiOzpA0OAM%3D/relevance/photo/AF1QipNB8QnWedtf3KBa2xCD44bIcxGgUS1EF1nGp5nX" + } + ] +} diff --git a/apps/site/src/components/app/PrototypeLayout.astro b/apps/site/src/components/app/PrototypeLayout.astro index ea2fe4ac..86acaeaf 100644 --- a/apps/site/src/components/app/PrototypeLayout.astro +++ b/apps/site/src/components/app/PrototypeLayout.astro @@ -12,7 +12,7 @@ const { title } = Astro.props; --- -

+

{PROTOTYPE_BANNER}

diff --git a/apps/site/src/components/app/styles.ts b/apps/site/src/components/app/styles.ts index e731de79..52ee9be3 100644 --- a/apps/site/src/components/app/styles.ts +++ b/apps/site/src/components/app/styles.ts @@ -15,7 +15,7 @@ const buttonBase = export const buttonClass = { primary: `${buttonBase} bg-on-surface text-surface border-on-surface hover:bg-primary hover:border-primary hover:text-on-primary focus-visible:bg-primary focus-visible:text-on-primary`, secondary: `${buttonBase} bg-transparent text-on-surface border-on-surface hover:bg-surface-container`, - destructive: `${buttonBase} bg-primary-ink text-on-primary border-primary-ink hover:bg-on-surface hover:border-on-surface`, + destructive: `${buttonBase} bg-primary-ink text-surface border-primary-ink hover:bg-on-surface hover:border-on-surface`, } as const; export const linkClass = 'font-bold underline underline-offset-4 decoration-2 decoration-primary'; diff --git a/apps/site/src/components/site/Footer.astro b/apps/site/src/components/site/Footer.astro index 481caa1c..3e2e5d2b 100644 --- a/apps/site/src/components/site/Footer.astro +++ b/apps/site/src/components/site/Footer.astro @@ -91,7 +91,7 @@ const printLinkSheetSections: Array<{ links: PrintLinkSheetLink[] }> = [ it should read as a utility strip, not another content band. LINK STYLING - One style everywhere: `nav-link no-underline hover:text-primary`. + One style everywhere: `nav-link no-underline hover:text-primary-soft`. `.nav-link` provides the scaleX underline reveal. Do not introduce a second link style; the consistency is the point. @@ -170,23 +170,31 @@ const printLinkSheetSections: Array<{ links: PrintLinkSheetLink[] }> = [

Organization

@@ -194,9 +202,11 @@ const printLinkSheetSections: Array<{ links: PrintLinkSheetLink[] }> = [

Get involved

    -
  • Join us
    • +
  • Join us
  • - Newsletter + Newsletter
    • { site.donate.url && ( @@ -204,7 +214,7 @@ const printLinkSheetSections: Array<{ links: PrintLinkSheetLink[] }> = [ Donate @@ -217,7 +227,7 @@ const printLinkSheetSections: Array<{ links: PrintLinkSheetLink[] }> = [ Discord @@ -230,7 +240,7 @@ const printLinkSheetSections: Array<{ links: PrintLinkSheetLink[] }> = [ Instagram @@ -243,7 +253,7 @@ const printLinkSheetSections: Array<{ links: PrintLinkSheetLink[] }> = [ LinkedIn @@ -253,7 +263,7 @@ const printLinkSheetSections: Array<{ links: PrintLinkSheetLink[] }> = [
  • EmailEmail
@@ -359,15 +369,15 @@ const printLinkSheetSections: Array<{ links: PrintLinkSheetLink[] }> = [ aria-label="Site utilities" > - Colophon - Brand + Colophon + Brand - Sitemap + Sitemap SourceSource { /* Opens the QR presenter (/qr) — a chromeless deck of scan cards for @@ -378,7 +388,7 @@ const printLinkSheetSections: Array<{ links: PrintLinkSheetLink[] }> = [ } diff --git a/apps/site/src/components/site/Header.astro b/apps/site/src/components/site/Header.astro index 5e4dd623..c8bd927e 100644 --- a/apps/site/src/components/site/Header.astro +++ b/apps/site/src/components/site/Header.astro @@ -47,7 +47,7 @@ const path = normalizePath(Astro.url.pathname); href="/join" data-auth="signed-out" aria-current={active ? 'page' : undefined} - class="nav-link no-underline hover:text-primary" + class="nav-link no-underline hover:text-primary-ink" > Join @@ -56,7 +56,7 @@ const path = normalizePath(Astro.url.pathname); data-auth="signed-in" hidden aria-current={path === '/go' ? 'page' : undefined} - class="nav-link no-underline hover:text-primary" + class="nav-link no-underline hover:text-primary-ink" > Get involved @@ -65,7 +65,7 @@ const path = normalizePath(Astro.url.pathname); {item.label} @@ -85,12 +85,16 @@ const path = normalizePath(Astro.url.pathname); } + + diff --git a/apps/site/src/pages/campaigns/arts-district/events/[slug].astro b/apps/site/src/pages/campaigns/arts-district/events/[slug].astro index cfc3e5ad..2a63b386 100644 --- a/apps/site/src/pages/campaigns/arts-district/events/[slug].astro +++ b/apps/site/src/pages/campaigns/arts-district/events/[slug].astro @@ -1,5 +1,6 @@ --- import BaseLayout from '../../../../layouts/BaseLayout.astro'; +import { campaignEventCutoff, groupCampaignEvents } from '../../../../lib/campaigns/event-schedule'; import { buttonClass } from '../../../../components/app/styles'; import { artsDistrictEvents, @@ -14,75 +15,114 @@ interface Props { event: ArtsDistrictEvent; } const { event } = Astro.props; +const past = groupCampaignEvents([event]).past.length > 0; --- -
- Arts District Neighborhood Campaign - {event.proposed &&

Proposed gathering

} -

{event.title}

-

{event.summary}

-
-
-
- {event.proposed ? 'Proposed month' : 'When'} -
-
- { - event.start ? ( - - ) : ( - <> - {event.month} {event.year} - Date to be announced - - ) - } -
-
-
-
Where
-
{event.venue ?? 'Location to be announced'}
-
-
- { - (event.lvbtEventUrl || event.venueUrl) && ( -
- {event.lvbtEventUrl && ( - - Event details and RSVP - - )} - {event.venueUrl && ( - - Get directions - - )} +
+
+ Arts District Neighborhood Campaign + + { + event.proposed && ( +

Proposed gathering

+ ) + } +

+ {event.title} +

+

{event.summary}

+
+
+
+ {event.proposed ? 'Proposed month' : 'When'} +
+
+ { + event.start ? ( + + ) : ( + <> + {event.month} {event.year} + Date to be announced + + ) + } +
+
+
+
Where
+
+ {event.venue ?? 'Location to be announced'} +
- ) - } -
-
-

- {event.proposed ? 'What we’d like to discuss' : 'What we’ll discuss'} -

-
- {event.details.map((paragraph) =>

{paragraph}

)} -
-
-
-

Help organize this gathering

-

- Help invite neighbors, connect us with a community organization, or contribute food, - publicity, and other resources for the gathering. -

- Help organize the campaign -
+ + { + (event.lvbtEventUrl || event.venueUrl) && ( +
+ {event.lvbtEventUrl && ( + + {past ? 'Event details' : 'Event details and RSVP'} + + )} + {event.venueUrl && ( + + )} +
+ ) + } +
+
+

+ { + event.proposed + ? 'What we’d like to discuss' + : past + ? 'Planned discussion' + : 'What we’ll discuss' + } +

+
+ {event.details.map((paragraph) =>

{paragraph}

)} +
+
+
+

Help organize the campaign

+

+ Help invite neighbors, connect us with a community organization, or contribute food, + publicity, and other resources for campaign gatherings. +

+ Help organize the campaign +
+
+ + + + diff --git a/apps/site/src/pages/index.astro b/apps/site/src/pages/index.astro index 0e94f854..968fcb81 100644 --- a/apps/site/src/pages/index.astro +++ b/apps/site/src/pages/index.astro @@ -1,8 +1,11 @@ --- import BaseLayout from '../layouts/BaseLayout.astro'; -import PullQuote from '../components/PullQuote.astro'; import StructuredData from '../components/seo/StructuredData.astro'; -import { Icon } from 'astro-icon/components'; +import { Image } from 'astro:assets'; +import firstFridayPhoto from '../assets/home/first-friday-september-2026.jpg'; +import artsDistrictPhoto from '../assets/home/arts-district-meeting-september-2026.jpg'; +import route109Photo from '../assets/transit/route-109-riders-july-2026.jpg'; +import { buttonClass } from '../components/app/styles'; import { site } from '../lib/site'; import { websiteSchema } from '../lib/structured-data'; @@ -11,47 +14,39 @@ const membershipHref = membershipUrl ?? '/join#membership'; const membershipTarget = membershipUrl ? '_blank' : undefined; const membershipRel = membershipUrl ? 'noopener noreferrer' : undefined; -// The three ways we do the work — plain language, one line each. -const ways: Array<{ title: string; body: string; icon: string; href: string; cta: string }> = [ +const ways = [ { - title: 'Educate', - icon: 'mdi:school-outline', - body: 'We help our neighbors see how the way we get around shapes what daily life costs, in both money and time.', - href: '/about', - cta: 'Why we exist', + title: 'Make transit and land use understandable', + body: 'We explain how bus service, street design, and where homes and businesses are built affect everyday life.', }, { - title: 'Organize', - icon: 'mdi:account-group-outline', - body: 'We bring together the many Las Vegans who want better transit, so the people who write the budget have to listen.', - href: '/projects', - cta: 'Our projects', + title: 'Bring neighbors together', + body: 'We connect riders, residents, workers, and community organizations through conversations and public gatherings.', }, { - title: 'Advocate', - icon: 'mdi:bullhorn-outline', - body: 'We show up at public meetings and push for the funding, the street design, and the projects the Valley needs.', - href: '/about/strategy', - cta: 'Our strategy', + title: 'Advocate for better neighborhoods', + body: 'We push for reliable transit, safer streets, and places to live, work, and gather that people can reach without a car.', }, ]; -// Real projects already moving — the reason an organized public matters now. -const projects: Array<{ when: string; title: string; body: string }> = [ +const regionalProjects = [ { - when: 'Fall 2026', - title: 'Maryland Parkway BRT', - body: '$378 million, 29 stations, and dedicated lanes running from downtown to Henderson.', + title: 'Maryland Parkway bus rapid transit', + body: 'Bus rapid transit and street improvements along Maryland Parkway and into downtown.', + href: 'https://marylandparkway.com/', + source: 'RTC of Southern Nevada', }, { - when: 'Underway', - title: 'Charleston corridor', - body: 'A 17-mile study of light rail versus bus rapid transit — the Valley’s first real shot at rail.', + title: 'Charleston Boulevard', + body: 'A study of safer travel and improved transit along Charleston Boulevard.', + href: 'https://charlestonblvd.com/', + source: 'RTC of Southern Nevada', }, { - when: 'Expected 2029', title: 'Brightline West', - body: 'High-speed rail to Southern California that only pays off if local transit can meet it here.', + body: 'Planned high-speed rail connecting Las Vegas and Southern California.', + href: 'https://www.brightlinewest.com/overview/project', + source: 'Brightline West', }, ]; --- @@ -62,122 +57,216 @@ const projects: Array<{ when: string; title: string; body: string }> = [ > - {/* LVBT's enduring invitation is the hero. */} -
-
-

- We're building the public transit movement Las Vegas has - never had. -

-

+

+
+

+ We're building the public transit movement Las Vegas + has never had. +

+

+ We want safe, reliable, and useful public transportation for everyone and vibrant, + walkable neighborhoods to support world-class transit. +

+
+ Get involved + About LVBT +
+
+
- {/* The current campaign follows the mission as a distinct way to participate. */} -
-
-
-

October 1–8, 2026

-

Week Without Driving

-

- One trip counts. Share what it's like to get around without driving. +

+
+
+ Two people at First Friday, one holding a handmade train costume, with vendors and neighbors along the street. +
+
+

+ How we’re building the movement +

+

+ Better transit starts with people who want better places to live. We bring that shared + interest into conversations, neighborhood plans, and public decisions.

- + { + ways.map((way) => ( +
+

{way.title}

+

+ {way.body} +

+
+ )) + } +
+ Explore our programs - Take the One Trip Challenge -
- {/* HOW WE FIGHT — three plain ways we do the work */} -
-
-

How we fight for better transit.

-
-
- { - ways.map((way) => ( -
-
-
-

{way.body}

- - {way.cta} → - -
- )) - } +
+
+
+

From LVBT

+ Get our newsletter +
+
+
+

+ Newsletter · +

+

Transit Tuesday… on a Friday?

+

+ Plans for a walk audit and an RTC presentation, plus a look at high-speed rail and the + proposed Vegas Loop station at UNLV. +

+ Read the issue +
+
+

+ Letter · +

+

Letter from the Founder

+

+ Why LVBT began, and the case for better transit and walkable, mixed-use neighborhoods in + Las Vegas. +

+ Read the letter +
+
- {/* PROOF — real projects already in motion */} -
-
-

Real projects are already in motion.

-

- The Valley is finally building. These projects only pay off with a public organized to use - them and defend them. +

+
+

Changes across the Valley

+

+ New transit service and better streets can change how our neighborhoods grow. Follow these + regional projects through the teams planning and building them.

-
- { - projects.map((p) => ( -
-
- )) - } +
+
+ { + regionalProjects.map((project) => ( + + )) + } +
+
+ People with luggage waiting beside an RTC Route 109 North bus at the airport. +
- {/* THE CLOSE — the ask again, on the serious band, with the stakes in the founder's words */} -
-
+
+
-

We win this by being too many to ignore.

-

- Membership is free and takes about a minute. The more Las Vegans behind this, the - stronger the case we make to the people who fund transit. +

+ Help build a better Las Vegas. +

+

+ Bring your experience, your time, or your organization. You can help with outreach, + support a neighborhood gathering, or work with us on transit and land use.

-
+

Membership is free.

+
Become a member + Partner with LVBT - Become a member -
-
- - "Without a new dedicated funding source, the Regional Transportation Commission of - Southern Nevada will be forced to eliminate fifteen routes and reduce service across the - network — affecting hundreds of thousands of riders by 2028." - -
+
+ Two people sitting together in an Arts District gallery surrounded by colorful paintings. +
diff --git a/apps/site/src/pages/projects/index.astro b/apps/site/src/pages/projects/index.astro index 7b5a44c3..cc054065 100644 --- a/apps/site/src/pages/projects/index.astro +++ b/apps/site/src/pages/projects/index.astro @@ -1,5 +1,7 @@ --- import BaseLayout from '../../layouts/BaseLayout.astro'; +import { Image } from 'astro:assets'; +import downtownLoopPhoto from '../../assets/transit/downtown-loop-september-2026.jpg'; import PageHero from '../../components/PageHero.astro'; import ProjectCard from '../../components/ProjectCard.astro'; import { Icon } from 'astro-icon/components'; @@ -56,16 +58,36 @@ const renderedInitiatives = initiatives.filter( -
-

- - Arts District Neighborhood Campaign - -

-

- Help identify the transit and street improvements the neighborhood needs. Our first gathering - is October 17 at 2 p.m. at Barter Beer + Mall. -

+
+
+
+

+ + Arts District Neighborhood Campaign + +

+

+ Help identify the transit and street improvements the neighborhood needs. Our first + gathering is October 17 at 2 p.m. at Barter Beer + Mall. +

+ + Explore the campaign + +
+
+ A red Downtown Loop shuttle on a Las Vegas street beneath a leafy tree. +
+
{ @@ -154,6 +176,19 @@ const renderedInitiatives = initiatives.filter( /* /projects print layout — the sticky initiative headers unpin and the permalink affordances disappear on paper. Only this route ships it. */ @media print { + .campaign-entry figure { + display: none !important; + } + + .campaign-entry > div { + display: block !important; + padding-block: 0.08in !important; + } + + .campaign-entry .body-link { + display: none !important; + } + [data-initiative-header] { position: static !important; z-index: auto !important; diff --git a/apps/site/src/pages/qr.astro b/apps/site/src/pages/qr.astro index 95f084e7..676e39b7 100644 --- a/apps/site/src/pages/qr.astro +++ b/apps/site/src/pages/qr.astro @@ -366,7 +366,7 @@ const slideCodes = new Map(slides.map((slide) => [slide.id, qrSvg(slide.url)])); display: flex; align-items: center; justify-content: center; - gap: 0.5rem; + gap: 0.25rem; margin: 1rem auto calc(1rem + env(safe-area-inset-bottom)); padding: 0.4rem 0.55rem; background: color-mix(in srgb, var(--ink) 62%, transparent); @@ -376,7 +376,7 @@ const slideCodes = new Map(slides.map((slide) => [slide.id, qrSvg(slide.url)])); .qr-pagination-dots { display: flex; align-items: center; - gap: 0.55rem; + gap: 0.125rem; } /* A real button chip (background + border), not a bare icon — icons @@ -411,14 +411,22 @@ const slideCodes = new Map(slides.map((slide) => [slide.id, qrSvg(slide.url)])); /* Small rounded squares, not circles — on theme with the logomark's rounded-square motif. */ .qr-dot { + display: grid; + place-items: center; + width: 1.5rem; + height: 1.5rem; + outline-offset: 0.125rem; + } + + .qr-dot::before { + content: ''; width: 0.65rem; height: 0.65rem; border-radius: 0.15rem; background: color-mix(in srgb, var(--paper) 42%, transparent); - outline-offset: 0.25rem; } - .qr-dot[aria-current='true'] { + .qr-dot[aria-current='true']::before { background: var(--color-primary); } diff --git a/apps/site/src/scripts/campaign-events.ts b/apps/site/src/scripts/campaign-events.ts new file mode 100644 index 00000000..b7589e2a --- /dev/null +++ b/apps/site/src/scripts/campaign-events.ts @@ -0,0 +1,62 @@ +function updateActions(root: HTMLElement, past: boolean): void { + root.querySelectorAll('[data-active-action]').forEach((action) => { + action.hidden = past; + }); + root.querySelectorAll('[data-campaign-rsvp]').forEach((link) => { + link.textContent = past ? 'Event details' : 'Event details and RSVP'; + }); +} + +function render(): void { + const now = Date.now(); + document.querySelectorAll('[data-campaign-events]').forEach((root) => { + const upcomingList = root.querySelector('[data-campaign-list="upcoming"]'); + const pastList = root.querySelector('[data-campaign-list="past"]'); + if (!upcomingList || !pastList) return; + const events = Array.from(root.querySelectorAll('[data-campaign-event]')).sort( + (a, b) => Date.parse(a.dataset.start ?? '') - Date.parse(b.dataset.start ?? ''), + ); + const groups = { + upcoming: events.filter((event) => Number(event.dataset.cutoff) > now), + past: events.filter((event) => Number(event.dataset.cutoff) <= now).reverse(), + }; + for (const [kind, list, entries] of [ + ['upcoming', upcomingList, groups.upcoming], + ['past', pastList, groups.past], + ] as const) { + entries.forEach((element, index) => { + const featured = kind === 'upcoming' && index === 0; + element.classList.toggle('event--featured', featured); + element.classList.toggle('event--past', kind === 'past'); + const label = element.querySelector('[data-campaign-event-label]'); + if (label) + label.textContent = + kind === 'past' ? 'Past gathering' : featured ? 'Next gathering' : 'Upcoming gathering'; + updateActions(element, kind === 'past'); + // Avoid moving unchanged cards every minute (including a focused link). + if (list.children[index] !== element) + list.insertBefore(element, list.children[index] ?? null); + }); + } + const pastGroup = root.querySelector('[data-campaign-group="past"]'); + if (pastGroup) pastGroup.hidden = groups.past.length === 0; + const empty = root.querySelector('[data-campaign-empty]'); + if (empty) empty.hidden = groups.upcoming.length > 0; + }); + document.querySelectorAll('[data-campaign-event-detail]').forEach((root) => { + const past = root.dataset.proposed !== 'true' && Number(root.dataset.cutoff) <= now; + updateActions(root, past); + const label = root.querySelector('[data-past-event-label]'); + if (label) label.hidden = !past; + const heading = root.querySelector('[data-discussion-heading]'); + if (heading && root.dataset.start && root.dataset.proposed !== 'true') + heading.textContent = past ? 'Planned discussion' : 'What we’ll discuss'; + }); +} + +render(); +window.setInterval(render, 60_000); +document.addEventListener('astro:page-load', render); +document.addEventListener('visibilitychange', () => { + if (!document.hidden) render(); +}); diff --git a/apps/site/src/styles/global.css b/apps/site/src/styles/global.css index b244330d..02389310 100644 --- a/apps/site/src/styles/global.css +++ b/apps/site/src/styles/global.css @@ -202,11 +202,10 @@ --color-outline-variant: var(--ink); /* Accent (Ember). Fill stays saturated in both themes; ember-as-text - (primary-ink) and the container pair lighten in dark. on-primary is Cream - (--paper) — light text reads better on the Ember fill. (Cream on Ember is - ~3.6:1, under WCAG AA; a deliberate look-over-number call.) */ + (primary-ink) and the container pair lighten in dark. on-primary is Ink + in both themes so small text on the saturated fill clears WCAG AA. */ --color-primary: var(--ember); - --color-on-primary: var(--paper); + --color-on-primary: var(--ink); --color-primary-container: var(--peach); --color-on-primary-container: var(--ink); --color-primary-warm: var(--coral); @@ -316,7 +315,7 @@ --color-outline-variant: var(--paper); --color-primary: var(--ember); - --color-on-primary: var(--paper); + --color-on-primary: var(--ink); --color-primary-container: var(--ember-container); --color-on-primary-container: var(--on-ember-container-dark); --color-primary-warm: var(--coral); @@ -512,6 +511,7 @@ html:active-view-transition-type(from-qr)::view-transition-old(root) { -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; scroll-behavior: smooth; + scroll-padding-top: calc(var(--lvbt-header-h) + 1rem); } body { @@ -568,6 +568,10 @@ html:active-view-transition-type(from-qr)::view-transition-old(root) { border-radius: 0; } + :is(a, button, input, textarea, select, summary, [tabindex]) { + scroll-margin-block: calc(var(--lvbt-header-h) + 1rem); + } + .skip-link { /* Fixed (not absolute) so it stays anchored to the viewport: a keyboard user who tabs after scrolling still gets the link at the top of the @@ -1200,6 +1204,14 @@ body[data-canvas='dark'] [data-site-header]:not([data-stuck]):not([data-nav-open transform: none; } + /* Keyboard navigation must expose content before its scroll animation. */ + .reveal-ready :is(.reveal, .reveal-stat, .reveal-quote):focus-within { + opacity: 1; + transform: none; + clip-path: none; + transition: none; + } + /* Stats rise from 24px below their resting position (longer than .reveal's 16px) and ease in over 700ms — a slightly heavier, more deliberate entrance than surrounding prose, which suits punchy diff --git a/apps/site/tests/campaign-events.test.ts b/apps/site/tests/campaign-events.test.ts new file mode 100644 index 00000000..e3ca233e --- /dev/null +++ b/apps/site/tests/campaign-events.test.ts @@ -0,0 +1,73 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; +import { groupCampaignEvents } from '../src/lib/campaigns/event-schedule'; + +const events = [ + { slug: 'december', start: '2026-12-05T14:00:00-08:00' }, + { slug: 'topic', proposed: true, start: '2026-10-01T14:00:00-07:00' }, + { slug: 'october', start: '2026-10-17T14:00:00-07:00', end: '2026-10-17T16:00:00-07:00' }, + { slug: 'november', start: '2026-11-07T14:00:00-08:00' }, + { slug: 'undated' }, +]; + +void test('features the nearest confirmed gathering and keeps proposed topics separate', () => { + const groups = groupCampaignEvents(events, new Date('2026-10-17T22:59:59Z')); + assert.deepEqual( + groups.upcoming.map((event) => event.slug), + ['october', 'november', 'december'], + ); + assert.deepEqual( + groups.proposed.map((event) => event.slug), + ['topic', 'undated'], + ); + assert.deepEqual(groups.past, []); +}); + +void test('moves completed gatherings into history and advances the next gathering', () => { + const groups = groupCampaignEvents(events, new Date('2026-11-08T08:00:00Z')); + assert.deepEqual( + groups.upcoming.map((event) => event.slug), + ['december'], + ); + assert.deepEqual( + groups.past.map((event) => event.slug), + ['november', 'october'], + ); +}); + +void test('uses an explicit end time without archiving a gathering that is still happening', () => { + assert.deepEqual( + groupCampaignEvents(events, new Date('2026-10-17T23:00:00Z')).past.map((e) => e.slug), + ['october'], + ); +}); + +void test('keeps a gathering without an end time visible through its Las Vegas calendar day', () => { + const event = [{ slug: 'listening', start: '2026-10-17T14:00:00-07:00' }]; + assert.equal(groupCampaignEvents(event, new Date('2026-10-18T06:59:59Z')).upcoming.length, 1); + assert.equal(groupCampaignEvents(event, new Date('2026-10-18T07:00:00Z')).past.length, 1); +}); + +void test('does not feature an event with an invalid date', () => { + const groups = groupCampaignEvents( + [{ slug: 'bad', start: 'not-a-date' }], + new Date('2026-10-04T12:00:00Z'), + ); + assert.deepEqual(groups.upcoming, []); + assert.deepEqual( + groups.proposed.map((event) => event.slug), + ['bad'], + ); +}); + +void test('archives undated-end gatherings at Las Vegas midnight across daylight saving changes', () => { + for (const [start, cutoff] of [ + ['2026-03-08T01:30:00-08:00', '2026-03-09T07:00:00Z'], + ['2026-11-01T01:30:00-07:00', '2026-11-02T08:00:00Z'], + ]) { + const event = [{ slug: 'gathering', start }]; + const boundary = Date.parse(cutoff); + assert.equal(groupCampaignEvents(event, new Date(boundary - 1)).upcoming.length, 1); + assert.equal(groupCampaignEvents(event, new Date(boundary)).past.length, 1); + } +}); diff --git a/apps/site/tests/e2e/a11y-landmarks.spec.ts b/apps/site/tests/e2e/a11y-landmarks.spec.ts index 64329cac..f2ea3bf1 100644 --- a/apps/site/tests/e2e/a11y-landmarks.spec.ts +++ b/apps/site/tests/e2e/a11y-landmarks.spec.ts @@ -7,26 +7,33 @@ test.describe('landmark accessibility', () => { const hero = page.locator('main > section').first(); await expect(hero.getByRole('heading', { level: 1 })).toContainText(/public transit movement/i); - await expect(hero.getByRole('link')).toHaveCount(0); + await expect(hero.getByRole('link', { name: 'About LVBT' })).toHaveAttribute('href', '/about'); - const campaign = page.locator('main > section').nth(1); - await expect(campaign.getByRole('heading', { level: 2 })).toHaveText('Week Without Driving'); + const campaign = hero.getByRole('complementary', { name: 'Take part' }); + await expect(campaign.getByRole('heading', { level: 3 }).first()).toHaveText( + 'Week Without Driving', + ); await expect(campaign).toContainText('October 1–8, 2026'); await expect( campaign.getByRole('link', { name: 'Take the One Trip Challenge' }), ).toHaveAttribute('href', 'https://lvwwd.org/'); + await expect(campaign.getByRole('link', { name: 'Explore the campaign' })).toHaveAttribute( + 'href', + '/campaigns/arts-district/', + ); }); - test('Week Without Driving action is visible without scrolling', async ({ page }) => { + test('participation actions remain reachable on phone and desktop', async ({ page }) => { for (const viewport of [ { width: 390, height: 664 }, { width: 1280, height: 720 }, ]) { await page.setViewportSize(viewport); await page.goto('/'); - await expect(page.getByRole('link', { name: 'Take the One Trip Challenge' })).toBeInViewport({ - ratio: 1, - }); + const action = page.getByRole('link', { name: 'Take the One Trip Challenge' }); + await action.focus(); + await expect(action).toBeFocused(); + await expect(action).toBeInViewport({ ratio: 1 }); } }); diff --git a/apps/site/tests/e2e/body-links.spec.ts b/apps/site/tests/e2e/body-links.spec.ts index df20641b..bbe402a8 100644 --- a/apps/site/tests/e2e/body-links.spec.ts +++ b/apps/site/tests/e2e/body-links.spec.ts @@ -1081,9 +1081,12 @@ test.describe('body content links', () => { // The contact social card inverts to the ink surface (#0f1115) on hover. await expect(contactLinkedIn).toHaveCSS('background-color', 'rgb(15, 17, 21)'); + await page.locator('footer .reveal').evaluateAll((elements) => { + elements.forEach((element) => element.classList.add('is-visible')); + }); await expect(footerLinkedIn).toBeVisible(); await footerLinkedIn.hover(); - await expect(footerLinkedIn).toHaveCSS('color', 'rgb(229, 71, 26)'); + await expect(footerLinkedIn).toHaveCSS('color', 'rgb(255, 233, 214)'); }); test('gives body links visible hover feedback on light surfaces', async ({ page }) => { diff --git a/apps/site/tests/e2e/campaign-events.spec.ts b/apps/site/tests/e2e/campaign-events.spec.ts new file mode 100644 index 00000000..5f48a5ab --- /dev/null +++ b/apps/site/tests/e2e/campaign-events.spec.ts @@ -0,0 +1,76 @@ +import { expect, test } from '../../scripts/deploy/access-browser'; + +const campaign = '/campaigns/arts-district/'; + +test('archives the listening session when its Las Vegas day ends without a redeploy', async ({ + page, +}) => { + await page.clock.install({ time: new Date('2026-10-18T06:59:30Z') }); + await page.goto(campaign); + const session = page.locator('[data-campaign-event="community-listening-session"]'); + await expect(page.locator('[data-campaign-list="upcoming"]')).toContainText( + 'Community listening session', + ); + await expect(session).toHaveClass(/event--featured/); + await session.evaluate((card) => { + const link = document.createElement('a'); + link.href = '/events/test-gathering'; + link.dataset.campaignRsvp = ''; + link.textContent = 'Event details and RSVP'; + card.querySelector('.event-copy')?.appendChild(link); + }); + await page.clock.fastForward(60_000); + await expect(page.locator('[data-campaign-group="past"]')).toBeVisible(); + await expect(page.locator('[data-campaign-list="past"]')).toContainText( + 'Community listening session', + ); + await expect(session).not.toHaveClass(/event--featured/); + await expect(session.getByRole('link', { name: 'Get directions' })).toBeHidden(); + await expect(session.getByRole('link', { name: 'Event details', exact: true })).toHaveAttribute( + 'href', + '/events/test-gathering', + ); + await expect(page.locator('[data-campaign-empty]')).toBeVisible(); + await expect(page.locator('[data-campaign-list="proposed"] article')).toHaveCount(3); +}); + +test('archived event pages keep their details and stop offering attendance actions', async ({ + page, +}) => { + await page.clock.install({ time: new Date('2026-10-18T07:00:00Z') }); + await page.goto(campaign + 'events/community-listening-session/'); + await expect(page.getByText('Past gathering', { exact: true })).toBeVisible(); + await expect( + page.getByRole('heading', { name: 'Planned discussion', exact: true }), + ).toBeVisible(); + await expect(page.getByRole('link', { name: 'Get directions', exact: true })).toBeHidden(); + await expect( + page.getByRole('heading', { name: 'Community listening session', exact: true }), + ).toBeVisible(); +}); + +test('promotes the next confirmed gathering after the featured gathering ends', async ({ + page, +}) => { + await page.clock.install({ time: new Date('2026-10-18T06:59:30Z') }); + await page.goto(campaign); + // Simulate a second published gathering without adding an unconfirmed + // date to public campaign content. + await page.locator('[data-campaign-event="community-listening-session"]').evaluate((original) => { + const next = original.cloneNode(true) as HTMLElement; + next.dataset.campaignEvent = 'next-confirmed'; + next.dataset.start = '2026-11-07T14:00:00-08:00'; + next.dataset.cutoff = String(Date.parse('2026-11-08T08:00:00Z')); + const title = next.querySelector('h3 a'); + if (title) title.textContent = 'Next confirmed gathering'; + original.parentElement?.appendChild(next); + }); + await page.clock.fastForward(60_000); + const next = page.locator('[data-campaign-event="next-confirmed"]'); + await expect(next).toHaveClass(/event--featured/); + await expect(next.locator('[data-campaign-event-label]')).toHaveText('Next gathering'); + await expect(page.locator('[data-campaign-list="upcoming"]')).toContainText( + 'Next confirmed gathering', + ); + await expect(page.locator('[data-campaign-empty]')).toBeHidden(); +}); diff --git a/apps/site/tests/e2e/color-contracts.spec.ts b/apps/site/tests/e2e/color-contracts.spec.ts index 10090ce6..7e7bdca4 100644 --- a/apps/site/tests/e2e/color-contracts.spec.ts +++ b/apps/site/tests/e2e/color-contracts.spec.ts @@ -97,7 +97,7 @@ async function primaryRoles(page: Page): Promise { backgroundClasses: ['bg-primary'], foregroundClass: 'text-on-primary', foregroundCss: resolveColor('text-on-primary', 'color'), - minContrast: 3, + minContrast: 4.5, name: 'primary', }, { @@ -115,11 +115,7 @@ async function primaryRoles(page: Page): Promise { }); } -/** - * Resolve a foreground/background token pair from utility classes on a bare - * probe element. Surface-context classes (e.g. .bg-slab) are applied to the - * probe so the on-* roles remap exactly as they do in the page. - */ +// Resolve role pairs in their surface context, including slab overrides. async function neutralPairs(page: Page) { return page.evaluate(() => { const probe = document.createElement('div'); @@ -232,7 +228,7 @@ for (const scheme of SCHEMES) { page, }) => { await page.emulateMedia({ colorScheme: scheme }); - await page.goto(path, { waitUntil: 'domcontentloaded' }); + await page.goto(path, { waitUntil: 'networkidle' }); const roles = await primaryRoles(page); const violations = await page.evaluate((roleList) => { @@ -280,7 +276,7 @@ for (const scheme of SCHEMES) { page, }) => { await page.emulateMedia({ colorScheme: scheme }); - await page.goto('/events/', { waitUntil: 'domcontentloaded' }); + await page.goto('/events/', { waitUntil: 'networkidle' }); const surfaces = page .locator('.hover\\:bg-on-surface, .focus-visible\\:bg-on-surface') @@ -319,7 +315,7 @@ for (const scheme of SCHEMES) { for (const scheme of SCHEMES) { test(`neutral role pairs clear AA [${scheme}]`, async ({ page }) => { await page.emulateMedia({ colorScheme: scheme }); - await page.goto('/', { waitUntil: 'domcontentloaded' }); + await page.goto('/', { waitUntil: 'networkidle' }); const pairs = await neutralPairs(page); for (const pair of pairs) { @@ -335,7 +331,7 @@ for (const scheme of SCHEMES) { for (const path of paths) { test(`horizontal rules clear non-text contrast [${scheme}]: ${path}`, async ({ page }) => { await page.emulateMedia({ colorScheme: scheme }); - await page.goto(path, { waitUntil: 'domcontentloaded' }); + await page.goto(path, { waitUntil: 'networkidle' }); const pairs = await renderedRulePairs(page); for (const pair of pairs) { diff --git a/apps/site/tests/e2e/screenshots.spec.ts b/apps/site/tests/e2e/screenshots.spec.ts index 36cc6e7f..97b64c19 100644 --- a/apps/site/tests/e2e/screenshots.spec.ts +++ b/apps/site/tests/e2e/screenshots.spec.ts @@ -61,6 +61,11 @@ for (const path of paths) { test.describe(`page ${path}`, () => { test.beforeEach(async ({ page }) => { + // Campaign chronology has its own live-clock tests. Keep the visual + // reference date fixed so a gathering ending cannot fail unrelated PRs. + if (path.startsWith('/campaigns/arts-district/')) { + await page.clock.setFixedTime(new Date('2026-10-04T12:00:00Z')); + } await page.goto(path); await page.waitForLoadState('networkidle'); // Wait for web fonts to settle — otherwise the snapshot can race diff --git a/apps/site/tests/snapshots/linux/desktop-xl/brand-full.png b/apps/site/tests/snapshots/linux/desktop-xl/brand-full.png index 16aac948..4c10dbd8 100644 --- a/apps/site/tests/snapshots/linux/desktop-xl/brand-full.png +++ b/apps/site/tests/snapshots/linux/desktop-xl/brand-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc1643a3dd0f11016edc1b471b1e23d68a3dc291091132de03514121b0c22033 -size 2119818 +oid sha256:6822ee66217a654bdf6ecff65300aa58068fb0a954bcaeb4055defe2da0b8ae7 +size 2117714 diff --git a/apps/site/tests/snapshots/linux/desktop-xl/campaigns-arts-district-full.png b/apps/site/tests/snapshots/linux/desktop-xl/campaigns-arts-district-full.png index 44b45efc..76c6397f 100644 --- a/apps/site/tests/snapshots/linux/desktop-xl/campaigns-arts-district-full.png +++ b/apps/site/tests/snapshots/linux/desktop-xl/campaigns-arts-district-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53603380ae111696af0d88b4b0e908abfea1f90ad8cc03dc55a6fdc3070edb78 -size 1056978 +oid sha256:a64e8e2346ff825b3e09f3e7022fddb23a0cc17139b9f0293461d181cafcecd6 +size 1027652 diff --git a/apps/site/tests/snapshots/linux/desktop-xl/campaigns-arts-district-viewport.png b/apps/site/tests/snapshots/linux/desktop-xl/campaigns-arts-district-viewport.png index b662854c..018785f0 100644 --- a/apps/site/tests/snapshots/linux/desktop-xl/campaigns-arts-district-viewport.png +++ b/apps/site/tests/snapshots/linux/desktop-xl/campaigns-arts-district-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11e84e0caccd7c0c929733098efe4392f01bc19f15e95b9bfe757cb7a25f204d -size 760189 +oid sha256:2fafa8a496f02b5e3ea080fed38b6d40a13fc7edc5b0d7b31ab276912fdb3271 +size 779420 diff --git a/apps/site/tests/snapshots/linux/desktop-xl/projects-full.png b/apps/site/tests/snapshots/linux/desktop-xl/projects-full.png index f938a993..f8c5cbd1 100644 --- a/apps/site/tests/snapshots/linux/desktop-xl/projects-full.png +++ b/apps/site/tests/snapshots/linux/desktop-xl/projects-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18876b21583953e0a6109001307c9b4861a1701a219f9b01cd19b9c3e85f8a77 -size 386026 +oid sha256:0b408ee27328c921847c0c1c7f68ddd7eb5372fdcbdf02e96466b1f867b42fcd +size 718876 diff --git a/apps/site/tests/snapshots/linux/desktop-xl/projects-viewport.png b/apps/site/tests/snapshots/linux/desktop-xl/projects-viewport.png index 6aac1d26..04ced666 100644 --- a/apps/site/tests/snapshots/linux/desktop-xl/projects-viewport.png +++ b/apps/site/tests/snapshots/linux/desktop-xl/projects-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97cc4197385f6bfe34e6c9cdabe9af6dd3b9266179a46408049575007cb1eebe -size 119494 +oid sha256:05a9b128906c88f03c3e7d04591615508452c5556498ec959d8b06d1698e9448 +size 401518 diff --git a/apps/site/tests/snapshots/linux/desktop-xl/root-full.png b/apps/site/tests/snapshots/linux/desktop-xl/root-full.png index c7028403..9424b75b 100644 --- a/apps/site/tests/snapshots/linux/desktop-xl/root-full.png +++ b/apps/site/tests/snapshots/linux/desktop-xl/root-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4069cf47522a10d226ecd92c5edfd127625c0cc6f5e34825401817a1384a2d9d -size 332273 +oid sha256:78fec26181e1cf72a4cdaea058bc5e883cbca9acdc056d0119d83519ad6ea4ca +size 1725308 diff --git a/apps/site/tests/snapshots/linux/desktop-xl/root-viewport.png b/apps/site/tests/snapshots/linux/desktop-xl/root-viewport.png index 7180799b..cf88c0d1 100644 --- a/apps/site/tests/snapshots/linux/desktop-xl/root-viewport.png +++ b/apps/site/tests/snapshots/linux/desktop-xl/root-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92e66a8bd5258d0342cae5aaba1720131a70ffc0bbdaece3b2551118132ab3b2 -size 116619 +oid sha256:9e5a8a39dbd37f454ec59a2ce0bbdd2d1fe629c4376120a39ab2f282f051e894 +size 345414 diff --git a/apps/site/tests/snapshots/linux/desktop/brand-full.png b/apps/site/tests/snapshots/linux/desktop/brand-full.png index edb0caec..e1b9ec7c 100644 --- a/apps/site/tests/snapshots/linux/desktop/brand-full.png +++ b/apps/site/tests/snapshots/linux/desktop/brand-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:790532e4f2ad67528aa51d5d27601a603946e8c1879c158fa36122413b2b65af -size 1963740 +oid sha256:137d86b4c0a93e6af4e89fd7efd5b604ae7f1010f34df83cc6fec5bc591c19c8 +size 1961610 diff --git a/apps/site/tests/snapshots/linux/desktop/campaigns-arts-district-full.png b/apps/site/tests/snapshots/linux/desktop/campaigns-arts-district-full.png index bf5b9a7f..78549b25 100644 --- a/apps/site/tests/snapshots/linux/desktop/campaigns-arts-district-full.png +++ b/apps/site/tests/snapshots/linux/desktop/campaigns-arts-district-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e444d5eb06edd4e610315e5b9d53f7ecd149116ac99bff1f6122b40872f6e5df -size 759883 +oid sha256:196c7d9a98e908f2176d2a4b5182fe9ecc26507c29d7997f47884f475ba34da2 +size 731552 diff --git a/apps/site/tests/snapshots/linux/desktop/campaigns-arts-district-viewport.png b/apps/site/tests/snapshots/linux/desktop/campaigns-arts-district-viewport.png index c55a7c0c..f31308da 100644 --- a/apps/site/tests/snapshots/linux/desktop/campaigns-arts-district-viewport.png +++ b/apps/site/tests/snapshots/linux/desktop/campaigns-arts-district-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ea10e8c1458799539879bddeba80f6d0e31fae6bd930ee76d400f9ea6905104 -size 461616 +oid sha256:261d3e8b4e23f919479672311f50163006a739a9e00b1414ef0cfef840a309d2 +size 461636 diff --git a/apps/site/tests/snapshots/linux/desktop/projects-full.png b/apps/site/tests/snapshots/linux/desktop/projects-full.png index 0bd6ebad..bd29f090 100644 --- a/apps/site/tests/snapshots/linux/desktop/projects-full.png +++ b/apps/site/tests/snapshots/linux/desktop/projects-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8453c906a9de45e7942f7925376aca2bbb21ce4f974eeaf4183b6d8312427ac4 -size 328779 +oid sha256:a0734a0cca90e9526e02038bba2c9f90c8d99405bc553b3c030ffae6e0670e69 +size 643252 diff --git a/apps/site/tests/snapshots/linux/desktop/projects-viewport.png b/apps/site/tests/snapshots/linux/desktop/projects-viewport.png index 5443fd86..c37baeb7 100644 --- a/apps/site/tests/snapshots/linux/desktop/projects-viewport.png +++ b/apps/site/tests/snapshots/linux/desktop/projects-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b213654ddcbb43285ebbbce17ca8728184b55fc42ce8760878602657ed5f6f56 -size 67807 +oid sha256:660c2f0b03f0db14409ba2457150b3098ce67049860298f1a4d7e6bb56cbb5c8 +size 307596 diff --git a/apps/site/tests/snapshots/linux/desktop/root-full.png b/apps/site/tests/snapshots/linux/desktop/root-full.png index 15cc5a98..ab5e34d5 100644 --- a/apps/site/tests/snapshots/linux/desktop/root-full.png +++ b/apps/site/tests/snapshots/linux/desktop/root-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a1e75132e31501a9ec2a5deae6656bed3a9c2b4f79c7b862bf560a09d862351 -size 298499 +oid sha256:95550c6ae18854c5f814836820dec273897eaab899ebba6c8ab99080a2d25cfc +size 1658702 diff --git a/apps/site/tests/snapshots/linux/desktop/root-viewport.png b/apps/site/tests/snapshots/linux/desktop/root-viewport.png index e41a5165..fefccac9 100644 --- a/apps/site/tests/snapshots/linux/desktop/root-viewport.png +++ b/apps/site/tests/snapshots/linux/desktop/root-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a56abe97471863b959869909959f6f431a4916f4dcced1c3a21a792172bb362 -size 76815 +oid sha256:f986d599d4d8d9a75def406e06dc597e36889b1859122c7ba89e315f67c616fe +size 98205 diff --git a/apps/site/tests/snapshots/linux/mobile-landscape/campaigns-arts-district-full.png b/apps/site/tests/snapshots/linux/mobile-landscape/campaigns-arts-district-full.png index d69975fd..e2025f42 100644 --- a/apps/site/tests/snapshots/linux/mobile-landscape/campaigns-arts-district-full.png +++ b/apps/site/tests/snapshots/linux/mobile-landscape/campaigns-arts-district-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a376bdac0b94cb13e402cba44a1bce5e322d31e5d5509b60e01c98d84dff0a5b -size 661267 +oid sha256:7ebd3c923a2bcf2c174cd7e20a0ce2c16d57df1359054c641cf696333bf679fd +size 650475 diff --git a/apps/site/tests/snapshots/linux/mobile-landscape/projects-full.png b/apps/site/tests/snapshots/linux/mobile-landscape/projects-full.png index 0b12f695..f202b12b 100644 --- a/apps/site/tests/snapshots/linux/mobile-landscape/projects-full.png +++ b/apps/site/tests/snapshots/linux/mobile-landscape/projects-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a8c066ff24a661a27e6eb6100c74e2768c4fd2e477d44cab7d879500d39fe8f -size 297024 +oid sha256:b7f7dabfffb94b8b75bc6028e24e76e91bbf2053fb4434d844f12f2171ef0026 +size 920171 diff --git a/apps/site/tests/snapshots/linux/mobile-landscape/root-full.png b/apps/site/tests/snapshots/linux/mobile-landscape/root-full.png index 41f1105d..d8b39425 100644 --- a/apps/site/tests/snapshots/linux/mobile-landscape/root-full.png +++ b/apps/site/tests/snapshots/linux/mobile-landscape/root-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a62ad332c796d5e57f2ffd00746e27166214c2f3d3495c837c47ad094c03444a -size 240673 +oid sha256:3ee6822fd9d80a35d24da01eec39051b84e898fa584844428bd5a05b6a24d33b +size 1108868 diff --git a/apps/site/tests/snapshots/linux/mobile-landscape/root-viewport.png b/apps/site/tests/snapshots/linux/mobile-landscape/root-viewport.png index 47e9a76d..23b5f554 100644 --- a/apps/site/tests/snapshots/linux/mobile-landscape/root-viewport.png +++ b/apps/site/tests/snapshots/linux/mobile-landscape/root-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83042ec1cb230bc4caaec37a9f11d8ce72fdd66cdf4d462a8155600ceac8a9e8 -size 37275 +oid sha256:072452e08f4386960d7bfb87dfe3cf211936c2917fdcda29e4de704e84876fb3 +size 37917 diff --git a/apps/site/tests/snapshots/linux/mobile-portrait/campaigns-arts-district-full.png b/apps/site/tests/snapshots/linux/mobile-portrait/campaigns-arts-district-full.png index 2e37709b..92d84730 100644 --- a/apps/site/tests/snapshots/linux/mobile-portrait/campaigns-arts-district-full.png +++ b/apps/site/tests/snapshots/linux/mobile-portrait/campaigns-arts-district-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abc33df50b7214780c5661bc68ba0c729a7269a4cd66e9f5e1dabcffed70703e -size 418783 +oid sha256:f047df9485926d14fab7f8cac9b3308f578d2eed12c9431a159fad2f5acb3e74 +size 391401 diff --git a/apps/site/tests/snapshots/linux/mobile-portrait/projects-full.png b/apps/site/tests/snapshots/linux/mobile-portrait/projects-full.png index 37f9e6fc..514d17cc 100644 --- a/apps/site/tests/snapshots/linux/mobile-portrait/projects-full.png +++ b/apps/site/tests/snapshots/linux/mobile-portrait/projects-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b419fd397d65a8ce785c63a86e31c76bd6fc640d769f3a7adc2a6871d895fc3 -size 309270 +oid sha256:9dbd6f4ef3dba9aff16169d9cacd43a3ce8451401486bb8ab1cbfeacae922e35 +size 482369 diff --git a/apps/site/tests/snapshots/linux/mobile-portrait/projects-viewport.png b/apps/site/tests/snapshots/linux/mobile-portrait/projects-viewport.png index c72ce9ce..9cd05e08 100644 --- a/apps/site/tests/snapshots/linux/mobile-portrait/projects-viewport.png +++ b/apps/site/tests/snapshots/linux/mobile-portrait/projects-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f72db14ce27a9bf52db957ac807ac0880ce13e3aa8f4efe30d804f82066a8b4 -size 37293 +oid sha256:561b45f8dffdedf050e6fb81d7474eae4cb8d9e664e8ac378a17fe3c53cb197d +size 39269 diff --git a/apps/site/tests/snapshots/linux/mobile-portrait/root-full.png b/apps/site/tests/snapshots/linux/mobile-portrait/root-full.png index 8b83822f..928620d9 100644 --- a/apps/site/tests/snapshots/linux/mobile-portrait/root-full.png +++ b/apps/site/tests/snapshots/linux/mobile-portrait/root-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f822e209fdbd887656312d4fc4cdd3bc5ad91a40a1d7378f1eb18ebbc72f95fc -size 261664 +oid sha256:f308e87cb5a7bcae26e007fab2808329e20158aba8229a46db7bfa62008a258f +size 529473 diff --git a/apps/site/tests/snapshots/linux/mobile-portrait/root-viewport.png b/apps/site/tests/snapshots/linux/mobile-portrait/root-viewport.png index f9216b6f..0b5aad29 100644 --- a/apps/site/tests/snapshots/linux/mobile-portrait/root-viewport.png +++ b/apps/site/tests/snapshots/linux/mobile-portrait/root-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c78247d0925c829fc36a78776f81bd907ffa41dde7badbbf5773a390032da01 -size 50089 +oid sha256:69f0f4a6339407780295f058211e5dc63df230006700160a48cd42b73dfeab40 +size 45829 diff --git a/apps/site/tests/snapshots/linux/tablet-landscape/brand-full.png b/apps/site/tests/snapshots/linux/tablet-landscape/brand-full.png index 7144c9e5..5e199524 100644 --- a/apps/site/tests/snapshots/linux/tablet-landscape/brand-full.png +++ b/apps/site/tests/snapshots/linux/tablet-landscape/brand-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8056ec769a8c237cbaf30ffb3208e380a26f697f1c436c24f174f1480692c3a -size 1951177 +oid sha256:b106e8f031dc1155a0400c4e68cf23fe28e7cb56a13e7838ec9a44af73a02a0c +size 1948988 diff --git a/apps/site/tests/snapshots/linux/tablet-landscape/campaigns-arts-district-full.png b/apps/site/tests/snapshots/linux/tablet-landscape/campaigns-arts-district-full.png index 3e4f3430..ca16d125 100644 --- a/apps/site/tests/snapshots/linux/tablet-landscape/campaigns-arts-district-full.png +++ b/apps/site/tests/snapshots/linux/tablet-landscape/campaigns-arts-district-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46c330fb4adb9dd59cb73d7b8d52dc6d1818a4282ec6c68fc533dfc43d714712 -size 742429 +oid sha256:2a7ce98474a4b7a533fee654f62775c65214aa6faee2d383dccb835cf97820fd +size 716800 diff --git a/apps/site/tests/snapshots/linux/tablet-landscape/campaigns-arts-district-viewport.png b/apps/site/tests/snapshots/linux/tablet-landscape/campaigns-arts-district-viewport.png index a8d46e41..ed560b1f 100644 --- a/apps/site/tests/snapshots/linux/tablet-landscape/campaigns-arts-district-viewport.png +++ b/apps/site/tests/snapshots/linux/tablet-landscape/campaigns-arts-district-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88916a7a7ebc4d92b512caa04770c19f473726077b452c6d2cc4a4030b82f920 -size 454754 +oid sha256:1d482abe6659709b238c2c5a2e948ff25e87513250a269e1f767ef1f17c34125 +size 463150 diff --git a/apps/site/tests/snapshots/linux/tablet-landscape/projects-full.png b/apps/site/tests/snapshots/linux/tablet-landscape/projects-full.png index 15fa7949..91b526e8 100644 --- a/apps/site/tests/snapshots/linux/tablet-landscape/projects-full.png +++ b/apps/site/tests/snapshots/linux/tablet-landscape/projects-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6daa04846fb07091152e4c237b6aa09296f7bd62fbf7973959885b5d260ff71 -size 363291 +oid sha256:ecbd936e9a0bb215dd880a4d72e5e1a30677b7aa436e26829577bbd27366d4cc +size 632141 diff --git a/apps/site/tests/snapshots/linux/tablet-landscape/projects-viewport.png b/apps/site/tests/snapshots/linux/tablet-landscape/projects-viewport.png index 6dc9c629..9a92adfb 100644 --- a/apps/site/tests/snapshots/linux/tablet-landscape/projects-viewport.png +++ b/apps/site/tests/snapshots/linux/tablet-landscape/projects-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:419f5690364542c57134af974dae1fb27938353f6ebe951b63cb9f382d360659 -size 67865 +oid sha256:d1e4b121a3874d245c606ffa01edbf6fbcaa7281c454f541963ca22d88c5c509 +size 330764 diff --git a/apps/site/tests/snapshots/linux/tablet-landscape/root-full.png b/apps/site/tests/snapshots/linux/tablet-landscape/root-full.png index ef08a7aa..e8106c55 100644 --- a/apps/site/tests/snapshots/linux/tablet-landscape/root-full.png +++ b/apps/site/tests/snapshots/linux/tablet-landscape/root-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:158a5d695431cd659589356efa844d025a4de9c2fb8f6fdbcdbc4056e381c216 -size 298059 +oid sha256:3e91f5967835e82a935d142fb118e9a4f3a29de5b48ce1ed650a856eeaf0cb41 +size 1486696 diff --git a/apps/site/tests/snapshots/linux/tablet-landscape/root-viewport.png b/apps/site/tests/snapshots/linux/tablet-landscape/root-viewport.png index fedc218d..f2e41d11 100644 --- a/apps/site/tests/snapshots/linux/tablet-landscape/root-viewport.png +++ b/apps/site/tests/snapshots/linux/tablet-landscape/root-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a050fed627c375f1ef00ca52c6c0d0b06773fb7c49990530f8e9b1ad1f086e9c -size 73839 +oid sha256:bd1338f23d20bbe3d7081951b89e6bd1a90bdbe8cdc768f63fe104628388155d +size 121510 diff --git a/apps/site/tests/snapshots/linux/tablet-portrait/campaigns-arts-district-full.png b/apps/site/tests/snapshots/linux/tablet-portrait/campaigns-arts-district-full.png index 414d1568..52f73b74 100644 --- a/apps/site/tests/snapshots/linux/tablet-portrait/campaigns-arts-district-full.png +++ b/apps/site/tests/snapshots/linux/tablet-portrait/campaigns-arts-district-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65f74f8164da8625a613f3087eb9c41683842c85c7dce64254a208a39841caef -size 669538 +oid sha256:855a8724701c89c9cfd7340b5438fb777dc7c6f2734987b78c701f11047e6cf9 +size 654590 diff --git a/apps/site/tests/snapshots/linux/tablet-portrait/campaigns-arts-district-viewport.png b/apps/site/tests/snapshots/linux/tablet-portrait/campaigns-arts-district-viewport.png index d479939b..381ef3cc 100644 --- a/apps/site/tests/snapshots/linux/tablet-portrait/campaigns-arts-district-viewport.png +++ b/apps/site/tests/snapshots/linux/tablet-portrait/campaigns-arts-district-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcd4853a1c0886368f60d7089c6764af97152e0a17c8e9ffa2117a9c3b6a3da8 -size 431770 +oid sha256:59be8821ada5fba58d7455792dd65e4bc8de6678c2bb5d175ff557351bca89b3 +size 432591 diff --git a/apps/site/tests/snapshots/linux/tablet-portrait/projects-full.png b/apps/site/tests/snapshots/linux/tablet-portrait/projects-full.png index c599827a..b9f85bcf 100644 --- a/apps/site/tests/snapshots/linux/tablet-portrait/projects-full.png +++ b/apps/site/tests/snapshots/linux/tablet-portrait/projects-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd627d0eb0477c141d74ca3890af2844956118c2c255233b9d9c6ba1e0ae718c -size 363248 +oid sha256:b8d0e6a8a0341b86977d75ff9f2e1d44d2cf05b612c0817d37f8c51d0101a428 +size 498471 diff --git a/apps/site/tests/snapshots/linux/tablet-portrait/projects-viewport.png b/apps/site/tests/snapshots/linux/tablet-portrait/projects-viewport.png index 2ee5928d..cf431af3 100644 --- a/apps/site/tests/snapshots/linux/tablet-portrait/projects-viewport.png +++ b/apps/site/tests/snapshots/linux/tablet-portrait/projects-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ec36a60d67af460ea45835cebf9bbf430264cd74ecea61f675191dad8f2129d -size 98980 +oid sha256:f72e375621e2e282e2578945b799338000abb819149025376afbe864d5fc1517 +size 219532 diff --git a/apps/site/tests/snapshots/linux/tablet-portrait/root-full.png b/apps/site/tests/snapshots/linux/tablet-portrait/root-full.png index d9c66d3e..7b339535 100644 --- a/apps/site/tests/snapshots/linux/tablet-portrait/root-full.png +++ b/apps/site/tests/snapshots/linux/tablet-portrait/root-full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bce5154c2b47b23245d74ceb1ed2c6afa6ea14bcc6f8f2b16bcd5d121cbb21e2 -size 298293 +oid sha256:72e9829f6420539b0613eafdf475165c3b8a18cc52df5cdf95bd6e3151ec2cee +size 1581271 diff --git a/apps/site/tests/snapshots/linux/tablet-portrait/root-viewport.png b/apps/site/tests/snapshots/linux/tablet-portrait/root-viewport.png index 5037ce92..3d11f8a8 100644 --- a/apps/site/tests/snapshots/linux/tablet-portrait/root-viewport.png +++ b/apps/site/tests/snapshots/linux/tablet-portrait/root-viewport.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0a7825b8a38e5974800b5fdc87fe57eff0fd44016c01b35a69318a30519195c -size 103151 +oid sha256:96a186af2d3d6a85ae469be9a4f0fe5c87d7e5b89d2378ea263e3729577b34f1 +size 139413 diff --git a/apps/site/tests/support/a11y-helpers.ts b/apps/site/tests/support/a11y-helpers.ts index b8d95f88..14cdcaf0 100644 --- a/apps/site/tests/support/a11y-helpers.ts +++ b/apps/site/tests/support/a11y-helpers.ts @@ -1,29 +1,9 @@ import AxeBuilder from '@axe-core/playwright'; import type { Page } from '@playwright/test'; -const BRAND_EMBER = '#e5471a'; -const BRAND_ON_EMBER_COLORS = new Set(['#f7f4ec']); - type AxeResult = Awaited['analyze']>>; -type AxeNode = AxeResult['violations'][number]['nodes'][number]; type AxeViolation = AxeResult['violations'][number]; -function normalizeColor(value: unknown): string | undefined { - return typeof value === 'string' ? value.toLowerCase() : undefined; -} - -function isAcceptedOnEmberNode(node: AxeNode): boolean { - return node.any.some((check) => { - const data = check.data as { fgColor?: unknown; bgColor?: unknown } | undefined; - const foreground = normalizeColor(data?.fgColor); - return ( - foreground !== undefined && - BRAND_ON_EMBER_COLORS.has(foreground) && - normalizeColor(data?.bgColor) === BRAND_EMBER - ); - }); -} - export async function preparePageForA11y(page: Page): Promise { await page.waitForLoadState('networkidle'); await page.evaluate(() => document.fonts.ready); @@ -37,18 +17,6 @@ export async function preparePageForA11y(page: Page): Promise { }); } -export function actionableViolations(violations: AxeViolation[]): AxeViolation[] { - return violations - .map((violation) => ({ - ...violation, - nodes: - violation.id === 'color-contrast' - ? violation.nodes.filter((node) => !isAcceptedOnEmberNode(node)) - : violation.nodes, - })) - .filter((violation) => violation.nodes.length > 0); -} - export function summarizeViolations(violations: AxeViolation[]): string { return violations .map((violation) => { @@ -66,10 +34,10 @@ export function summarizeViolations(violations: AxeViolation[]): string { export async function axeBlockingViolations(page: Page): Promise { const result = await new AxeBuilder({ page }) - .withTags(['wcag2a', 'wcag2aa', 'wcag21a', 'wcag21aa']) + .withTags(['wcag2a', 'wcag2aa', 'wcag21a', 'wcag21aa', 'wcag22aa']) .analyze(); - return actionableViolations(result.violations); + return result.violations; } export async function semanticPageAudit(page: Page) { diff --git a/docs/explanation/design-system.md b/docs/explanation/design-system.md index 9bdc3787..183d7b0b 100644 --- a/docs/explanation/design-system.md +++ b/docs/explanation/design-system.md @@ -11,7 +11,7 @@ almost all of the color in the interface. | Name | Token | Hex | Role | | ----- | ------------------------------ | --------- | ------------------------------- | | Ember | `--color-primary` | `#e5471a` | Primary fill | -| Cream | `--color-on-primary` | `#f7f4ec` | Text / icons on Ember | +| Ink | `--color-on-primary` | `#0f1115` | Text / icons on Ember | | Peach | `--color-primary-container` | `#ffe9d6` | Soft primary surface | | Ink | `--color-on-primary-container` | `#0f1115` | Text / icons on Peach | | Rust | `--color-primary-ink` | `#bf3a10` | Ember as readable text on light | @@ -28,7 +28,7 @@ semantic token names are the source of truth. These rules are what keep the site from drifting into a generic "colorful" look. They are deliberate constraints, not defaults. -- **Use color in pairs.** Ember surfaces use Cream through `on-primary`; Peach surfaces use Ink +- **Use color in pairs.** Ember surfaces use Ink through `on-primary`; Peach surfaces use Ink through `on-primary-container`. - **Skew heavily to the primary.** Ember is the one color. Reach for it for emphasis and action before anything else. The palette is intentionally narrow. @@ -51,14 +51,13 @@ background) — it vibrates and cheapens; use it as the highlight. ## Why the primary roles are split -The bright Ember (`#e5471a`) is only ~3.6:1 on Cream, and Cream text on Ember is also ~3.6:1. LVBT -intentionally keeps Cream as `on-primary` because it reads as the brand voice on Ember. Primary -surfaces should be short action or emphasis moments, not long reading surfaces. Links and inline -primary text on light surfaces use a darkened Rust (`primary-ink`, ~5.0:1). +The bright Ember (`#e5471a`) is only ~3.6:1 on Cream. Ember surfaces use Ink as `on-primary` so +small button and status text clears WCAG AA. Primary surfaces should be short action or emphasis +moments, not long reading surfaces. Links and inline primary text on light surfaces use a darkened +Rust (`primary-ink`, ~5.0:1). -**Why it's deliberate:** one primary value everywhere either fails contrast or forces the whole -brand darker. The split keeps Ember bright as a fill, uses Cream for the brand-forward foreground on -Ember, and uses Rust only when orange itself is the text. +The split keeps Ember bright as a fill, uses Ink for readable foreground text on Ember, and uses +Rust when orange itself is the text. ## Dark theme diff --git a/docs/reference/design-tokens.md b/docs/reference/design-tokens.md index 506d4e5f..b6515267 100644 --- a/docs/reference/design-tokens.md +++ b/docs/reference/design-tokens.md @@ -37,7 +37,7 @@ Light and dark values. "→ primitive" shows what each role resolves to. | `--color-outline` | Ink `#0f1115` | `#524a3f` | Strong solid line (card/button outlines) | | `--color-outline-variant` | Ink `#0f1115` | Cream `#f7f4ec` | Faint hairline base for `/alpha` (tracks on-surface) | | `--color-primary` | Ember `#e5471a` | Ember `#e5471a` | Primary **fill**: buttons, active states, badges | -| `--color-on-primary` | Cream `#f7f4ec` | Cream `#f7f4ec` | Text/icon on `primary` | +| `--color-on-primary` | Ink `#0f1115` | Ink `#0f1115` | Text/icon on `primary` | | `--color-primary-container` | Peach `#ffe9d6` | `#47210f` | Soft primary surface (dark ember-brown in dark) | | `--color-on-primary-container` | Ink `#0f1115` | `#ffd9c7` | Text on `primary-container` | | `--color-primary-ink` | Rust `#bf3a10` | `#ff8a5c` | Primary **as text** — brightens in dark (MD3 tone lift) | @@ -60,8 +60,8 @@ themes, never a bright surface** — while its text role `--color-on-slab` is cr with `bg-slab text-on-slab`. (This is deliberately _not_ named `inverse-surface`: MD3's inverse-surface is a _bright_ surface in dark, which would turn the footer into a glare.) -**`primary`, `on-primary`, and `primary-ink`.** Ember is ~3.6:1 on Cream, and LVBT uses Cream as -`on-primary` for brand-forward primary moments. Treat primary surfaces as short action or emphasis +**`primary`, `on-primary`, and `primary-ink`.** Ember uses Ink as `on-primary` in both schemes, +clearing 4.5:1 for small text and icons. Treat primary surfaces as short action or emphasis surfaces, not long-reading containers. When orange itself is the text color, use `primary-ink` — Rust on light (~5:1), brightened to `#ff8a5c` on dark. Do not use `primary-ink` as the foreground on `primary`. @@ -73,7 +73,7 @@ Device-driven only, via `@media (prefers-color-scheme: dark)` — **no manual to Character is "Valley after dark": a warm near-black canvas, MD3 tonal elevation (lighter warm-charcoal containers, not drop shadows), and Ember reading like a light in the dark — including a `.press.bg-primary` glow applied only in dark. Neutral/content role pairs are held ≥4.5:1, rules -≥3:1, and the primary/on-primary brand pair ≥3:1 by +≥3:1, and the primary/on-primary brand pair ≥4.5:1 by [`apps/site/tests/e2e/color-contracts.spec.ts`](../../apps/site/tests/e2e/color-contracts.spec.ts), which runs in both schemes. diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4fc57a59..43c3e4d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,6 +57,9 @@ catalogs: cspell: specifier: 10.0.0 version: 10.0.0 + esbuild: + specifier: 0.28.1 + version: 0.28.1 eslint: specifier: 10.9.1 version: 10.9.1 @@ -184,6 +187,9 @@ importers: ical.js: specifier: 'catalog:' version: 2.2.1 + sharp: + specifier: 0.35.4 + version: 0.35.4(@types/node@24.13.3) sitemap: specifier: 'catalog:' version: 9.0.1 @@ -239,6 +245,9 @@ importers: cspell: specifier: 'catalog:' version: 10.0.0 + esbuild: + specifier: 'catalog:' + version: 0.28.1 eslint: specifier: 'catalog:' version: 10.9.1(jiti@2.7.0)(supports-color@10.2.2) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 5814738e..c4622633 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -82,12 +82,14 @@ catalog: alex: 11.0.1 astro-icon: 1.2.0 cspell: 10.0.0 + esbuild: 0.28.1 fast-xml-parser: 5.9.2 html-validate: 11.2.0 ical.js: 2.2.1 pagefind: 1.5.2 picocolors: 1.1.1 portless: 0.15.1 + sharp: 0.35.4 sitemap: 9.0.1 stylelint: 17.14.0 tslib: 2.8.1