diff --git a/web/e2e/maps-cards.e2e.ts b/web/e2e/maps-cards.e2e.ts index 41c1a80..f2a8d7c 100644 --- a/web/e2e/maps-cards.e2e.ts +++ b/web/e2e/maps-cards.e2e.ts @@ -212,7 +212,7 @@ test("cards keep complete names and long times inside at every breakpoint", asyn (element) => getComputedStyle(element).gridTemplateColumns.split(" ").length, ); - expect(columns).toBe(width === 1920 ? 5 : 4); + expect(columns).toBe(3); } } }); diff --git a/web/e2e/maps-overview.e2e.ts b/web/e2e/maps-overview.e2e.ts index 5529378..722912a 100644 --- a/web/e2e/maps-overview.e2e.ts +++ b/web/e2e/maps-overview.e2e.ts @@ -113,7 +113,7 @@ test("the overview stays centered and the reset matches the tier columns", async expect(controls.right).toBeLessThan(1); expect(controls.separated).toBeGreaterThanOrEqual(20); expect(controls.frameCenter).toBeLessThan(1); - expect(controls.frameWidth).toBeLessThan(controls.pageWidth); + expect(Math.abs(controls.frameWidth - controls.pageWidth)).toBeLessThan(1); }); test("the donut has clean sector boundaries, animates hover and has no click focus box", async ({ diff --git a/web/src/app/globals.css b/web/src/app/globals.css index 36e617d..f71680b 100644 --- a/web/src/app/globals.css +++ b/web/src/app/globals.css @@ -23,7 +23,7 @@ cursor: pointer; } - /* The window either side of the sheet; pages sit on the sheet (the root layout). */ + /* One background across the viewport, with centered content in the root layout. */ body { background: var(--color-gutter); color: var(--color-text); diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx index 71fcdae..e82a601 100644 --- a/web/src/app/layout.tsx +++ b/web/src/app/layout.tsx @@ -1,9 +1,7 @@ // Root layout: fonts, global styles, the header and footer, the run dialog, and site-wide metadata. import type { Metadata } from "next"; -import Image from "next/image"; import { Exo_2, Geist } from "next/font/google"; import { Suspense } from "react"; -import art from "@/features/site/header-interloper.webp"; import { RunDialogHost } from "@/features/runs/RunDialogHost"; import { SiteFooter } from "@/features/site/SiteFooter"; import { SiteHeader } from "@/features/site/SiteHeader"; @@ -39,33 +37,14 @@ export default function RootLayout({ children }: LayoutProps<"/">) { > - {/* What shows in the gutters either side of the sheet: the header's map picture, blurred and darkened - far back, fixed while the page scrolls. Blurred anyway, so a small copy of it is plenty. */} -
- -
-
- {/* The sheet, as the old sourcejump.net had it: one column down the middle of the window, edges lit, - holding the header, the page and the footer, the gutters either side. */} -
- {/* The header and page fill at least the window, so the footer starts right at the fold: the page - always scrolls, and the scrollbar doesn't come and go between short and long pages. The space - above the footer is padding in here, not a margin on the footer, so it doesn't push it lower. */} -
- -
{children}
+ {/* Keep the footer below the fold so short pages don't change the scrollbar width. */} +
+ +
+ {children}
-
+ {/* The run dialog, over whichever page opened it (`?run=` in the address). */} diff --git a/web/src/features/maps/MapList.tsx b/web/src/features/maps/MapList.tsx index d1102a7..de2cce7 100644 --- a/web/src/features/maps/MapList.tsx +++ b/web/src/features/maps/MapList.tsx @@ -211,7 +211,7 @@ export async function MapList({ params }: { params: MapListParams }) {

Maps

{list && ( - + -
+
-
+