Skip to content

Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.

feat(website): redraw the scroll walkthrough in the editor's new direction

EtienneLescot16534f0cc055
diff --git a/website/scripts/gen-recreation.mjs b/website/scripts/gen-recreation.mjs
index 701f6e97d..856005b3e 100644
--- a/website/scripts/gen-recreation.mjs
+++ b/website/scripts/gen-recreation.mjs
@@ -706,16 +706,48 @@ const EFFECTS = {
};
/**
- * Every slider and toggle on the two panels, at the document's own settings and
- * with the range, suffix and precision RightPanes.tsx gives it.
+ * Every slider, toggle and row of named levels on the two panels, at the
+ * document's own settings and with the range, suffix and precision RightPanes.tsx
+ * gives it.
*
- * The app stores most of these as fractions and displays them scaled — cursor
- * size is `size * 10` over 5–100 with one decimal and no suffix, smoothing is
- * `smoothing * 100` with a per-cent sign — so a panel that showed the stored
- * number would be wrong in a way that looks entirely plausible. The scaling
- * lives here, next to the value it scales.
+ * The app stores most of these as fractions and displays them scaled — smoothing
+ * is `smoothing * 100` with a per-cent sign, cursor size is shown as no number at
+ * all — so a panel that showed the stored number would be wrong in a way that
+ * looks entirely plausible. The scaling lives here, next to the value it scales.
*/
const le = doc.legacyEditor;
+
+/**
+ * The named levels RightPanes.tsx offers where a number would mean nothing to a
+ * user (shadow, click bounce). Lifted as source, like `wallpaper.ts` below: that
+ * file reaches React and the `@/` alias and cannot be imported.
+ */
+const RIGHT_PANES_SRC = readFileSync(
+ resolve(APP, "src/components/ai-edition/RightPanes.tsx"),
+ "utf8",
+);
+function liftLevels(name) {
+ const body = new RegExp(`const ${name} = \\[([\\s\\S]*?)\\] as const;`).exec(
+ RIGHT_PANES_SRC,
+ )?.[1];
+ const levels = [...(body ?? "").matchAll(/value: ([\d.]+), labelKey: "([\w.]+)"/g)].map((m) => ({
+ value: Number(m[1]),
+ label: t(`settings:${m[2]}`),
+ }));
+ if (levels.length < 2) throw new Error(`could not lift ${name} out of RightPanes.tsx`);
+ return levels;
+}
+/** The level whose value is nearest. The document predates the rows: its shadow
+ * (0.35) sits between two levels, where the app presses no button at all. A row
+ * with nothing pressed reads as broken on a page, so the page presses the
+ * nearest one and says so here. */
+const nearestLevel = (levels, v) =>
+ levels.reduce((a, b) => (Math.abs(b.value - v) < Math.abs(a.value - v) ? b : a)).value;
+
+const { SETTING_BOUNDS, DEFAULT_PROJECT_APPEARANCE, readBackgroundBlur } = await appModule(
+ "src/lib/projectDefaults.ts",
+);
+const { ROUNDNESS_SLIDER_MAX_PX } = await appModule("src/native/paramUnits.ts");
const defaultsSrc = [
[
"src/components/video-editor/types.ts",
@@ -746,10 +778,22 @@ const slider = (label, value, min, max, suffix, display) => ({
display,
});
+const blurBg = readBackgroundBlur(le, 0);
+const SHADOW_LEVELS = liftLevels("SHADOW_LEVELS");
+const CLICK_BOUNCE_LEVELS = liftLevels("CLICK_BOUNCE_LEVELS");
+
const CONTROLS = {
- // RightPanes.tsx:1443, :1397, :1412, :1427 — Video Effects, in its order.
+ // RightPanes.tsx VideoEffectsPane — the Background section's blur, then the
+ // Frame section (shadow, padding, roundness), then Motion.
+ // The document stores the old `showBlur` switch; the app reads it through
+ // `readBackgroundBlur`, and so does this.
+ blurBg: slider(t("settings:effects.blurBg"), blurBg * 100, 0, 100, "%", asPercent(blurBg)),
+ shadow: {
+ label: t("settings:effects.shadow"),
+ levels: SHADOW_LEVELS,
+ value: nearestLevel(SHADOW_LEVELS, le.shadowIntensity),
+ },
padding: slider(t("settings:effects.padding"), le.padding, 0, 100, "%", `${le.padding}%`),
- blurBg: { label: t("settings:effects.blurBg"), on: le.showBlur },
motionBlur: slider(
t("settings:effects.motionBlur"),
le.motionBlurAmount * 100,
@@ -758,32 +802,26 @@ const CONTROLS = {
"%",
asPercent(le.motionBlurAmount),
),
- shadow: slider(
- t("settings:effects.shadow"),
- le.shadowIntensity * 100,
- 0,
- 100,
- "%",
- asPercent(le.shadowIntensity),
- ),
roundness: slider(
t("settings:effects.roundness"),
le.borderRadius,
0,
- 64,
+ ROUNDNESS_SLIDER_MAX_PX,
"px",
`${le.borderRadius}px`,
),
- // RightPanes.tsx:1755 — Cursor. `show` is not in this document, so it is the
+ // RightPanes.tsx CursorPane. `show` is not in this document, so it is the
// app's own default rather than a guess.
cursorShow: { label: t("settings:cursor.show"), on: defaultBool("cursorShow") },
+ // Over SETTING_BOUNDS, with no value shown: the slider has no unit, and the
+ // app does not print a number nobody can act on.
cursorSize: slider(
t("settings:cursor.size"),
- le.cursorSize * 10,
- 5,
- 100,
+ le.cursorSize,
+ SETTING_BOUNDS.cursorSize[0],
+ SETTING_BOUNDS.cursorSize[1],
+ "",
"",
- (le.cursorSize * 10).toFixed(1),
),
smoothing: slider(
t("settings:cursor.smoothing"),
@@ -793,6 +831,12 @@ const CONTROLS = {
"%",
asPercent(le.cursorSmoothing),
),
+ // Not in this document either: the app's default level.
+ clickBounce: {
+ label: t("settings:cursor.clickBounce"),
+ levels: CLICK_BOUNCE_LEVELS,
+ value: DEFAULT_PROJECT_APPEARANCE.cursor.clickBounce,
+ },
};
/**
@@ -853,11 +897,16 @@ const CURSORS = {
const PANELS = {
background: {
title: t("settings:background.title"),
+ // WallpaperPicker's order: image, gradient, colour.
tabs: [
t("settings:background.image"),
- t("settings:background.color"),
t("settings:background.gradient"),
+ t("settings:background.color"),
],
+ motion: t("settings:background.motion"),
+ motions: ["motionNone", "motionDrift", "motionAurora", "motionWaves"].map((k) =>
+ t(`settings:background.${k}`),
+ ),
uploadCustom: t("settings:background.uploadCustom"),
wallpaperCount: WALLPAPER_COUNT,
swatchLabels: Array.from({ length: WALLPAPER_COUNT }, (_, i) =>
@@ -866,6 +915,8 @@ const PANELS = {
},
effects: {
title: t("settings:effects.title"),
+ frame: t("settings:effects.frame"),
+ motion: t("settings:effects.motion"),
padding: t("settings:effects.padding"),
blurBg: t("settings:effects.blurBg"),
motionBlur: t("settings:effects.motionBlur"),
@@ -877,6 +928,7 @@ const PANELS = {
show: t("settings:cursor.show"),
size: t("settings:cursor.size"),
smoothing: t("settings:cursor.smoothing"),
+ clickBounce: t("settings:cursor.clickBounce"),
},
};
@@ -1035,11 +1087,11 @@ const PROVENANCE = [
},
{
shown: PANELS.background.tabs[1],
- source: "src/i18n/locales/en/settings.json → background.color",
+ source: "src/i18n/locales/en/settings.json → background.gradient",
},
{
shown: PANELS.background.tabs[2],
- source: "src/i18n/locales/en/settings.json → background.gradient",
+ source: "src/i18n/locales/en/settings.json → background.color",
},
{
shown: PANELS.background.uploadCustom,
@@ -1068,6 +1120,25 @@ const PROVENANCE = [
shown: PANELS.cursor.smoothing,
source: "src/i18n/locales/en/settings.json → cursor.smoothing",
},
+ {
+ shown: PANELS.cursor.clickBounce,
+ source: "src/i18n/locales/en/settings.json → cursor.clickBounce",
+ },
+ {
+ shown: PANELS.background.motion,
+ source: "src/i18n/locales/en/settings.json → background.motion",
+ },
+ ...PANELS.background.motions.map((shown) => ({
+ shown,
+ source: "src/i18n/locales/en/settings.json → background.motion{None,Drift,Aurora,Waves}",
+ })),
+ { shown: PANELS.effects.frame, source: "src/i18n/locales/en/settings.json → effects.frame" },
+ { shown: PANELS.effects.motion, source: "src/i18n/locales/en/settings.json → effects.motion" },
+ ...[...CONTROLS.shadow.levels, ...CONTROLS.clickBounce.levels].map((level) => ({
+ shown: level.label,
+ source:
+ "lifted: SHADOW_LEVELS / CLICK_BOUNCE_LEVELS in RightPanes.tsx, labels from settings.json",
+ })),
];
// A string that claims a locale source but is not in the locale files is the
diff --git a/website/src/components/Recreation/ART-DIRECTION.md b/website/src/components/Recreation/ART-DIRECTION.md
index d75dedcb4..18a9b3a1c 100644
--- a/website/src/components/Recreation/ART-DIRECTION.md
+++ b/website/src/components/Recreation/ART-DIRECTION.md
@@ -58,9 +58,15 @@ travel between two controls.
- **The panels** are the app's, by locale key: `PANELS` for the titles,
`CONTROLS` for every slider at this document's own setting, scaled and
- suffixed the way `RightPanes.tsx` does it. Cursor size is `size * 10` over
- 5–100 with one decimal and no unit — a hand-written panel gets that wrong in a
- way that looks entirely plausible.
+ suffixed the way `RightPanes.tsx` does it, and the rows of named levels
+ (shadow, click bounce) lifted out of that file. Cursor size shows no number at
+ all, because the app shows none — a hand-written panel gets that wrong in a
+ way that looks entirely plausible. The document predates the level rows: its
+ shadow sits between two levels, and the page presses the nearest one.
+- **The drawing follows the app's current direction**: Background is a section
+ of the Composition pane, settings are free rows under section labels, a fixed
+ choice is a row of buttons, and the timeline wears candy cards — the clip in
+ the brand's green with the app's own waveform paths, zooms in blue.
- **The padding slider** moves the composite through `PreviewCanvas.tsx`'s own
`clamp(1 - (padding/100) * 0.4, 0.4, 1)`, evaluated per frame.
- **The wallpapers** are the app's own — twelve of the eighteen it ships, in the
diff --git a/website/src/components/Recreation/driver.ts b/website/src/components/Recreation/driver.ts
index bc2a10f0e..b356bebd2 100644
--- a/website/src/components/Recreation/driver.ts
+++ b/website/src/components/Recreation/driver.ts
@@ -40,7 +40,6 @@ export interface DriverRefs {
root: HTMLElement;
cam: HTMLVideoElement;
padValue: HTMLElement;
- sizeValue: HTMLElement;
flow: HTMLElement;
}
@@ -172,7 +171,7 @@ export function attachDriver(refs: DriverRefs, cls: DriverClasses): () => void {
};
}
- const { band, root, cam, padValue, sizeValue, flow } = refs;
+ const { band, root, cam, padValue, flow } = refs;
let raf = 0;
/* ── the target cache ─────────────────────────────────────────────────── */
@@ -551,7 +550,6 @@ export function attachDriver(refs: DriverRefs, cls: DriverClasses): () => void {
let lastBeat: string | null | undefined;
let lastPad = "";
- let lastSize = "";
let lastArt = "";
const struck = new Set<number>();
let trimEls: HTMLElement[] = [];
@@ -629,10 +627,6 @@ export function attachDriver(refs: DriverRefs, cls: DriverClasses): () => void {
const pad = `${Math.round(f.padding)}%`;
if (pad !== lastPad) padValue.textContent = lastPad = pad;
- // One decimal and no suffix: RightPanes gives this one slider `decimals={1}`
- // and no unit, unlike every other slider on the panel.
- const size = f.cursorSize.toFixed(1);
- if (size !== lastSize) sizeValue.textContent = lastSize = size;
// Only the five removable entries can ever change, so the other forty
// nodes in the transcript are never touched.
for (const i of CUT_INDEX) {
diff --git a/website/src/components/Recreation/generated.ts b/website/src/components/Recreation/generated.ts
index 5da6a46b1..49a910880 100644
--- a/website/src/components/Recreation/generated.ts
+++ b/website/src/components/Recreation/generated.ts
@@ -489,8 +489,15 @@ export const PANELS = {
title: "Background",
tabs: [
"Image",
- "Color",
"Gradient",
+ "Color",
+ ],
+ motion: "Animation",
+ motions: [
+ "None",
+ "Drift",
+ "Aurora",
+ "Waves",
],
uploadCustom: "Upload image",
wallpaperCount: 18,
@@ -517,6 +524,8 @@ export const PANELS = {
},
effects: {
title: "Composition",
+ frame: "Frame",
+ motion: "Motion",
padding: "Padding",
blurBg: "Blur background",
motionBlur: "Motion blur",
@@ -528,6 +537,7 @@ export const PANELS = {
show: "Show cursor",
size: "Size",
smoothing: "Smoothing",
+ clickBounce: "Click bounce",
},
} as const;
@@ -543,6 +553,36 @@ export const EFFECTS = {
/** Every slider and toggle on those panels, at this document's settings, scaled
* and suffixed the way RightPanes.tsx scales and suffixes it. */
export const CONTROLS = {
+ blurBg: {
+ label: "Blur background",
+ value: 50,
+ min: 0,
+ max: 100,
+ suffix: "%",
+ display: "50%",
+ },
+ shadow: {
+ label: "Shadow",
+ levels: [
+ {
+ value: 0,
+ label: "None",
+ },
+ {
+ value: 0.3,
+ label: "Light",
+ },
+ {
+ value: 0.6,
+ label: "Medium",
+ },
+ {
+ value: 0.9,
+ label: "Strong",
+ },
+ ],
+ value: 0.3,
+ },
padding: {
label: "Padding",
value: 55,
@@ -551,10 +591,6 @@ export const CONTROLS = {
suffix: "%",
display: "55%",
},
- blurBg: {
- label: "Blur background",
- on: true,
- },
motionBlur: {
label: "Motion blur",
value: 30,
@@ -563,14 +599,6 @@ export const CONTROLS = {
suffix: "%",
display: "30%",
},
- shadow: {
- label: "Shadow",
- value: 35,
- min: 0,
- max: 100,
- suffix: "%",
- display: "35%",
- },
roundness: {
label: "Roundness",
value: 40,
@@ -585,11 +613,11 @@ export const CONTROLS = {
},
cursorSize: {
label: "Size",
- value: 45,
- min: 5,
- max: 100,
+ value: 4.5,
+ min: 1.5,
+ max: 6,
suffix: "",
- display: "45.0",
+ display: "",
},
smoothing: {
label: "Smoothing",
@@ -599,6 +627,24 @@ export const CONTROLS = {
suffix: "%",
display: "35%",
},
+ clickBounce: {
+ label: "Click bounce",
+ levels: [
+ {
+ value: 0,
+ label: "None",
+ },
+ {
+ value: 1,
+ label: "Light",
+ },
+ {
+ value: 2,
+ label: "Strong",
+ },
+ ],
+ value: 1,
+ },
} as const;
/** The cursor art the page draws, each sprite with the application's own
@@ -696,8 +742,8 @@ export const PROVENANCE: ProvenanceEntry[] = [
{ shown: "Bellrock — docs walkthrough", source: "fixture assets[0].label, as the clip card's own label" },
{ shown: "Background", source: "src/i18n/locales/en/settings.json → background.title" },
{ shown: "Image", source: "src/i18n/locales/en/settings.json → background.image" },
- { shown: "Color", source: "src/i18n/locales/en/settings.json → background.color" },
{ shown: "Gradient", source: "src/i18n/locales/en/settings.json → background.gradient" },
+ { shown: "Color", source: "src/i18n/locales/en/settings.json → background.color" },
{ shown: "Upload image", source: "src/i18n/locales/en/settings.json → background.uploadCustom" },
{ shown: "Background 1", source: "computed: settings.json background.imageLabel over the 18 wallpapers WALLPAPER_COUNT declares in src/lib/wallpaper.ts" },
{ shown: "Composition", source: "src/i18n/locales/en/settings.json → effects.title" },
@@ -710,6 +756,21 @@ export const PROVENANCE: ProvenanceEntry[] = [
{ shown: "Show cursor", source: "src/i18n/locales/en/settings.json → cursor.show" },
{ shown: "Size", source: "src/i18n/locales/en/settings.json → cursor.size" },
{ shown: "Smoothing", source: "src/i18n/locales/en/settings.json → cursor.smoothing" },
+ { shown: "Click bounce", source: "src/i18n/locales/en/settings.json → cursor.clickBounce" },
+ { shown: "Animation", source: "src/i18n/locales/en/settings.json → background.motion" },
+ { shown: "None", source: "src/i18n/locales/en/settings.json → background.motion{None,Drift,Aurora,Waves}" },
+ { shown: "Drift", source: "src/i18n/locales/en/settings.json → background.motion{None,Drift,Aurora,Waves}" },
+ { shown: "Aurora", source: "src/i18n/locales/en/settings.json → background.motion{None,Drift,Aurora,Waves}" },
+ { shown: "Waves", source: "src/i18n/locales/en/settings.json → background.motion{None,Drift,Aurora,Waves}" },
+ { shown: "Frame", source: "src/i18n/locales/en/settings.json → effects.frame" },
+ { shown: "Motion", source: "src/i18n/locales/en/settings.json → effects.motion" },
+ { shown: "None", source: "lifted: SHADOW_LEVELS / CLICK_BOUNCE_LEVELS in RightPanes.tsx, labels from settings.json" },
+ { shown: "Light", source: "lifted: SHADOW_LEVELS / CLICK_BOUNCE_LEVELS in RightPanes.tsx, labels from settings.json" },
+ { shown: "Medium", source: "lifted: SHADOW_LEVELS / CLICK_BOUNCE_LEVELS in RightPanes.tsx, labels from settings.json" },
+ { shown: "Strong", source: "lifted: SHADOW_LEVELS / CLICK_BOUNCE_LEVELS in RightPanes.tsx, labels from settings.json" },
+ { shown: "None", source: "lifted: SHADOW_LEVELS / CLICK_BOUNCE_LEVELS in RightPanes.tsx, labels from settings.json" },
+ { shown: "Light", source: "lifted: SHADOW_LEVELS / CLICK_BOUNCE_LEVELS in RightPanes.tsx, labels from settings.json" },
+ { shown: "Strong", source: "lifted: SHADOW_LEVELS / CLICK_BOUNCE_LEVELS in RightPanes.tsx, labels from settings.json" },
];
/** What check-recreation.mjs asserts against. */
diff --git a/website/src/components/Recreation/index.tsx b/website/src/components/Recreation/index.tsx
index c4bf11eab..2eefc5269 100644
--- a/website/src/components/Recreation/index.tsx
+++ b/website/src/components/Recreation/index.tsx
@@ -50,7 +50,7 @@ import {
import { useEffect, useRef } from "react";
import { attachDriver, SCENE_QUERIES } from "./driver";
-import { CONTROLS, CURSORS, INSPECTOR, PANELS } from "./generated";
+import { CONTROLS, CURSORS, INSPECTOR, PANELS, WAVEFORM } from "./generated";
import {
BEATS,
type BeatId,
@@ -101,7 +101,7 @@ function Slider({ label, display, pct }: { label: string; display: string; pct:
<span className={styles.control}>
<span className={styles.controlHead}>
<span className={styles.controlLabel}>{label}</span>
- <span className={styles.controlValue}>{display}</span>
+ {display ? <span className={styles.controlValue}>{display}</span> : null}
</span>
<span className={styles.track}>
<span className={styles.trackFill} style={{ width: `${pct}%` }} />
@@ -120,6 +120,34 @@ function Toggle({ label, on }: { label: string; on: boolean }) {
);
}
+/** A row of named choices, one pressed: the app's `ChoiceRow`, which replaced
+ * its selects and the sliders whose number meant nothing to a user. */
+function Choices({
+ label,
+ options,
+ pressed,
+}: {
+ label: string;
+ options: readonly string[];
+ pressed: number;
+}) {
+ return (
+ <span className={styles.field}>
+ <span className={styles.controlLabel}>{label}</span>
+ <span className={styles.choices}>
+ {options.map((o, i) => (
+ <span key={o} className={i === pressed ? styles.choiceOn : styles.choice}>
+ {o}
+ </span>
+ ))}
+ </span>
+ </span>
+ );
+}
+
+const levelIndex = (c: { levels: readonly { value: number }[]; value: number }) =>
+ c.levels.findIndex((l) => l.value === c.value);
+
const pctOf = (c: { value: number; min: number; max: number }) =>
((c.value - c.min) / (c.max - c.min)) * 100;
@@ -187,7 +215,6 @@ export default function Recreation() {
const root = useRef<HTMLDivElement | null>(null);
const cam = useRef<HTMLVideoElement | null>(null);
const padValue = useRef<HTMLSpanElement | null>(null);
- const sizeValue = useRef<HTMLSpanElement | null>(null);
const flow = useRef<HTMLParagraphElement | null>(null);
useEffect(() => {
@@ -196,7 +223,6 @@ export default function Recreation() {
root: root.current,
cam: cam.current,
padValue: padValue.current,
- sizeValue: sizeValue.current,
flow: flow.current,
};
if (Object.values(refs).some((el) => el === null)) return;
@@ -277,8 +303,9 @@ export default function Recreation() {
translated captions beside them must not. */}
<div className={styles.panel} aria-hidden="true" lang="en">
<header className={styles.panelHead}>
+ {/* One pane in the app: Background is a section of Composition. */}
<h4 className={styles.panelTitle} data-pane="style">
- {PANELS.background.title}
+ {PANELS.effects.title}
</h4>
<h4 className={styles.panelTitle} data-pane="effects">
{PANELS.effects.title}
@@ -294,6 +321,7 @@ export default function Recreation() {
<div className={styles.panelBody}>
{/* ── Background ── */}
<div className={styles.pane} data-pane="style">
+ <span className={styles.section}>{PANELS.background.title}</span>
<span className={styles.tabs}>
{PANELS.background.tabs.map((tab, i) => (
<span key={tab} className={i === 0 ? styles.tabOn : styles.tab}>
@@ -301,7 +329,6 @@ export default function Recreation() {
</span>
))}
</span>
- <span className={styles.upload}>{PANELS.background.uploadCustom}</span>
<span className={styles.swatches} data-strip="">
{WALLPAPERS.slice(0, WALLPAPER_COUNT_SHOWN).map((n, i) => (
<span
@@ -330,11 +357,29 @@ export default function Recreation() {
/>
</span>
))}
+ {/* The upload is a tile in the grid now, not a button above it. */}
+ <span className={styles.swatchAdd}>+</span>
</span>
+ <Choices
+ label={PANELS.background.motion}
+ options={PANELS.background.motions}
+ pressed={0}
+ />
+ <Slider
+ label={CONTROLS.blurBg.label}
+ display={CONTROLS.blurBg.display}
+ pct={pctOf(CONTROLS.blurBg)}
+ />
</div>
{/* ── Video Effects ── */}
<div className={styles.pane} data-pane="effects">
+ <span className={styles.section}>{PANELS.effects.frame}</span>
+ <Choices
+ label={CONTROLS.shadow.label}
+ options={CONTROLS.shadow.levels.map((l) => l.label)}
+ pressed={levelIndex(CONTROLS.shadow)}
+ />
<span className={`${styles.control} ${styles.controlLive}`}>
<span className={styles.controlHead}>
<span className={styles.controlLabel}>{CONTROLS.padding.label}</span>
@@ -347,22 +392,17 @@ export default function Recreation() {
<span className={`${styles.knob} ${styles.knobPad}`} />
</span>
</span>
- <Toggle label={CONTROLS.blurBg.label} on={CONTROLS.blurBg.on} />
- <Slider
- label={CONTROLS.motionBlur.label}
- display={CONTROLS.motionBlur.display}
- pct={pctOf(CONTROLS.motionBlur)}
- />
- <Slider
- label={CONTROLS.shadow.label}
- display={CONTROLS.shadow.display}
- pct={pctOf(CONTROLS.shadow)}
- />
<Slider
label={CONTROLS.roundness.label}
display={CONTROLS.roundness.display}
pct={pctOf(CONTROLS.roundness)}
/>
+ <span className={styles.section}>{PANELS.effects.motion}</span>
+ <Slider
+ label={CONTROLS.motionBlur.label}
+ display={CONTROLS.motionBlur.display}
+ pct={pctOf(CONTROLS.motionBlur)}
+ />
</div>
{/* ── Cursor ── */}
@@ -371,9 +411,6 @@ export default function Recreation() {
<span className={`${styles.control} ${styles.controlLive}`}>
<span className={styles.controlHead}>
<span className={styles.controlLabel}>{CONTROLS.cursorSize.label}</span>
- <span className={styles.controlValue} ref={sizeValue}>
- {CONTROLS.cursorSize.display}
- </span>
</span>
<span className={styles.track} data-t="sztrk">
<span className={`${styles.trackFill} ${styles.trackFillSize}`} />
@@ -385,6 +422,11 @@ export default function Recreation() {
display={CONTROLS.smoothing.display}
pct={pctOf(CONTROLS.smoothing)}
/>
+ <Choices
+ label={CONTROLS.clickBounce.label}
+ options={CONTROLS.clickBounce.levels.map((l) => l.label)}
+ pressed={levelIndex(CONTROLS.clickBounce)}
+ />
</div>
{/* ── Transcript ── */}
@@ -698,7 +740,16 @@ export default function Recreation() {
className={styles.clip}
style={{ left: x(c.from), width: x(c.to - c.from) }}
>
- <span className={styles.clipWave} />
+ {/* The app's clip card: its own waveform paths, in dark ink on
+ the brand's green. */}
+ <svg
+ className={styles.clipWave}
+ viewBox={WAVEFORM.viewBox}
+ preserveAspectRatio="none"
+ >
+ <path className={styles.clipWaveArea} d={WAVEFORM.area} />
+ <path className={styles.clipWaveLine} d={WAVEFORM.line} />
+ </svg>
</div>
))}
diff --git a/website/src/components/Recreation/scene.ts b/website/src/components/Recreation/scene.ts
index af603c942..2a799c4f1 100644
--- a/website/src/components/Recreation/scene.ts
+++ b/website/src/components/Recreation/scene.ts
@@ -429,7 +429,7 @@ const ease = (v: number) => {
* only the default one, so the recorded pointer wears it for the whole take. */
const BG_PICKS = [2.0, 3.95, 5.8];
-export const WALLPAPER_COUNT_SHOWN = 12;
+export const WALLPAPER_COUNT_SHOWN = 11;
/* ── the frame ────────────────────────────────────────────────────────────── */
@@ -513,7 +513,8 @@ export function frameAt(p: number): Frame {
);
const sizeU = clamp01((t - 12.7) / 0.5);
- const cursorSize = 40 + sizeU * 23.2;
+ // In the app's own units, over SETTING_BOUNDS (1.5–6): a drag from 3 to 5.
+ const cursorSize = 3 + sizeU * 2;
const live = ZOOMS.slice(1).find((z) => t >= z.from && t <= z.to);
const zoomsPlaced = ZOOMS.filter((z) => t >= z.placedAt).length;
diff --git a/website/src/components/Recreation/styles.module.css b/website/src/components/Recreation/styles.module.css
index a377bdd29..af4f0ea88 100644
--- a/website/src/components/Recreation/styles.module.css
+++ b/website/src/components/Recreation/styles.module.css
@@ -84,6 +84,16 @@
--ost-speed-border: #b45309;
--ost-playhead: #6c55ff;
--ost-playhead-glow: rgba(108, 85, 255, 0.68);
+ /* The timeline's candy (design/tokens/v4.css): solid cards in the object's
+ colour with dark ink on them. The clip wears the brand's green, zooms a
+ blue so the two never read as one. Fills, not text, so they keep the app's
+ own values in both themes; only the glow under them changes. */
+ --ost-clip: #10b981;
+ --ost-zoom: #3b82f6;
+ --ost-trim: #f87171;
+ --ost-ramp: #fb923c;
+ --ost-ink: #0b1220;
+ --ost-candy-glow: 35%;
--ost-elev-pop: 0 24px 70px -28px rgba(0, 0, 0, 0.75);
--ost-font-mono: "Geist Mono", ui-monospace, "SF Mono", Menlo, Monaco, Consolas, monospace;
--ease: cubic-bezier(0.2, 0, 0, 1);
@@ -161,6 +171,9 @@
declared once, in the light root, and the dark theme keeps it. */
--ost-playhead: #6c55ff;
--ost-playhead-glow: rgba(108, 85, 255, 0.3);
+ --ost-trim: #ef4444;
+ --ost-ramp: #f97316;
+ --ost-candy-glow: 12%;
--ost-elev-pop: 0 24px 70px -28px rgba(15, 23, 42, 0.28);
--ost-groove: #dfe4ea;
--ost-thumb: #ffffff;
@@ -190,8 +203,8 @@
--fit: 0.88;
--pad-pct: 30;
--frame-scale: 1;
- --size-pct: 66;
- --cur-size: 63.2;
+ --size-pct: 77.78;
+ --cur-size: 5;
--size-u: 1;
--zoom: 1;
--zoom-origin: 52% 58%;
@@ -467,11 +480,11 @@
.tabs {
display: flex;
- gap: 4px;
- padding: 4px;
- margin-bottom: 12px;
- border-radius: 10px;
- background: color-mix(in srgb, var(--ost-surface-2) 60%, transparent);
+ gap: 2px;
+ padding: 3px;
+ margin-bottom: 10px;
+ border-radius: 12px;
+ background: color-mix(in srgb, var(--ost-fg) 6%, transparent);
}
.tab,
@@ -479,42 +492,54 @@
flex: 1;
text-align: center;
padding: 6px 0;
- border-radius: 7px;
+ border-radius: 9px;
font-size: 12px;
font-weight: 500;
color: var(--ost-muted);
}
.tabOn {
- background: var(--ost-accent);
- /* The page's ground, not a literal near-black: the accent under it changes
- with the theme, and a fixed foreground would sit on two different greens.
- Same fix as the site's own primary button. */
- color: var(--ost-bg);
+ /* Raised above its track, as the app draws it: the choice is a surface, and
+ green stays for what is picked in the grid below. */
+ background: var(--ost-surface-2);
+ color: var(--ost-fg);
font-weight: 600;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
}
-.upload {
- display: inline-flex;
- padding: 8px 14px;
- margin-bottom: 12px;
- border: 1.5px dashed var(--ost-border-hi);
- border-radius: 10px;
- font-size: 12px;
+.section {
+ display: block;
+ margin: 2px 0 8px;
+ font-size: 13px;
font-weight: 600;
- color: var(--ost-fg);
+ color: var(--ost-fg-2);
+}
+
+.section ~ .section {
+ margin-top: 12px;
}
.swatches {
display: grid;
- grid-template-columns: repeat(4, 1fr);
- gap: 8px;
+ grid-template-columns: repeat(6, 1fr);
+ gap: 6px;
+ margin-bottom: 4px;
+}
+
+.swatchAdd {
+ display: grid;
+ place-items: center;
+ aspect-ratio: 1;
+ border: 1px dashed var(--ost-border-hi);
+ border-radius: 8px;
+ font-size: 16px;
+ color: var(--ost-muted);
}
.swatch {
position: relative;
aspect-ratio: 1;
- border-radius: 10px;
+ border-radius: 8px;
box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.08);
transition:
box-shadow 0.25s var(--ease),
@@ -526,7 +551,7 @@
width: 100%;
height: 100%;
object-fit: cover;
- border-radius: 10px;
+ border-radius: 8px;
}
/* Selection is a `data-bg` on the stage matched against the swatch's own index.
@@ -538,7 +563,7 @@
content: "";
position: absolute;
inset: -3px;
- border-radius: 13px;
+ border-radius: 11px;
border: 2px solid var(--ost-accent);
opacity: 0;
transition: opacity 0.25s var(--ease);
@@ -554,12 +579,46 @@
/* ── shared controls ── */
.control {
+ /* Free rows, the way the app sets its settings now: label, value and track on
+ the pane itself, grouped by section labels and space, no card around each. */
display: block;
- margin-bottom: 9px;
- padding: 10px 13px 14px;
- border: 1px solid var(--ost-border);
- border-radius: 11px;
- background: color-mix(in srgb, var(--ost-surface-2) 40%, transparent);
+ padding: 9px 0 11px;
+}
+
+/* A row of named choices: the app's ChoiceRow. */
+.field {
+ display: block;
+ padding: 6px 0 8px;
+ font-size: 12.5px;
+}
+
+.choices {
+ display: grid;
+ grid-auto-columns: minmax(0, 1fr);
+ grid-auto-flow: column;
+ gap: 4px;
+ margin-top: 7px;
+}
+
+.choice,
+.choiceOn {
+ display: grid;
+ place-items: center;
+ min-height: 28px;
+ overflow: hidden;
+ border: 1px solid transparent;
+ border-radius: 8px;
+ background: color-mix(in srgb, var(--ost-fg) 6%, transparent);
+ color: var(--ost-muted);
+ font-size: 11.5px;
+ font-weight: 500;
+ white-space: nowrap;
+}
+
+.choiceOn {
+ border-color: var(--ost-accent);
+ background: var(--ost-accent-soft);
+ color: var(--ost-fg);
}
.controlRow {
@@ -567,12 +626,13 @@
align-items: center;
justify-content: space-between;
gap: 12px;
- padding: 11px 13px;
+ padding: 8px 0;
+ font-size: 12.5px;
}
.controlLive {
- border-color: var(--ost-accent);
- border-width: 1.5px;
+ /* The slider being dragged: its knob carries the ring (.knobPad, .knobSize),
+ the row itself stays a free row like the others. */
}
.controlHead {
@@ -587,9 +647,8 @@
}
.controlValue {
- font-family: var(--ost-font-mono);
- font-weight: 600;
- color: var(--ost-accent);
+ font-weight: 500;
+ color: var(--ost-muted);
font-variant-numeric: tabular-nums;
}
@@ -1458,8 +1517,8 @@
8.27:1 over a mid-tone wallpaper. Literals, and deliberately not tokens —
a HUD over footage does not follow the reader's theme. */
background: rgba(8, 10, 13, 0.78);
- border: 1px solid rgba(16, 185, 129, 0.75);
- color: #34d399;
+ border: 1px solid rgba(59, 130, 246, 0.75);
+ color: #60a5fa;
font-family: var(--ost-font-mono);
font-size: 10px;
font-weight: 600;
@@ -1570,21 +1629,34 @@
position: absolute;
top: 150px;
height: 50px;
- border-radius: 10px;
- background: color-mix(in srgb, var(--ost-surface-2) 72%, transparent);
- border: 1px solid var(--ost-border-hi);
- box-shadow: inset 0 1px 8px rgba(255, 255, 255, 0.07);
+ overflow: hidden;
+ border-radius: 12px;
+ border: 1px solid transparent;
+ /* The app's clip card (.tlClip): a solid candy gradient in the brand's green. */
+ background: linear-gradient(180deg, color-mix(in oklab, var(--ost-clip) 78%, white), var(--ost-clip))
+ border-box;
+ box-shadow: 0 3px 10px color-mix(in oklab, var(--ost-clip) var(--ost-candy-glow), transparent);
box-sizing: border-box;
}
.clipWave {
position: absolute;
- left: 13px;
- right: 13px;
- top: 28px;
- height: 9px;
- background: repeating-linear-gradient(90deg, var(--ost-accent) 0 2px, transparent 2px 7px);
- opacity: 0.75;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ width: 100%;
+ height: 70%;
+}
+
+.clipWaveArea {
+ fill: rgb(11 18 32 / 0.16);
+}
+
+.clipWaveLine {
+ fill: none;
+ stroke: rgb(11 18 32 / 0.5);
+ stroke-width: 1.25;
+ vector-effect: non-scaling-stroke;
}
.pillZoom,
@@ -1597,10 +1669,15 @@
align-items: center;
gap: 5px;
padding: 0 8px;
- border-radius: 7px;
+ /* Candy, as .lanePill draws it: a gradient in the lane's colour (--_c), a glow
+ under it, dark ink on every colour. */
+ border-radius: 8px;
+ border: 1px solid transparent;
+ background: linear-gradient(180deg, color-mix(in oklab, var(--_c) 72%, white), var(--_c)) border-box;
+ box-shadow: 0 2px 6px color-mix(in oklab, var(--_c) var(--ost-candy-glow), transparent);
+ color: var(--ost-ink);
overflow: hidden;
- font-family: var(--ost-font-mono);
- font-size: 10.5px;
+ font-size: 11.5px;
font-weight: 600;
white-space: nowrap;
transition:
@@ -1610,9 +1687,7 @@
.pillZoom {
top: 118px;
- background: var(--ost-accent-soft);
- border: 1.5px solid var(--ost-accent);
- color: var(--ost-accent);
+ --_c: var(--ost-zoom);
--on: clamp(0, calc(var(--zooms-placed) - var(--i)), 1);
opacity: var(--on);
transform: translateY(calc((1 - var(--on)) * -8px));
@@ -1620,18 +1695,14 @@
.pillSpeed {
top: 66px;
- background: var(--ost-speed-soft);
- border: 1.5px solid var(--ost-speed-border);
- color: var(--ost-speed);
+ --_c: var(--ost-ramp);
opacity: var(--speed-placed);
transform: translateY(calc((1 - var(--speed-placed)) * -8px));
}
.pillTrim {
top: 92px;
- background: var(--ost-danger-soft);
- border: 1px solid var(--ost-danger);
- color: var(--ost-danger);
+ --_c: var(--ost-trim);
}
/* Each trim's opacity is written straight onto the element by the driver, over