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。

fix(desktop): 保留退役的登录 token ID,并在加载期迁移旧本地主题的登录色

kirozeng4a6147b21e8e
diff --git a/apps/desktop/src/renderer/__tests__/localThemesNormalize.test.ts b/apps/desktop/src/renderer/__tests__/localThemesNormalize.test.ts
index 6a49d6481f..18d45eb044 100644
--- a/apps/desktop/src/renderer/__tests__/localThemesNormalize.test.ts
+++ b/apps/desktop/src/renderer/__tests__/localThemesNormalize.test.ts
@@ -174,4 +174,25 @@ describe('normalizeLocalThemeColors', () => {
expect(out['switch-track-off']).toBe('#555555');
expect(out['switch-thumb-off']).toBe('#000000');
});
+
+ describe('升级前导出的 login-* 默认值(2026-10-27 并入墨水口径)', () => {
+ it('丢弃等于旧默认值的 override,让新默认值生效;用户改过的值与非登录色原样保留', () => {
+ const out = normalizeLocalThemeColors({
+ surface: '#111111',
+ 'login-panel-bg': '#fbfbfb', // 旧亮色面板(大小写不敏感)
+ 'login-primary-button-bg': '#2A2828', // 旧亮色主按钮
+ 'login-disabled-button-bg': '#2A2828', // 旧禁用底,与旧主按钮同色
+ 'login-disabled-button-overlay': 'rgba(255, 255, 255, 0.7)',
+ 'login-control-bg': '#123456', // 用户自己改过
+ });
+ expect(out).toEqual({ surface: '#111111', 'login-control-bg': '#123456' });
+ });
+
+ it('幂等,且没有可迁移项时返回同一个对象', () => {
+ const colors = { surface: '#111111', 'login-control-bg': '#123456' };
+ expect(normalizeLocalThemeColors(colors)).toBe(colors);
+ const once = normalizeLocalThemeColors({ 'login-panel-bg': '#FBFBFB', surface: '#111111' });
+ expect(normalizeLocalThemeColors(once)).toEqual(once);
+ });
+ });
});
diff --git a/apps/desktop/src/renderer/themes/__tests__/fixtures/desktop-color-defaults.json b/apps/desktop/src/renderer/themes/__tests__/fixtures/desktop-color-defaults.json
index ecb3364cce..80bd613c78 100644
--- a/apps/desktop/src/renderer/themes/__tests__/fixtures/desktop-color-defaults.json
+++ b/apps/desktop/src/renderer/themes/__tests__/fixtures/desktop-color-defaults.json
@@ -1,6 +1,6 @@
{
"source": "apps/desktop/src/renderer/themes/colors.ts",
- "count": 569,
+ "count": 570,
"colors": [
{
"id": "surface",
@@ -767,6 +767,11 @@
"light": "#FCFCFC",
"dark": "#151515"
},
+ {
+ "id": "login-disabled-button-overlay",
+ "light": "rgba(0, 0, 0, 0.00)",
+ "dark": "rgba(255, 255, 255, 0.00)"
+ },
{
"id": "login-disabled-button-bg",
"light": "rgba(0, 0, 0, 0.05)",
diff --git a/apps/desktop/src/renderer/themes/__tests__/generatedEffortInitialization.test.ts b/apps/desktop/src/renderer/themes/__tests__/generatedEffortInitialization.test.ts
index 690f89d971..f31cf220e5 100644
--- a/apps/desktop/src/renderer/themes/__tests__/generatedEffortInitialization.test.ts
+++ b/apps/desktop/src/renderer/themes/__tests__/generatedEffortInitialization.test.ts
@@ -13,7 +13,7 @@ describe('generated effort inputs initialize without DOM or circular imports', (
await import('../colors');
await import('../effortTierColors');
expect(colorRegistry.getColors()).toEqual(first);
- expect(first.length).toBe(569);
+ expect(first.length).toBe(570);
expect(first[0].id).toBe('surface');
expect(effort.effortTierColor('high')).toBe('#3B82F6');
expect(effort.effortTierColor('unknown')).toBe('#14B8A6');
diff --git a/apps/desktop/src/renderer/themes/colors.ts b/apps/desktop/src/renderer/themes/colors.ts
index b08d7f0670..8e88c58a6f 100644
--- a/apps/desktop/src/renderer/themes/colors.ts
+++ b/apps/desktop/src/renderer/themes/colors.ts
@@ -561,6 +561,10 @@ const GENERATED_DEFAULTS = {
"light": "#FCFCFC",
"dark": "#151515"
},
+ "login-disabled-button-overlay": {
+ "light": "rgba(0, 0, 0, 0.00)",
+ "dark": "rgba(255, 255, 255, 0.00)"
+ },
"login-disabled-button-bg": {
"light": "rgba(0, 0, 0, 0.05)",
"dark": "rgba(255, 255, 255, 0.06)"
@@ -2498,6 +2502,9 @@ registerColor('login-secondary-text', GENERATED_DEFAULTS["login-secondary-text"]
registerColor('login-primary-button-bg', GENERATED_DEFAULTS["login-primary-button-bg"], 'Login — 主按钮/第三方圆钮底(同主界面反相 CTA accent-cta-bg-pure:#3C3F43 / #EEEEEE;社交圆图标保品牌色)');
registerColor('login-primary-button-border', GENERATED_DEFAULTS["login-primary-button-border"], 'Login — 主按钮/圆钮描边(与底同色,同主界面 CTA 不另描边)');
registerColor('login-primary-button-text', GENERATED_DEFAULTS["login-primary-button-text"], 'Login — 主按钮文字(同主界面 accent-pure-cta-fg:#FCFCFC / #151515)');
+// 已退役(2026-10-27):禁用主按钮改为控件底 + 占位字,不再叠层。治理合同 §4:旧 Token ID 不删除——
+// 旧版「导出当前主题」已把它写进用户本地主题,保留 ID 与透明默认值,组件不再消费。
+registerColor('login-disabled-button-overlay', GENERATED_DEFAULTS["login-disabled-button-overlay"], 'Login — 已退役的禁用叠层(透明,仅为兼容旧本地主题保留 ID;组件不再消费)');
registerColor('login-disabled-button-bg', GENERATED_DEFAULTS["login-disabled-button-bg"], 'Login — disabled 主按钮底(墨水填充 黑 5% / 白 6%,与输入框同档)');
registerColor('login-disabled-button-text', GENERATED_DEFAULTS["login-disabled-button-text"], 'Login — disabled 主按钮文字(墨水占位档 黑 32% / 白 30%)');
registerColor('login-inverted-button-border', GENERATED_DEFAULTS["login-inverted-button-border"], 'Login — 浅底钮白描边/区域徽标白字(两模式同值 #FFFFFF;推导,待 Figma 精确)');
diff --git a/apps/desktop/src/renderer/themes/local-themes-normalize.ts b/apps/desktop/src/renderer/themes/local-themes-normalize.ts
index ce69fe5c7f..b652e3d2d2 100644
--- a/apps/desktop/src/renderer/themes/local-themes-normalize.ts
+++ b/apps/desktop/src/renderer/themes/local-themes-normalize.ts
@@ -19,6 +19,7 @@
import { parseCssColor, toHex, type Rgb } from '../../shared/theme-import/color';
import { deriveUncheckedSwitchTrack } from '../../shared/theme-import/palette';
import { colorRegistry } from './color-registry';
+import { dropLegacyLoginDefaults } from './loginLegacyDefaults';
/** 旧的 per-surface placeholder alias —— 归一化后由 `--text-placeholder` slot 统一接管。 */
const PER_SURFACE_PLACEHOLDER_KEYS = [
@@ -148,5 +149,5 @@ export function normalizeLocalThemeColors(
}
}
- return normalizeUncheckedSwitchColors(normalized);
+ return dropLegacyLoginDefaults(normalizeUncheckedSwitchColors(normalized));
}
diff --git a/apps/desktop/src/renderer/themes/loginLegacyDefaults.json b/apps/desktop/src/renderer/themes/loginLegacyDefaults.json
new file mode 100644
index 0000000000..16016a0edc
--- /dev/null
+++ b/apps/desktop/src/renderer/themes/loginLegacyDefaults.json
@@ -0,0 +1,177 @@
+{
+ "_说明": "升级前(2026-10-27 之前)的 login-* 默认值 [light, dark]。用于 local-themes-normalize 在加载期识别旧版「导出当前主题」写进本地主题的过期 override。历史快照,不要随主题数值更新而改动;只含 2026-10-27 并入墨水口径时改值的 token。",
+ "defaults": {
+ "login-panel-border": [
+ "#D4D4D4",
+ "#434343"
+ ],
+ "login-link-pressed": [
+ "#1A1818",
+ "#C0BEBE"
+ ],
+ "login-callback-card-bg": [
+ "#FBFBFB",
+ "#312F2F"
+ ],
+ "login-callback-card-border": [
+ "#D4D4D4",
+ "#434343"
+ ],
+ "login-callback-cta-bg": [
+ "#2A2828",
+ "#EEEEEE"
+ ],
+ "login-callback-cta-border": [
+ "#434343",
+ "#FFFFFF"
+ ],
+ "login-callback-cta-text": [
+ "#D4D4D4",
+ "#2A2828"
+ ],
+ "login-panel-bg": [
+ "#FBFBFB",
+ "#312F2F"
+ ],
+ "login-control-bg": [
+ "#EEEEEE",
+ "#2C2A2A"
+ ],
+ "login-action-control-bg": [
+ "#EEEEEE",
+ "#2A2828"
+ ],
+ "login-back-border": [
+ "#FFFFFF",
+ "#434343"
+ ],
+ "login-control-border": [
+ "#D4D4D4",
+ "#434343"
+ ],
+ "login-control-border-active": [
+ "#2A2828",
+ "#EEEEEE"
+ ],
+ "login-control-border-disabled": [
+ "#B4B4B4",
+ "#B4B4B4"
+ ],
+ "login-primary-button-bg": [
+ "#2A2828",
+ "#EEEEEE"
+ ],
+ "login-primary-button-border": [
+ "#434343",
+ "#FFFFFF"
+ ],
+ "login-primary-button-text": [
+ "#D4D4D4",
+ "#2A2828"
+ ],
+ "login-disabled-button-overlay": [
+ "rgba(255, 255, 255, 0.7)",
+ "rgba(255, 255, 255, 0.7)"
+ ],
+ "login-disabled-button-bg": [
+ "#2A2828",
+ "#2A2828"
+ ],
+ "login-disabled-button-text": [
+ "#D4D4D4",
+ "#D4D4D4"
+ ],
+ "login-link-text": [
+ "#2A2828",
+ "#EEEEEE"
+ ],
+ "login-link-hover": [
+ "#4A4848",
+ "#A8A8A8"
+ ],
+ "login-deletion-bubble-bg": [
+ "#FFFFFF",
+ "#1F1F1E"
+ ],
+ "login-deletion-bubble-border": [
+ "#D7D7D4",
+ "#3C3C3A"
+ ],
+ "login-splash-progress-track": [
+ "#D9D9D9",
+ "#434343"
+ ],
+ "login-splash-progress-fill": [
+ "#252222",
+ "#D4D4D4"
+ ],
+ "login-overlay-button-hover": [
+ "rgba(255, 255, 255, 0.08)",
+ "rgba(0, 0, 0, 0.05)"
+ ],
+ "login-overlay-button-pressed": [
+ "rgba(0, 0, 0, 0.5)",
+ "rgba(0, 0, 0, 0.1)"
+ ],
+ "login-overlay-back-hover": [
+ "rgba(255, 255, 255, 0.7)",
+ "rgba(255, 255, 255, 0.08)"
+ ],
+ "login-overlay-back-pressed": [
+ "rgba(0, 0, 0, 0.08)",
+ "rgba(0, 0, 0, 0.08)"
+ ],
+ "login-overlay-row-hover": [
+ "rgba(255, 255, 255, 0.08)",
+ "rgba(255, 255, 255, 0.08)"
+ ],
+ "login-overlay-row-pressed": [
+ "rgba(0, 0, 0, 0.08)",
+ "rgba(0, 0, 0, 0.08)"
+ ],
+ "login-overlay-input-hover": [
+ "rgba(0, 0, 0, 0.05)",
+ "rgba(255, 255, 255, 0.05)"
+ ],
+ "login-loading-ring-track": [
+ "rgba(42, 40, 40, 0.18)",
+ "rgba(212, 212, 212, 0.18)"
+ ],
+ "login-consent-radio-bg": [
+ "#F1F0F1",
+ "#2A2828"
+ ],
+ "login-consent-radio-border": [
+ "#434343",
+ "#F1F0F1"
+ ],
+ "login-consent-radio-checked-bg": [
+ "#2A2828",
+ "#F1F0F1"
+ ],
+ "login-consent-radio-check": [
+ "#FFFFFF",
+ "#2A2828"
+ ],
+ "login-secondary-button-bg": [
+ "#EEEEEE",
+ "#434141"
+ ],
+ "login-secondary-button-border": [
+ "#FFFFFF",
+ "#565454"
+ ],
+ "login-secondary-button-text": [
+ "#2A2828",
+ "#EEEEEE"
+ ],
+ "login-overlay-secondary-hover": [
+ "rgba(255, 255, 255, 0.1)",
+ "rgba(255, 255, 255, 0.08)"
+ ],
+ "login-overlay-secondary-pressed": [
+ "rgba(0, 0, 0, 0.1)",
+ "rgba(0, 0, 0, 0.2)"
+ ]
+ }
+}
diff --git a/apps/desktop/src/renderer/themes/loginLegacyDefaults.ts b/apps/desktop/src/renderer/themes/loginLegacyDefaults.ts
new file mode 100644
index 0000000000..10ae57c2e8
--- /dev/null
+++ b/apps/desktop/src/renderer/themes/loginLegacyDefaults.ts
@@ -0,0 +1,23 @@
+import legacy from './loginLegacyDefaults.json';
+
+/**
+ * 旧版「导出当前主题」会把当时所有注册色(含 `login-*`)写进本地主题,加载时本地值优先于新默认值,
+ * 升级后这些副本的登录页会继续显示旧色(禁用主按钮甚至与可用态几乎相同)。
+ *
+ * 本函数在加载期把「恰好等于升级前默认值」的 `login-*` override 丢掉,让新默认值生效;用户改过的值
+ * 不在对照表内,原样保留。对照表见 `loginLegacyDefaults.json`(历史快照)。只改内存、不改写磁盘、
+ * 幂等,没有可迁移项时返回原对象(治理合同 §4)。
+ */
+const LEGACY_LOGIN_DEFAULTS: Readonly<Record<string, readonly string[]>> = legacy.defaults;
+
+export function dropLegacyLoginDefaults(colors: Record<string, string>): Record<string, string> {
+ let next: Record<string, string> | null = null;
+ for (const [id, value] of Object.entries(colors)) {
+ const old = LEGACY_LOGIN_DEFAULTS[id];
+ if (old?.some((v) => v.toLowerCase() === value.trim().toLowerCase())) {
+ next ??= { ...colors };
+ delete next[id];
+ }
+ }
+ return next ?? colors;
+}
diff --git a/docs/design-rules/DESIGN.md b/docs/design-rules/DESIGN.md
index 4b9d3a44bf..67c277a628 100644
--- a/docs/design-rules/DESIGN.md
+++ b/docs/design-rules/DESIGN.md
@@ -1985,7 +1985,7 @@ The execution rulebook for subsequent desktop / mobile UI updates. Sources: the
- **Fills and lines (user ruling 2026-10-22, replaces dual anchoring)**: hover, chip, selected and pressed fills and all borders and dividers are the same ink at low alpha — soft hover 3.5% / 4%, hover and chip 5% / 6%, selected and pressed 8% / 10%, weak tier (file chip, scrollbar hover) 10% / 13%, borders and dividers 8% / 10% (Light black / Dark white). A translucent fill shifts whatever plane it sits on — page, card, popover, glass or wallpaper — by the same step, so page- and card-anchored variants are no longer needed, and in Dark a chip is always lighter than the card beneath it. Borders read softer on wallpaper than the former solid lines; this was accepted with the ruling. A line or fill that sits over a transparent window region (the layout dividers between panes under glass) is laid on the page color first, so the native window material never shows through. The Light switch off-track darkens to `#808080` so it keeps 3:1 on hovered rows. Values: token-decision-table §9.2–§9.3.
- **Icons on ink**: icons take their tier through `currentColor`, so an icon drawn from several strokes would turn darker (Light) or brighter (Dark) wherever its strokes overlap. In the CINDY family `globals.css` composites each icon as one shape — strokes drawn opaque, the whole icon masked to the ink's alpha — so it reads like a solid icon at reduced opacity; opaque icon colors are unchanged. Lucide icons get this automatically; a hand-drawn single-color icon made of several strokes adds `data-ink-icon`. Don't add it to an SVG whose parts carry their own colors: the mask would fade those parts too.
- **Twin sync**: every color carried in both hex/rgba and HSL forms (24 pairs) must stay value-identical, translucent tiers included (same alpha in both forms). Pairs follow the tier, not the token name: `text-tertiary-hsl` / `muted-foreground` serve the secondary tier (`text-secondary`), exactly as in Classic. Control outlines such as `chat-input-border-focus` keep their own values and are no longer derived from a text tier.
-- **Exempt families untouched**: `login-*` (59 tokens; since 2026-10-23 its text tokens, and since 2026-10-27 its panel, control, border, primary-button and hover/pressed tokens, take the same values as the CINDY skin, §16.1, but stay protected from theme overrides), `diff-*`, `error-*`, `overlay-*`, semantic status colors, shadows — per §10/§16 and `protected-tokens.ts`.
+- **Exempt families untouched**: `login-*` (60 tokens; since 2026-10-23 its text tokens, and since 2026-10-27 its panel, control, border, primary-button and hover/pressed tokens, take the same values as the CINDY skin, §16.1, but stay protected from theme overrides), `diff-*`, `error-*`, `overlay-*`, semantic status colors, shadows — per §10/§16 and `protected-tokens.ts`.
- User-tuned one-offs: dark sidebar glass `rgba(5,5,5,0.85)` (2026-08-11); light sidebar glass 85% opacity (2026-08-17, aligned with dark).
### 15.17 Switch color and motion (owner decisions 2026-09-15 / 2026-09-16)
@@ -2054,6 +2054,7 @@ and media position (`ui/media-scrubber`, seconds in/out). Native media controls
| `--login-link-text`(重发链接) | `rgba(0, 0, 0, 0.88)` | `rgba(255, 255, 255, 0.82)` | 墨水正文档 黑 88% / 白 82% |
| `--login-link-hover` | `rgba(0, 0, 0, 0.70)` | `rgba(255, 255, 255, 0.66)` | 墨水说明档 黑 70% / 白 66% |
| `--login-link-pressed` | `rgba(0, 0, 0, 0.95)` | `rgba(255, 255, 255, 1.00)` | 墨水强调档 黑 95% / 白 100% |
+| `--login-disabled-button-overlay`(已退役) | `rgba(0, 0, 0, 0.00)` | `rgba(255, 255, 255, 0.00)` | 已退役(2026-10-27):禁用主按钮改为控件底 + 占位字,不再叠层;ID 与透明默认值保留,仅为兼容旧版导出的本地主题,组件不再消费 |
| `--login-splash-progress-track` / `--login-splash-progress-fill` | `rgba(0, 0, 0, 0.10)` / `rgba(0, 0, 0, 0.88)` | `rgba(255, 255, 255, 0.13)` / `rgba(255, 255, 255, 0.82)` | 轨 = 墨水弱档 黑 10% / 白 13%;填充 = 墨水正文档 |
| `--login-loading-ring-track`(loading 环轨道) | `rgba(0, 0, 0, 0.10)` | `rgba(255, 255, 255, 0.13)` | 墨水弱档 黑 10% / 白 13%;登录页 LoginLoadingRing 与 Splash 转圈环共用(Splash 侧自暗色实现 PR 起由字面 rgba 收敛至本 token) |
| `--login-error-fg` | `#D91F37` | `#D91F37` | 语义豁免不变 |
@@ -2268,7 +2269,8 @@ and media position (`ui/media-scrubber`, seconds in/out). Native media controls
- **墨水填充控件**(输入框、方式行、返回钮、协议弹窗「不同意」钮):叠同色墨水加深一档——hover 叠黑 3% / 白 4%,与控件底合成约等于主界面「选中」档 8% / 10%;pressed 叠黑 5% / 白 7%,合成约等于「弱」档 10% / 13%。亮色变深、深色变亮,与主界面菜单 / 列表反馈同向。
- **反相主按钮与第三方圆钮**(主按钮、「同意」钮、Google / WeChat / SSO 圆钮、回调页 CTA):叠黑——亮色 hover 20% / pressed 40%(`#3C3F43` → 约 `#303236`,对齐主界面 `accent-hover` `#2E3237`),深色 hover 5% / pressed 10%(`#EEEEEE` → `#E2E2E2` / `#D6D6D6`)。
- **Apple 圆钮**底色由 Apple 规范决定(亮黑 / 暗白),亮色黑圆叠黑没有反馈,故单独走 `--login-overlay-apple-*`:亮色叠白 8% / 14%,深色叠黑 5% / 10%。
- - **disabled**:主按钮禁用 = 墨水填充 + 占位档文字,描边透明、不叠层;原「深底叠白 70%」及 `--login-disabled-button-overlay` 已退役。
+ - **disabled**:主按钮禁用 = 墨水填充 + 占位档文字,描边透明、不叠层;原「深底叠白 70%」退役;`--login-disabled-button-overlay` 保留 ID 与透明默认值(治理合同 §4:旧 Token ID 不删除),组件不再消费。
+ - **旧本地主题**:升级前「导出当前主题」生成的本地副本带着当时的 `login-*` 值,加载时优先于新默认值。`local-themes-normalize` 在**加载期**把「恰好等于升级前默认值」的 `login-*` override 丢掉(对照表 `themes/loginLegacyDefaults.json`,只改内存、不改写磁盘、幂等),用户改过的值保留;这样旧副本的登录页也走新口径,禁用主按钮不会与可用态几乎相同。
- **回调页**(`oauthResultPage`,系统浏览器打开,拿不到 renderer token,用内联常量):页面底、卡片、描边与 CTA 同上取值,CTA 叠层改挂 `background-image`,不压文字。
2. **`--login-bg-base` 前提变更**:画布底原为「跨主题恒定白 `#EDEDED`」,深色为 `#1F1F1E`(figma 532:585 帧实测)——即 `--login-*` 从「跨主题恒定」改为「随 light / dark 二态」(见 §16.2)。〔2026-10-01〕两态改为与 CINDY 皮肤页底同值 `#F2F2ED` / `#181818`,登录前后背景不再变色;仍为固定值,不随扩展主题。
3. **`LoginBrandStage` 资产按模式切**:深色画布用**登录专用**白字版字标 / slogan 资产(`assets/login/wordmark-dark*.png` / `slogan-dark*.png`,源自 figma 532:585 `CINDY_Standard_White` 与 SLOGAN `#FBFBFB`,已随暗色实现 PR 新增;**不是** §15.7 的新页横版 `cindy-logo-dark.png`——落位与尺寸不同);立绘两模式同资产。
diff --git a/docs/design-rules/cindy-design-system.md b/docs/design-rules/cindy-design-system.md
index cae967e66f..5c5b3d90c9 100644
--- a/docs/design-rules/cindy-design-system.md
+++ b/docs/design-rules/cindy-design-system.md
@@ -53,7 +53,7 @@ DS-11 按2026-09-15用户复核意见修订,Cindy亮暗逐项对照与未验
## 版本记录
-- **2026-10-27(登录页面板、控件与主按钮并入墨水口径)**:`DESIGN.md §16.1 / §16.5` 改写——登录面板、控件、描边、主按钮与 hover / pressed 取 CINDY 主界面对应角色(`loginInkLadder.test.ts` 逐项守护),2026-07-24 Figma 按钮状态矩阵与禁用叠层退役;新增 `pnpm ui:check --page login-skin` 截图场景。详见 `design-decision-log.md` 10-27。
+- **2026-10-27(登录页面板、控件与主按钮并入墨水口径)**:`DESIGN.md §16.1 / §16.5` 改写——登录面板、控件、描边、主按钮与 hover / pressed 取 CINDY 主界面对应角色(`loginInkLadder.test.ts` 逐项守护),2026-07-24 Figma 按钮状态矩阵与禁用叠层退役(ID 保留);新增 `pnpm ui:check --page login-skin` 截图场景。详见 `design-decision-log.md` 10-27。
- **2026-10-23(登录页文字并入墨水阶梯;移除 Figma 组件读取记录)**:`DESIGN.md §16` 改为登录域唯一现行规则来源,登录文字 token 与主界面墨水档同值(`loginInkLadder.test.ts` 守护);`figma-component-spec.md` 移除,按钮族状态矩阵迁入 §16.5。详见 `design-decision-log.md` 10-23。
- **2026-09-27(Mobile 文字规范:字色 / 字号 / 字重 / 行高按角色收拢)**:`apps/mobile/docs/mobile-design-guide.md §3` 新增「文字规范速查」一张表作为 Mobile 文字规则正本(角色 → 字号 / 行高 / 字重 / 字色 + 四条硬规则 + 登记例外 + 机器拦截边界);根 `AGENTS.md`、`DESIGN.md` Mobile 节与本索引「新贡献者」第 9 步指向该表;`typographyTokenDiscipline.test.ts` 新增「必须配行高」「浅色字不配粗字重」两条守护。裁决过程见 [`design-decision-log.md`](./design-decision-log.md) 09-26 / 09-27 各条。
diff --git a/docs/design-rules/design-decision-log.md b/docs/design-rules/design-decision-log.md
index f16f466b80..635b6061e3 100644
--- a/docs/design-rules/design-decision-log.md
+++ b/docs/design-rules/design-decision-log.md
@@ -12,7 +12,7 @@
## 2026-10
-- **10-27 登录页面板、控件、描边、主按钮与悬停/按下并入墨水口径**——用户先看了亮 / 深两套「现在 vs 方案」对比稿,深色面板在 A(`#1F1F1F`,主界面卡片档)与 B(`#272727`,输入框档)之间选了 A,其余按方案执行。被取代:登录页自有的「墨黑–米白反色」实色(面板 `#FBFBFB` / `#312F2F`、控件 `#EEEEEE` / `#2C2A2A`、主按钮 `#2A2828` / `#EEEEEE`、暖灰描边与白边)、2026-07-24 Figma「全按钮族 hover 叠白」口径及其状态矩阵、禁用钮「深底叠白 70%」。现行:面板 = 主界面卡片面,控件 = 墨水填充,描边 = 墨水线,主按钮 = 主界面反相 CTA(亮色因此由暖黑变为 `#3C3F43`),填充控件悬停 / 按下叠同色墨水加深一档,反相按钮叠黑;Apple 圆钮另设 `login-overlay-apple-*`;禁用主按钮 = 墨水填充 + 占位字,`login-disabled-button-overlay` 退役(不沿用主界面 Button 的 60% 透明度,因首屏主按钮默认禁用)。反相按钮按下叠黑亮色取 40%(用户看实图后要求比悬停明显更深)。浏览器回调页内联常量同步。`login-*` 仍是独立 token 族,不跟随扩展主题;Mobile 登录皮暂不改。落点:`DESIGN.md §16.1 / §16.5`、`loginInkLadder.test.ts`、`desktop-color-defaults.json`。
+- **10-27 登录页面板、控件、描边、主按钮与悬停/按下并入墨水口径**——用户先看了亮 / 深两套「现在 vs 方案」对比稿,深色面板在 A(`#1F1F1F`,主界面卡片档)与 B(`#272727`,输入框档)之间选了 A,其余按方案执行。被取代:登录页自有的「墨黑–米白反色」实色(面板 `#FBFBFB` / `#312F2F`、控件 `#EEEEEE` / `#2C2A2A`、主按钮 `#2A2828` / `#EEEEEE`、暖灰描边与白边)、2026-07-24 Figma「全按钮族 hover 叠白」口径及其状态矩阵、禁用钮「深底叠白 70%」。现行:面板 = 主界面卡片面,控件 = 墨水填充,描边 = 墨水线,主按钮 = 主界面反相 CTA(亮色因此由暖黑变为 `#3C3F43`),填充控件悬停 / 按下叠同色墨水加深一档,反相按钮叠黑;Apple 圆钮另设 `login-overlay-apple-*`;禁用主按钮 = 墨水填充 + 占位字,`login-disabled-button-overlay` 退役(ID 按治理合同 §4 保留);旧版导出的本地主题里等于升级前默认值的 `login-*` override 在加载期丢弃(`loginLegacyDefaults.json`)(不沿用主界面 Button 的 60% 透明度,因首屏主按钮默认禁用)。反相按钮按下叠黑亮色取 40%(用户看实图后要求比悬停明显更深)。浏览器回调页内联常量同步。`login-*` 仍是独立 token 族,不跟随扩展主题;Mobile 登录皮暂不改。落点:`DESIGN.md §16.1 / §16.5`、`loginInkLadder.test.ts`、`desktop-color-defaults.json`。
- **10-26 滚动截图沿用截图流程,不新增独立面板**——用户指出缩小预览/保存面板割裂体验。滚动时保留原选区,在选区外预览拼接结果并提供编辑、保存、取消、完成;完成复制并关闭,编辑回原标注器。预览缩放不得降低导出尺寸。落点:`DESIGN.md §4`、`RegionScreenshotOverlay`、`ScrollCaptureOverlay`。
diff --git a/docs/design-rules/token-decision-table.md b/docs/design-rules/token-decision-table.md
index a07196fd65..cbf3275016 100644
--- a/docs/design-rules/token-decision-table.md
+++ b/docs/design-rules/token-decision-table.md
@@ -47,7 +47,7 @@
| `#d91f37` | 错误原因文字 | 复用现有名并改默认 / override | `login-error-text` / existing component alias | 建议把旧 `login-error-text` 从 `error-flat(#ef4444)` 调整为 `#d91f37`,HSL `352.3 75% 48.6%` | 全主题保持;错误色是登录设计稿专用,不应和通用 destructive 混同 |
| `#b4b4b4` | disabled 按钮边框 | 新增 | `login-control-border-disabled` / component alias | `#b4b4b4`,HSL `0 0% 70.6%` | 全主题保持 |
| `#4a4848` | Text_link hover(仅桌面) | 新增 | `login-link-hover` / component alias | `#4a4848`,light/dark 同值 | 全主题保持(豁免族);来源 figma §4.7 wave3 实测 `358:792`;〔lead 裁决 2026-07-20:决策表快照(2026-07-19)滞后于 wave3 追加,属表滞后修订非表外发明,与 U-9 pressed 同族同性质〕 |
-| `rgba(255,255,255,0.7)` | disabled 按钮叠层(2026-10-27 随禁用态改写退役) | 新增 | `login-disabled-button-overlay` / component alias singleton | light/dark 均 `rgba(255,255,255,0.7)` | 全主题保持;不要硬写在组件里 |
+| `rgba(255,255,255,0.7)` | disabled 按钮叠层(2026-10-27 随禁用态改写退役,ID 保留、组件不再消费) | 新增 | `login-disabled-button-overlay` / component alias singleton | light/dark 均 `rgba(255,255,255,0.7)` | 全主题保持;不要硬写在组件里 |
| `#c5c5c5` | Figma canvas / 工作区灰底 | 语义豁免,不进产品 UI | 无 | 无 | 不进实现 |
| `#fefefe` / `#f1f2f3` | 浏览器 shell 顶部模拟控件 | 语义豁免或资源内色 | 无或 `login-browser-chrome-*` 后续再加 | 当前仅浏览器 mock shell,生产系统浏览器不可控 | 不需要 app token |
| `#ededed`, `#f8f8f8`, `#dcdfe3`, `#3c3f43`, `#9a9da3`, `#bfc1c4`, `#d8d9db`, `#504f4f`, `#3b3a3a` | CINDY Light / Dark 主题基础色,不是登录帧直接结构色 | 复用现有 Cindy theme overrides | semantic slots:`surface`、`surface-elevated`、`border-default`、`text-primary`、`text-secondary`、`text-tertiary`、`text-disabled` | 已在 `cindy-light.ts` / `cindy-dark.ts` 作为主题色出现 | 非登录组件继续按主题体系消费;登录不要直接拿这些替代设计稿登录 alias |
@@ -180,7 +180,7 @@ export const loginColors = {
| 墨水交互态(2026-10-22 起) | 悬停、标签底、选中、按下与边框改为同一墨水的低透明度(§9.2 交互态表),叠在页面、卡片、弹层上都深(暗色为亮)同一档,不再分页面/卡片两套值。取代原「双锚定」 |
| 双写同步 | 同色 HEX/rgba 与 HSL 两种写法(24 组)逐值一致,半透明档两种写法带同一透明度;聚焦描边等控件轮廓保留自身取值,不再从文字档派生 |
| 信息类文字地板 | 三级及以上的信息类文字对比度 **≥3.0**(页面、卡片、悬停面上实测);占位/禁用/未激活态按 WCAG 豁免不抬 |
-| 豁免不碰 | `login-*` 全族(59 token;值自 2026-10-23 文字、2026-10-27 面板 / 控件 / 主按钮起与本表同口径,但仍不随主题覆盖)、`diff-*`/`error-*`/`overlay-*`、语义状态色、阴影(§10/§16 + `protected-tokens.ts`) |
+| 豁免不碰 | `login-*` 全族(60 token;值自 2026-10-23 文字、2026-10-27 面板 / 控件 / 主按钮起与本表同口径,但仍不随主题覆盖)、`diff-*`/`error-*`/`overlay-*`、语义状态色、阴影(§10/§16 + `protected-tokens.ts`) |
### 9.2 Light 面阶梯(暖象牙)
diff --git a/packages/design-tokens/src/__tests__/production.test.ts b/packages/design-tokens/src/__tests__/production.test.ts
index fb48f33b81..ba6fc5bbb9 100644
--- a/packages/design-tokens/src/__tests__/production.test.ts
+++ b/packages/design-tokens/src/__tests__/production.test.ts
@@ -176,7 +176,7 @@ describe("DS-8 production source", () => {
ts.forEachChild(node, visit);
};
visit(source);
- expect(new Set(ids).size).toBe(569);
+ expect(new Set(ids).size).toBe(570);
expect(
[
...Object.keys(bindings.defaults),
diff --git a/packages/design-tokens/src/classification.json b/packages/design-tokens/src/classification.json
index 54bbb8751c..e327ba8348 100644
--- a/packages/design-tokens/src/classification.json
+++ b/packages/design-tokens/src/classification.json
@@ -1,9 +1,9 @@
{
"source": "apps/desktop/src/renderer/themes/colors.ts",
"generatedBy": "packages/design-tokens/src/classify.ts",
- "snapshotCount": 569,
+ "snapshotCount": 570,
"categories": {
- "literal": 282,
+ "literal": 283,
"alias": 249,
"hsl-triplet": 6,
"runtime-derived-or-protected": 32
@@ -1402,6 +1402,14 @@
"darkKind": "hex",
"modeledAsSemantic": false
},
+ {
+ "id": "login-disabled-button-overlay",
+ "category": "literal",
+ "destination": "reference-candidate",
+ "lightKind": "rgb",
+ "darkKind": "rgb",
+ "modeledAsSemantic": false
+ },
{
"id": "login-disabled-button-bg",
"category": "literal",
diff --git a/packages/design-tokens/src/desktop-bindings.json b/packages/design-tokens/src/desktop-bindings.json
index c7d9e8733b..994074dcf4 100644
--- a/packages/design-tokens/src/desktop-bindings.json
+++ b/packages/design-tokens/src/desktop-bindings.json
@@ -560,6 +560,10 @@
"light": "semantic.defaults.login-primary-button-text.light",
"dark": "semantic.defaults.login-primary-button-text.dark"
},
+ "login-disabled-button-overlay": {
+ "light": "semantic.defaults.login-disabled-button-overlay.light",
+ "dark": "semantic.defaults.login-disabled-button-overlay.dark"
+ },
"login-disabled-button-bg": {
"light": "semantic.defaults.login-disabled-button-bg.light",
"dark": "semantic.defaults.login-disabled-button-bg.dark"
@@ -3915,6 +3919,13 @@
],
"use": "墨水强调档 黑 95% / 白 100%"
},
+ {
+ "label": "`--login-disabled-button-overlay`(已退役)",
+ "ids": [
+ "login-disabled-button-overlay"
+ ],
+ "use": "已退役(2026-10-27):禁用主按钮改为控件底 + 占位字,不再叠层;ID 与透明默认值保留,仅为兼容旧版导出的本地主题,组件不再消费"
+ },
{
"label": "`--login-splash-progress-track` / `--login-splash-progress-fill`",
"ids": [
diff --git a/packages/design-tokens/src/reference/color.json b/packages/design-tokens/src/reference/color.json
index c92d8fb9d7..74664ab8ba 100644
--- a/packages/design-tokens/src/reference/color.json
+++ b/packages/design-tokens/src/reference/color.json
@@ -4223,6 +4223,46 @@
}
}
},
+ "login-disabled-button-overlay": {
+ "light": {
+ "$type": "color",
+ "$value": {
+ "colorSpace": "srgb",
+ "components": [
+ 0,
+ 0,
+ 0
+ ],
+ "alpha": 0
+ },
+ "$extensions": {
+ "com.cindy.desktop": {
+ "format": "rgb",
+ "alpha": true,
+ "precision": 2
+ }
+ }
+ },
+ "dark": {
+ "$type": "color",
+ "$value": {
+ "colorSpace": "srgb",
+ "components": [
+ 1,
+ 1,
+ 1
+ ],
+ "alpha": 0
+ },
+ "$extensions": {
+ "com.cindy.desktop": {
+ "format": "rgb",
+ "alpha": true,
+ "precision": 2
+ }
+ }
+ }
+ },
"login-disabled-button-bg": {
"light": {
"$type": "color",
diff --git a/packages/design-tokens/src/semantic/color.json b/packages/design-tokens/src/semantic/color.json
index fac85bb1a0..d820222b71 100644
--- a/packages/design-tokens/src/semantic/color.json
+++ b/packages/design-tokens/src/semantic/color.json
@@ -1183,6 +1183,16 @@
"$value": "{reference.defaults.login-primary-button-text.dark}"
}
},
+ "login-disabled-button-overlay": {
+ "light": {
+ "$type": "color",
+ "$value": "{reference.defaults.login-disabled-button-overlay.light}"
+ },
+ "dark": {
+ "$type": "color",
+ "$value": "{reference.defaults.login-disabled-button-overlay.dark}"
+ }
+ },
"login-disabled-button-bg": {
"light": {
"$type": "color",