diff --git a/web/scripts/check-tokens.mjs b/web/scripts/check-tokens.mjs index 2c21db2..63e184a 100644 --- a/web/scripts/check-tokens.mjs +++ b/web/scripts/check-tokens.mjs @@ -108,7 +108,8 @@ function checkCss(source, rel) { } } -const ARBITRARY = /(?:^|[\s"'`:])!?-?[a-z][\w-]*-\[([^\]\s]+)\]/g; +// a value, not a variant: `data-[tone=fault]:` selects, it does not style +const ARBITRARY = /(?:^|[\s"'`:])!?-?[a-z][\w-]*-\[([^\]\s]+)\](?!:)/g; function checkPlain(source, rel) { // Comments are prose, not styling — `checkCss` already ignores them, and diff --git a/web/src/buckets.tsx b/web/src/buckets.tsx index efe978c..c22d23b 100644 --- a/web/src/buckets.tsx +++ b/web/src/buckets.tsx @@ -19,7 +19,18 @@ import { ruleLabel, type WaiveOutcome, } from "./releases"; -import { Chip, Control, DeckHead, Disclosure, EmptyRow, Row, SkeletonRows, useNote } from "./ui"; +import { + Chip, + Control, + DeckHead, + Disclosure, + EmptyRow, + Row, + Rows, + Section, + SkeletonRows, + useNote, +} from "./ui"; export type Bucket = "eligible" | "waived" | "rejected"; @@ -138,13 +149,13 @@ function CollapsedBucket({ }) { const [open, setOpen] = useState(false); return ( - ); } @@ -171,17 +182,17 @@ export function Buckets({ state, actions }: { state: DeckState; actions: Release if (state.kind !== "releases") { return (
-
); } @@ -206,10 +217,10 @@ function PaintedBuckets({ const forceable = rejected.filter(overridable).length; return (
-
+
-
    + {eligible.length === 0 ? ( )} -
-
+ +
- + -
+
-
    + {files === null && } {files?.kind === "error" && ( @@ -569,14 +572,14 @@ export function MovieView({ movieId, toReleases }: { movieId: number; toReleases refresh={refreshSubtitles} /> ))} -
-
+ +
-
+
- + -
- +
+ ); } diff --git a/web/src/views/Queues.tsx b/web/src/views/Queues.tsx index 2b15009..89492a8 100644 --- a/web/src/views/Queues.tsx +++ b/web/src/views/Queues.tsx @@ -25,12 +25,15 @@ import { missingChipLabel } from "../subtitles"; import { Chip, Control, + Deck, DeckHead, EmptyRow, GroupNote, + PageBar, Row, + Rows, + Section, SkeletonRows, - StatusSlot, useNote, useStatus, } from "../ui"; @@ -208,11 +211,11 @@ function QueueGroup({ hidden: boolean; }) { return ( - ); } @@ -294,14 +297,12 @@ export function QueuesView({ hidden }: { hidden: boolean }) { ); return ( -
-
-

queues

- - {loaded === null || total === 0 ? "" : `${total} waiting`} - - -
+
+ ); } diff --git a/web/src/views/Search.tsx b/web/src/views/Search.tsx index 8639f7e..b4c847b 100644 --- a/web/src/views/Search.tsx +++ b/web/src/views/Search.tsx @@ -18,7 +18,19 @@ import { type TmdbMovie, type TmdbSeries, } from "../search"; -import { Chip, Control, DeckHead, flag, LampToggle, Row, StatusSlot, useStatus } from "../ui"; +import { + Chip, + Control, + Deck, + DeckHead, + flag, + LampToggle, + PageBar, + Row, + Rows, + Section, + useStatus, +} from "../ui"; /** Which kind the deck is showing. `all` is both, and the default. */ type KindFilter = "all" | "movie" | "series"; @@ -395,17 +407,8 @@ export function SearchView({ all.filter((hit) => filter === "all" || hit.kind === filter).length; return ( -
-
-

search

- -
+
+ + ); } diff --git a/web/src/views/Series.tsx b/web/src/views/Series.tsx index d415dd3..16b7e13 100644 --- a/web/src/views/Series.tsx +++ b/web/src/views/Series.tsx @@ -52,11 +52,14 @@ import { ArmedDeleteWord, Chip, Control, + Deck, DeckHead, EmptyRow, IconControl, LampToggle, Row, + Rows, + Section, SkeletonRows, StatusSlot, useNote, @@ -695,7 +698,7 @@ export function SeriesView({ seriesId, covered }: { seriesId: number; covered: b const rootListed = series !== null && tvRoots.some((root) => root.id === series.root_id); return ( -
+
+ + + ); } diff --git a/web/src/views/Settings.tsx b/web/src/views/Settings.tsx index 6f253be..7dff475 100644 --- a/web/src/views/Settings.tsx +++ b/web/src/views/Settings.tsx @@ -34,13 +34,16 @@ import { Chip, Control, cx, + Deck, DeckHead, GroupNote, IconControl, type Note, NoteLine, + PageBar, Row, - StatusSlot, + Rows, + Section, useNote, useStatus, } from "../ui"; @@ -1116,33 +1119,31 @@ export function SettingsView({ hidden }: { hidden: boolean }) { const reload = () => void load(); return ( -
-
-

settings

- - {loaded === null - ? "" - : `${loaded.roots.length} roots · ${loaded.policies.length} policies`} - - -
+
+ + ); } diff --git a/web/src/views/TvDeck.tsx b/web/src/views/TvDeck.tsx index 1c56c79..46f082d 100644 --- a/web/src/views/TvDeck.tsx +++ b/web/src/views/TvDeck.tsx @@ -16,7 +16,7 @@ import { type SeasonPackState, } from "../releases"; import { waiveAndGrabTv } from "../series"; -import { IconControl, type Status, StatusSlot } from "../ui"; +import { Deck, IconControl, type Status, StatusSlot } from "../ui"; /** §6.2: the sweep runs on the daemon's cadence. Poll modestly, give up softly. */ const TV_SWEEP_POLL_MS = 5000; @@ -358,8 +358,9 @@ export function TvDeckView({ request }: { request: TvDeckRequest }) { } return ( -
-
+ + {/* a detail page without a hero still gives its head room under the rail */} +

{request.title}

@@ -376,7 +377,7 @@ export function TvDeckView({ request }: { request: TvDeckRequest }) { search indexers
- + -
+ ); }