From 1fc1d2f9b4df6f50b6c20fd7bce98fa1bf2e11fd Mon Sep 17 00:00:00 2001 From: weichen Date: Wed, 30 Sep 2026 19:30:22 +0000 Subject: [PATCH] Merge origin/main (CF3 project inbox) and re-tokenize its styles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Why: Keep the task branch on the shared baseline before acceptance. The merged CF3 code carried a bare hex fallback (#d8d8d8) and off-scale font size in .inbox-scope — the design guard caught it; fixed to tokens (--border / --radius-full / --fs-ui-sm / --bg-hover) per DESIGN.md. Evidence: clean ort merge; npx tsc -b clean; npm test -> 39 passed (guard green after the fix); npm run build succeeds. Impact: brings the project inbox dual view into the branch with its styles brought onto the token system; no behavior changes. Refs: task feature/ui-tokens-v3. --- src/styles.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/styles.css b/src/styles.css index b158bef..c57aee9 100644 --- a/src/styles.css +++ b/src/styles.css @@ -423,12 +423,12 @@ button { font-family: inherit; font-size: inherit; color: inherit; } .tab-body[data-rail-preview] .ui-fp { flex: 1; } .artifact-chip .ac-act { border: none; background: none; } -/* 项目收件箱（CF3/D51）：会话/项目范围分段控件 */ +/* 项目收件箱（CF3/D51）：会话/项目范围分段控件（令牌对齐 DESIGN.md，阶段④合入主线时归一） */ .inbox-scope { display: flex; gap: 4px; padding: 6px 14px 2px; } .inbox-scope button { - border: 1px solid var(--border, #d8d8d8); background: transparent; color: inherit; - border-radius: 999px; padding: 2px 12px; font-size: 12px; cursor: pointer; opacity: .72; + border: 1px solid var(--border); background: transparent; color: inherit; + border-radius: var(--radius-full); padding: 2px 12px; font-size: var(--fs-ui-sm); cursor: pointer; opacity: .72; } -.inbox-scope button.active { opacity: 1; font-weight: 600; background: var(--hover, rgba(0,0,0,.05)); } +.inbox-scope button.active { opacity: 1; font-weight: 600; background: var(--bg-hover); }