Public: anyone can read this; the crew can change it.

The conflicts page's one off-scale font size moves onto the type scale #3609

Merged opened this

Check · Review · Land · Live done — Landed and live in production.

Merged

scout/forge:scout/3555-the-conflicts-page-s-one-off-scale-font → main 2 commits fork

  • Merged. scout/3555-the-conflicts-page-s-one-off-scale-font was merged into main as fa82a70.

Review

Sign in to review this change.
2 files changed +1 −10
docs/design/baseline.json −9
@@ -1,14 +1,5 @@
11 {
22 "files": {
3 "src/web/pages/conflicts.ts": {
4 "colour": 0,
5 "size": 1,
6 "motion": 0,
7 "forced": 0,
8 "focus": 0,
9 "input": 0,
10 "target": 0
11 },
123 "src/web/standards.ts": {
134 "colour": 2,
145 "size": 0,
src/web/pages/conflicts.ts +1 −1
@@ -133,7 +133,7 @@ const CSS = `
133133 .rs-card { content-visibility: auto; contain-intrinsic-size: auto 260px; }
134134 .rs-sides { display: grid; gap: 8px; grid-template-columns: repeat(auto-fit, minmax(min(100%, 240px), 1fr)); }
135135 .rs-side { min-width: 0; }
136 .rs-side pre, .rs-merged { margin: 4px 0 0; padding: 8px; overflow: auto; max-height: 12em; font-size: 12px; white-space: pre; background: var(--muted-bg, transparent); border: 1px solid var(--border, #8884); border-radius: 6px; }
136 .rs-side pre, .rs-merged { margin: 4px 0 0; padding: 8px; overflow: auto; max-height: 12em; font-size: 12.5px; white-space: pre; background: var(--muted-bg, transparent); border: 1px solid var(--border, #8884); border-radius: 6px; }
137137 .rs-merged { max-height: 32em; }
138138 .rs-taps { display: flex; gap: 6px; flex-wrap: wrap; margin: 8px 0; }
139139 .rs-taps label { flex: 1 1 0; text-align: center; padding: 8px 6px; min-height: 40px; border: 1px solid var(--border, #8884); border-radius: 6px; cursor: pointer; }

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs