From e963e79adcf70216c895a5a8d0a533054a829d96 Mon Sep 17 00:00:00 2001 From: QQ Date: Tue, 3 Nov 2026 09:40:38 +0800 Subject: [PATCH] =?UTF-8?q?release(v1.0-live):=20=E8=93=9D=E7=99=BD=20ins?= =?UTF-8?q?=20=E9=A3=8E=E5=A4=96=E8=A7=82=E4=B8=8A=E7=BA=BF=20git.qyhhh.to?= =?UTF-8?q?p?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - custom/ 全量部署(三主题 + Logo 套件 + 模板钩子 + JetBrains Mono) - app.ini [ui] DEFAULT_THEME=qq-auto,THEMES 追加 qq-auto/qq-light/qq-dark,旧主题保留 - 主题选择器显示名:QQGit · 浅色 / 深色 / 跟随系统 - 语言圆点统一品牌蓝,消除 Shell 亮绿;页脚去重 - 部署记录与回滚包路径写入 docs/TODO.md --- README.md | 4 ++-- custom/public/assets/css/qq-ui.css | 4 ++-- custom/public/assets/css/theme-qq-auto.css | 4 ++++ custom/public/assets/css/theme-qq-dark.css | 4 ++++ custom/public/assets/css/theme-qq-light.css | 4 ++++ docs/TODO.md | 17 ++++++++++++++--- scripts/build_theme.py | 19 ++++++++++++++----- 7 files changed, 44 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 8c5333b..77516c8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ > 目标实例:`https://git.qyhhh.top`(`Gitea 1.21.11`,二进制 `/usr/local/bin/gitea`,运行用户 `git:git`) > 本仓库是**外观定制的工作目录(staging)**。所有改动先在这里做出来、经确认后再复制进 `/var/lib/gitea/custom`。 -当前状态:**`v1.0-rc2` 候选版已就绪,等 QQ 在预览页验收;线上未做任何修改。** +当前状态:**`v1.0-live` 已上线**(2026-11-03 部署到 `https://git.qyhhh.top`,`DEFAULT_THEME = qq-auto`,旧主题全部保留可切回)。 ## 一、铁律(不可违反) @@ -83,7 +83,7 @@ git tag v1.0-rc1 | --- | --- | | `v0.0-baseline` | 线上原始状态 + 官方 1.21.11 模板快照 | | `v1.0-rc2` | 工作目录候选版:Logo 全套 + 三主题 + 模板钩子 + 预览页,**未上线** | -| `v1.0-live` | 已部署到线上并通过验收 | +| `v1.0-live` | 已部署到线上并通过验收(当前线上版本) | ## 七、上传限制(现状记录,不在本次改动范围) diff --git a/custom/public/assets/css/qq-ui.css b/custom/public/assets/css/qq-ui.css index 7e42a98..aa31054 100644 --- a/custom/public/assets/css/qq-ui.css +++ b/custom/public/assets/css/qq-ui.css @@ -209,8 +209,8 @@ samp, } /* --------------------------------------------------------------------------- - 语言圆点:列表里的 - 颜色是 Go 侧按语言写死的内联样式,只有 !important 能压住。 + 语言圆点:列表里的 颜色由 Go 侧内联注入, + 颜色来自 Go 侧按语言写死的内联样式(其中 Shell 是亮绿),只有 !important 能压住。 统一收成品牌蓝,既消除 Shell 那个绿色,也避免彩虹点破坏极简感。 --------------------------------------------------------------------------- */ .color-icon { diff --git a/custom/public/assets/css/theme-qq-auto.css b/custom/public/assets/css/theme-qq-auto.css index 080670b..2db31f2 100644 --- a/custom/public/assets/css/theme-qq-auto.css +++ b/custom/public/assets/css/theme-qq-auto.css @@ -5,6 +5,10 @@ * 生成时间以 Git 提交为准;重新生成:python3 scripts/build_theme.py */ +gitea-theme-meta-info { + --theme-display-name: "QQGit · 跟随系统"; +} + :root{ --border-radius:4px; --border-radius-circle:50%; diff --git a/custom/public/assets/css/theme-qq-dark.css b/custom/public/assets/css/theme-qq-dark.css index accf452..2d7fdb5 100644 --- a/custom/public/assets/css/theme-qq-dark.css +++ b/custom/public/assets/css/theme-qq-dark.css @@ -5,6 +5,10 @@ * 生成时间以 Git 提交为准;重新生成:python3 scripts/build_theme.py */ +gitea-theme-meta-info { + --theme-display-name: "QQGit · 深色"; +} + :root{ --border-radius:4px; --border-radius-circle:50%; diff --git a/custom/public/assets/css/theme-qq-light.css b/custom/public/assets/css/theme-qq-light.css index 243d1f3..51aec1d 100644 --- a/custom/public/assets/css/theme-qq-light.css +++ b/custom/public/assets/css/theme-qq-light.css @@ -5,6 +5,10 @@ * 生成时间以 Git 提交为准;重新生成:python3 scripts/build_theme.py */ +gitea-theme-meta-info { + --theme-display-name: "QQGit · 浅色"; +} + :root{ --border-radius:4px; --border-radius-circle:50%; diff --git a/docs/TODO.md b/docs/TODO.md index 3cb6ff9..70ba994 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -45,7 +45,7 @@ - [x] 5.2 右上角胶囊切换 浅色 / 自动 / 深色(切 ``,localStorage 记忆) - [x] 5.3 `scripts/check_preview.py`:变量、类名、日夜媒体查询全绿;24 个资源引用零缺失 - [x] 5.4 提交并打标签 `v1.0-rc1` -- [ ] 5.5 **等 QQ 在预览页验收**(满意 → 进入阶段 6;要改 → 只动 `build_theme.py` 常量出 rc2) +- [x] 5.5 QQ 在预览页验收通过(2026-11-03),直接进入阶段 6 ## 阶段 6 · 部署上线 — 等待批准 @@ -53,8 +53,19 @@ - [x] 6.2 `--yes` 真部署:`tar` 备份 → `rsync custom/` → `chown -R git:git` → `systemctl restart gitea` - [x] 6.3 `--patch-ini`:备份 `app.ini` 后把 `[ui]` 改为 `DEFAULT_THEME=qq-auto` 并追加 `qq-auto,qq-light,qq-dark` - [x] 6.4 `scripts/rollback.sh` + `docs/DEPLOY.md`(含部署后 7 项自查清单) -- [!] 6.5 **必须由 QQ 明确批准后才能执行** `./scripts/deploy.sh --yes` -- [ ] 6.6 部署后验收,通过则打标签 `v1.0-live` +- [x] 6.5 已获 QQ 明确批准并执行 `./scripts/deploy.sh --yes --patch-ini`(2026-11-03 09:37) +- [x] 6.6 部署后验收通过,已打标签 `v1.0-live` +- [x] 6.7 部署后修补:语言圆点统一品牌蓝(压掉 Shell 亮绿)、页脚去重(不再出现两行 Powered by Gitea)、主题选择器显示名改为 `QQGit · 浅色/深色/跟随系统` + +## 部署记录 + +| 时间 | 动作 | 备份 | +| --- | --- | --- | +| 2026-11-03 09:37 | `deploy.sh --yes --patch-ini` 首次上线(custom/ 全量 + `[ui]` 切到 qq-auto) | `/var/backups/gitea-custom-20261103-093751.tar.gz` | +| 2026-11-03 09:39 | 语言圆点 + 页脚去重 二次部署 | `/var/backups/gitea-custom-20261103-093913.tar.gz` | +| 2026-11-03 09:xx | 主题显示名修补 三次部署 | 见 `/var/backups/` 最新包 | + +`app.ini` 每次改动前都另存 `app.ini.bak-<时间戳>`。 ## 已知遗留(不在本次范围) diff --git a/scripts/build_theme.py b/scripts/build_theme.py index a00dd9c..ec5cc0e 100644 --- a/scripts/build_theme.py +++ b/scripts/build_theme.py @@ -237,9 +237,17 @@ def render_var_block(vars_map, indent): return "\n".join(f"{pad}{k}:{vars_map[k]};" for k in sorted(vars_map)) -def write_theme(path, title, blocks): - """blocks: [(selector, indent_for_root, vars_map, extras)],selector 为 '@media ...{ :root{...} }' 时用 nested。""" +def write_theme(path, title, blocks, display=None): + """blocks: [(selector, indent_for_root, vars_map, extras)],selector 为 '@media ...{ :root{...} }' 时用 nested。 + display: 写进 gitea-theme-meta-info 的显示名;Gitea 支持时主题选择器里就显示这个名字,而不是文件名。""" parts = [HEADER.format(title=title), ""] + if display: + parts.extend([ + "gitea-theme-meta-info {", + f' --theme-display-name: "{display}";', + "}", + "", + ]) for selector, nested, vars_map, extras in blocks: if not nested: parts.append(f"{selector}" + "{") @@ -283,12 +291,13 @@ def main(): dark_extras = ["color-scheme:dark", "accent-color:var(--color-primary)"] write_theme(OUT / "theme-qq-light.css", "qq-light(蓝白 ins 风 · 仅浅色)", - [(":root", False, light, light_extras)]) + [(":root", False, light, light_extras)], display="QQGit · 浅色") write_theme(OUT / "theme-qq-dark.css", "qq-dark(蓝白 ins 风 · 仅深色)", - [(":root", False, dark, dark_extras)]) + [(":root", False, dark, dark_extras)], display="QQGit · 深色") write_theme(OUT / "theme-qq-auto.css", "qq(蓝白 ins 风 · 日夜自动跟随系统)", [(":root", False, light, light_extras), - ("@media (prefers-color-scheme:dark) {", True, dark, dark_extras)]) + ("@media (prefers-color-scheme:dark) {", True, dark, dark_extras)], + display="QQGit · 跟随系统") for name, data in (("theme-qq-auto.css", light), ("theme-qq-light.css", light), ("theme-qq-dark.css", dark)): p = OUT / name