Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

Revert: fix(theme): lower CINDY placeholder contrast

MagicLizi5afa2f45b6f0
diff --git a/apps/desktop/src/renderer/themes/__tests__/cindyDecisionData.ts b/apps/desktop/src/renderer/themes/__tests__/cindyDecisionData.ts
index c1dc3085fd..9ca5f1a017 100644
--- a/apps/desktop/src/renderer/themes/__tests__/cindyDecisionData.ts
+++ b/apps/desktop/src/renderer/themes/__tests__/cindyDecisionData.ts
@@ -282,7 +282,7 @@ export const CINDY_EXPECTED_VALUES: Record<string, { light: string; dark: string
secondary: { light: '60.0 12.8% 92.4%', dark: '0 0% 11.4%' },
'settings-btn-primary-text': { light: '#FCFCFC', dark: '#151515' }, // 2026-08 §9 更新;沿革: E1D
'settings-btn-secondary-hover-bg': { light: '#F6F6F1', dark: '#1D1D1D' },
- 'text-placeholder': { light: '#C4C4C4', dark: '#525252' },
+ 'text-placeholder': { light: '#6B6B67', dark: '#C1C1C1' },
'settings-integration-avatar-bg': { light: '#FDFDF8', dark: '#1D1D1D' },
'settings-logout-bg': { light: '#FDFDF8', dark: '#1F1F1F' },
'settings-menu-bg-hover': { light: '#E8E8E3', dark: '#282828' }, // 2026-08 §9 更新;沿革: 用户改稿 2026-07-21:原值贴着页底(#EDEDED/#2A2828)不可见,light 压暗 / dark 提亮到 ~5-6% 亮度差
diff --git a/apps/desktop/src/renderer/themes/__tests__/fixtures/builtin-theme-overrides.json b/apps/desktop/src/renderer/themes/__tests__/fixtures/builtin-theme-overrides.json
index f4e00baa4d..50284c6f3d 100644
--- a/apps/desktop/src/renderer/themes/__tests__/fixtures/builtin-theme-overrides.json
+++ b/apps/desktop/src/renderer/themes/__tests__/fixtures/builtin-theme-overrides.json
@@ -342,7 +342,7 @@
"secondary": "60.0 12.8% 92.4%",
"settings-btn-primary-text": "#FCFCFC",
"settings-btn-secondary-hover-bg": "#F6F6F1",
- "text-placeholder": "#C4C4C4",
+ "text-placeholder": "#6B6B67",
"settings-integration-avatar-bg": "#FDFDF8",
"settings-logout-bg": "#FDFDF8",
"settings-menu-bg-hover": "#E8E8E3",
@@ -518,7 +518,7 @@
"secondary": "0 0% 11.4%",
"settings-btn-primary-text": "#151515",
"settings-btn-secondary-hover-bg": "#1D1D1D",
- "text-placeholder": "#525252",
+ "text-placeholder": "#C1C1C1",
"settings-integration-avatar-bg": "#1D1D1D",
"settings-logout-bg": "#1F1F1F",
"settings-menu-bg-hover": "#282828",
diff --git a/apps/desktop/src/renderer/themes/builtin/cindy-dark.ts b/apps/desktop/src/renderer/themes/builtin/cindy-dark.ts
index 077df9415c..84ffeec21f 100644
--- a/apps/desktop/src/renderer/themes/builtin/cindy-dark.ts
+++ b/apps/desktop/src/renderer/themes/builtin/cindy-dark.ts
@@ -98,7 +98,7 @@ const GENERATED_OVERRIDES = {
"secondary": "0 0% 11.4%", // hover -> HSL
"settings-btn-primary-text": "#151515", // 反相深字(浅钮上)
"settings-btn-secondary-hover-bg": "#1D1D1D", // hover/chip
- "text-placeholder": "#525252", // 独立占位文字色,与正文/三级信息区分(用户修正,2026-09-16)
+ "text-placeholder": "#C1C1C1", // 三级转中性(等亮度,2026-08-13)
"settings-integration-avatar-bg": "#1D1D1D", // hover/chip
"settings-logout-bg": "#1F1F1F", // 卡片/输入框
"settings-menu-bg-hover": "#282828", // 菜单 hover/提问卡纸片档
diff --git a/apps/desktop/src/renderer/themes/builtin/cindy-light.ts b/apps/desktop/src/renderer/themes/builtin/cindy-light.ts
index 4d4844b3cb..a17c1a5289 100644
--- a/apps/desktop/src/renderer/themes/builtin/cindy-light.ts
+++ b/apps/desktop/src/renderer/themes/builtin/cindy-light.ts
@@ -95,7 +95,7 @@ const GENERATED_OVERRIDES = {
"secondary": "60.0 12.8% 92.4%", // hover -> HSL
"settings-btn-primary-text": "#FCFCFC", // E1D 中性字
"settings-btn-secondary-hover-bg": "#F6F6F1", // 卡片锚定: 设置卡上的次级按钮 hover(2026-08-14)
- "text-placeholder": "#C4C4C4", // 独立占位文字色,与正文/三级信息区分(用户修正,2026-09-16)
+ "text-placeholder": "#6B6B67", // 三级: 等亮度暖化
"settings-integration-avatar-bg": "#FDFDF8", // 直映: 卡片/输入框(留暖近白)
"settings-logout-bg": "#FDFDF8", // 直映: 卡片/输入框(留暖近白)
"settings-menu-bg-hover": "#E8E8E3", // 阶梯: 菜单 hover
diff --git a/docs/design-rules/DESIGN.md b/docs/design-rules/DESIGN.md
index 6ef1dc6e75..eb2a6b5537 100644
--- a/docs/design-rules/DESIGN.md
+++ b/docs/design-rules/DESIGN.md
@@ -296,7 +296,6 @@ input/text
- **Multi-line inputs (textarea) take the 8px inner-control radius — never the pill** (tall frames deform it), whether nested in a container or standing alone in a form (§5 radius scale; single rule, no nesting condition). Implementation: `components/ui/input.tsx` `Textarea`.
- **Existing settings inputs retain their local theme contract** through `SettingsTextInput`, a thin wrapper over `ui/input`. It supplies the historical `settings-input-text`, `settings-input-border`, `settings-input-border-focus`, and `settings-input-placeholder` aliases via `inputClassName`. Their defaults still resolve to Tier-1; explicit local overrides stay local. Generic `Input` keeps the Tier-1 defaults above. Standard error-state border/ring takes precedence over wrapper styles. Do not promote these legacy overrides into global semantic slots or rewrite user theme files. Existing placeholder load-time normalization remains unchanged.
- Placeholders must **read as clearly empty** — Silver (`#a3a3a3`) is too prominent against either Card surface (≈5:1 Dark / ≈2.6:1 Light) and reads as real input; forbidden. **Every input surface's placeholder (chat / ask / settings / plan-action-fb) resolves to `--text-placeholder`** (2026-06 G3, archived in `design-decision-log.md`); non-default themes express their own placeholder color by overriding `text-placeholder`.
- CINDY Light/Dark also use the empty-input hierarchy after the user's 2026-09-16 correction; their placeholder overrides no longer reuse tertiary text colors. See [the decision record](./design-decision-log.md#2026-09-16--settings-placeholder-and-cindy-make-task-list).
**DS-6 form usage (approved 2026-09-08)**: use `FormField` for a real field's label, hint and inline validation error; pass its render-function props to `Input` / `SettingsTextInput`. `required` supplies assistive semantics only, never adds browser validation or changes the business rules. Reserve feedback space on fields that can fail and focus/scroll to the first invalid field; dynamic rows keep stable IDs when siblings are added or removed. Service failures remain Toasts. No new Textarea consumer is required.
diff --git a/docs/design-rules/design-decision-log.md b/docs/design-rules/design-decision-log.md
index 9e764d0fd0..d2bb8068b7 100644
--- a/docs/design-rules/design-decision-log.md
+++ b/docs/design-rules/design-decision-log.md
@@ -732,11 +732,8 @@ BORDER_BG → border-default,TEXT_PRIMARY/SECONDARY/TERTIARY → 对应 text
接管前 globals.css 已明确:默认代码字体使用系统等宽字体(macOS 的 SF Mono 不以该字体名暴露给网页,实际命中 Menlo;Windows 命中 Consolas),CJK 显式回退 PingFang / 微软雅黑。JetBrains Mono 已降级为可选预设、不再是默认。DS-8 将这条依据保存在 reference/foundations.json 的 app-font-code-default.$description,字体家族、顺序和用户选字体逻辑均不变。DESIGN.md §3 的 JetBrains Mono 排版样本是历史设计样本,不能据此把默认代码字体改回 JetBrains Mono;当前默认来源为该 DTCG token,运行期字体选择仍由原适配器负责。
-## 2026-09-16 · Settings placeholder and Cindy Make task list
+## 2026-09-16 · Cindy Make task list
-- 用户指出设置中的 placeholder 看起来与普通文字相同,要求降低其显著程度。CINDY Light/Dark
- 的 `text-placeholder` 改为沿用 DESIGN §4 的空输入色阶(Light `#C4C4C4` / Dark `#525252`),
- 不再复用三级文字;修改 DTCG 正本并生成内置主题,同时更新独立预期。其它文字色阶不变。
- 用户要求多个未完成制作可容纳、可重新打开,归档可恢复,完成与放弃后清理。Settings 采用
搜索+列表/详情双栏,560px 以下改为上下布局;只显示当前选中项详情,列表与详情内容
分别滚动,底部操作不随长需求滚出。全部表面、边框、文字与焦点使用语义 token,按钮复用
diff --git a/packages/design-tokens/src/reference/themes.json b/packages/design-tokens/src/reference/themes.json
index 5e22b5aba7..ee934877a2 100644
--- a/packages/design-tokens/src/reference/themes.json
+++ b/packages/design-tokens/src/reference/themes.json
@@ -2117,9 +2117,9 @@
"$value": {
"colorSpace": "srgb",
"components": [
- 0.321569,
- 0.321569,
- 0.321569
+ 0.756863,
+ 0.756863,
+ 0.756863
]
},
"$extensions": {
@@ -5123,9 +5123,9 @@
"$value": {
"colorSpace": "srgb",
"components": [
- 0.768627,
- 0.768627,
- 0.768627
+ 0.419608,
+ 0.419608,
+ 0.403922
]
},
"$extensions": {
diff --git a/packages/design-tokens/src/themes/builtin.json b/packages/design-tokens/src/themes/builtin.json
index b3eccb486e..5a7a911173 100644
--- a/packages/design-tokens/src/themes/builtin.json
+++ b/packages/design-tokens/src/themes/builtin.json
@@ -863,7 +863,7 @@
"text-placeholder": {
"$type": "color",
"$value": "{reference.themes.cindy-dark.value-text-placeholder}",
- "$description": "独立占位文字色,与正文/三级信息区分(用户修正,2026-09-16)"
+ "$description": "三级转中性(等亮度,2026-08-13)"
},
"settings-integration-avatar-bg": {
"$type": "color",
@@ -1676,7 +1676,7 @@
"text-placeholder": {
"$type": "color",
"$value": "{reference.themes.cindy-light.value-text-placeholder}",
- "$description": "独立占位文字色,与正文/三级信息区分(用户修正,2026-09-16)"
+ "$description": "三级: 等亮度暖化"
},
"settings-integration-avatar-bg": {
"$type": "color",