同步登录/注册页面样式

* feat(chroma): 代码高亮重构

* todo

* release 亮色适配

* 发布页分支按钮高度修正

* chroma变量和修复注册页导航栏

* chroma 重构适配亮色

---------

Co-authored-by: lutinglt <lutinglt@users.noreply.github.com>

.env.example

@@ -1,4 +1,8 @@
+# 开发模式下编译的主题 (开发模式仅编译单个主题)
 DEV_THEME=dark
+# 把编译后的主题上传到服务器的服务器名称, 通过 SCP 上传
 SSH_SERVER=localhost
+# 上传到服务器的用户名称, 不支持密码, 请确保有 SSH 免密登录权限
 SSH_USER=root
+# 上传到服务器的主题路径, 请使用绝对路径
 GITEA_THEME_PATH=/data/gitea/public/assets/css/

.github/release-template.md

@@ -1,3 +1,7 @@
+## ✨ Feature
+
+#### CSS 变量
+
 ## 🌈 Style
 
 #### 更符合 GitHub 风格

.github/release.md

@@ -1,12 +1,21 @@
+## ✨ Feature
+
 ## 🌈 Style
 
 #### 更符合 GitHub 风格
 
+- 同步仓库代码文件页 README 导航栏样式
+- 同步分页菜单样式
+- 同步登录/注册页面样式
+
 ## 🎈 Perf
 
-- 优化提交中 Action 状态标签的位置
+- 略微增加仓库代码文件列表的单行高度与 GitHub 一致
-- 优化按钮和菜单下的图标颜色
+- 优化创建仓库/迁移仓库/创建组织页面的样式与设置页面的样式一致
-- 优化仓库发布中的分支选择按钮样式
-- 优化向上弹窗的菜单动画
 
 ## 🐞 Fix
+
+- 修复 Action 作业步骤页面标题选中时滚动固定的高度问题
+- 修复用户公开活动页动态布局问题
+- 修复顶部导航栏工单管理/请求合并页面搜索框旁的选择下拉框按钮内容过窄
+- 修复手机页面下注册/登录页导航栏注册按钮换行的问题

.github/workflows/release.yml

@@ -19,6 +19,7 @@ jobs:
         run: |
           export TZ=Asia/Shanghai
           TAG="v$(npm run -s version).$(date +%y%m%d%H%M)"
+          tar -zcf dist/theme-github.tar.gz --remove-files dist/theme-github-auto.css dist/theme-github-light.css dist/theme-github-dark.css dist/theme-github-soft-dark.css
           gh release create "$TAG" dist/* --notes-file .github/release.md --draft -t $TAG
         env:
           GH_TOKEN: ${{ github.token }}

.gitignore

@@ -2,3 +2,4 @@ dist
 node_modules
 package-lock.json
 .env
+.VSCodeCounter

CONTRIBUTING.md

@@ -1,7 +1,159 @@
+# 贡献指南
+
+## 目录结构
+
 | 目录              | 说明                         |
 | ----------------- | ---------------------------- |
-| styles            | 元素 GitHub 风格             |
+| src               | 主题生成框架与辅助工具的包   |
-| styles/components | 具体页面的元素单独风格       |
+| src/core          | 主题生成框架                 |
-| styles/public     | 适用大部分页面的元素默认风格 |
+| src/functions     | 主题辅助工具                 |
+| src/types         | 主题的颜色变量定义           |
+| styles            | 主题样式                     |
+| styles/components | 具体页面的元素的样式         |
+| styles/public     | 基础元素或跨页面的元素的样式 |
 | themes            | 颜色主题                     |
-| themes/\<theme>   | 具体颜色主题自己的颜色或风格 |
+
+## 贡献说明
+
+不推荐主题样式贡献, 因为 Gitea 主题最终是由单个 CSS 文件提供, 所以会有先后顺序覆盖, 样式影响广泛等问题.
+
+开发者每个人的思路不一样, 审核很难看出这些问题, 会极大增加维护难度.
+
+如果确定理解了 Gitea 的样式布局和我的思路, 请先提交 Issue 确认工作量和预期效果, 然后再开发提交 PR.
+
+如果认为有更好的思路, 欢迎提交 Issue.
+
+> [!IMPORTANT]
+>
+> 提交 PR 时, 请执行 `npm run commit`
+
+## 开发环境
+
+主题仅依赖于 Node.js 环境, 请确保你的环境中已经安装了 Node.js, 推荐使用 Node.js 20 或以上版本.
+
+请使用 VSCode 开发, 并安装仓库中推荐的插件.
+
+如果不喜欢多余的插件, 请务必安装 `vscode-styled-components` 插件, 此插件用于渲染和检查 TypeScript 中的 CSS 模板字符串.
+
+推荐使用 VSCode 1.102.0 版本以上开发, 此版本以上提供 TypeScript 代码中 16 进制颜色的支持.
+
+## 开发流程
+
+### 安装依赖
+
+```bash
+npm install
+```
+
+### 设置环境变量
+
+在项目根目录下创建 `.env` 文件, 变量参考 `.env.example` 文件.
+
+环境变量用于发送编译后的主题到服务器上, 快速预览主题.
+
+### 编译主题
+
+编译开发中的主题
+
+```bash
+npm run dev
+```
+
+编译所有主题
+
+```bash
+npm run build
+```
+
+格式化项目中的代码
+
+```bash
+npm run format
+```
+
+用于 PR, 检查并编译项目中的所有代码并进行格式化
+
+```bash
+npm run commit
+```
+
+## 开发规范
+
+`src`, `styles`, `themes` 为项目的主目录, 主目录下的第一个目录为模块.
+
+主目录或主目录下模块互相引用时, 请使用绝对路径, 例如 `import { defineTheme } from "src"`
+
+模块下的文件互相引用时, 请使用相对路径, 例如 `import { defineTheme } from "./theme"`
+
+## 颜色主题贡献
+
+颜色主题名称格式: `主题名称-dark.css.ts` 或 `主题名称-light.css.ts`, 分别表示深色和亮色主题.
+
+如果主题有深色和亮色模式, 会自动生成自动颜色主题, 不需要手动添加.
+
+项目接受自定义主题并会附加到发布的版本中, 但项目所有者不参与维护和审核.
+
+请在颜色主题文件头部附加自己的作者信息, 方便 Issue 提问者找到你 `@`.
+
+推荐使用 `import { defineTheme } from "src"` 导入主题生成框架, 然后使用 `defineTheme` 函数生成主题,
+defineTheme 中设置了一些经过计算得到的 Gitea 变量可以减少工作量, 具体请查看函数说明.
+
+颜色计算函数可以从 `src/functions` 导入, 例如 `import { scaleColorLight } from "src/functions"`, 或者使用 `polished` 库.
+
+例: `themes/主题名称-dark.css.ts`
+
+```ts
+/**
+ * @author 你的名字
+ * @description 主题描述
+ */
+import { defineTheme } from "src";
+export default defineTheme({
+  ...
+});
+// 使用其他主题颜色作为基础
+import dark from "themes/dark";
+export default defineTheme({
+  ...dark,
+  ...
+});
+```
+
+如果不需要自定义代码高亮色, 则不传递 chroma 参数, 框架会自动根据主题的暗色或亮色生成代码高亮色.
+
+如果需要完全自定义每个 Gitea 变量, 请导入 `import type { Theme } from "src"`
+
+例: `themes/主题名称-dark.css.ts`
+
+```ts
+/**
+ * @author 你的名字
+ * @description 主题描述
+ */
+import type { Theme } from "src";
+export default theme: Theme = {
+ ...
+};
+```
+
+完成主题颜色开发后, 请在某个仓库的代码文件列表页, 打开 Code 菜单选择 Tea Cli 进行截图, 并放入 `screenshots`
+目录下, 截图名与主题名相同. (推荐克隆 Github 的 actions/checkout 仓库, 该仓库信息较全, 避免泄露个人隐私)
+
+然后将截图信息添加到 `README.md` 文件中, 可以在折叠部分中添加自己的说明.
+
+## 主题样式贡献
+
+主题样式使用 TypeScript 的 css 模板字符串开发, 该模板字符串会经过 sass 预处理器处理, 支持 SCSS 语法并且主题只接受 SCSS 嵌套语法, 请不要使用 CSS 语法, 如果一定要用请说明原因.
+
+请尽量不要使用 SCSS 的函数, `vscode-styled-components` 插件会报错, 请使用 TypeScript 相关库处理, 比如主题自带的
+`polished` 库.
+
+推荐需要使用复杂处理时, 提取逻辑到 `src/functions` 目录下的函数中, 然后在 `src/styles` 目录下的样式文件中使用.
+
+主题样式中使用到的所有颜色必须使用颜色变量, 颜色变量导入 `import { themeVars } from "src/types/vars"`
+
+涉及到主题自己的颜色变量 `${themeVars.github.xxx}`, 在使用时请将使用的文件和变量添加到对应变量的注释中
+`src/types/color/github`
+
+小型圆角(6px)请使用全局圆角变量, 圆角变量导入 `import { otherThemeVars } from "src/types/vars"`
+`${otherThemeVars.border.radius}`

README.md

@@ -1,26 +1,42 @@
 # gitea-github-theme
 
-尽量保持与 GitHub 相同样式的 Gitea 主题
+一个精致模仿 Github 风格的 Gitea 主题
 
-### 主题说明
+> [!TIP]
+>
+> 推荐搭配文件图标浏览器插件一起使用更佳
+> [web-file-explorer-icons](https://github.com/catppuccin/web-file-explorer-icons)
 
-添加了短暂的过渡动画优化体验(与 GitHub Code 克隆列表动画一致)
+## 版本号说明
 
-推荐搭配文件图标浏览器插件一起使用更佳
+主题版本号格式: `Gitea 版本号.时间戳`
-[github-file-explorer-icons](https://github.com/catppuccin/github-file-explorer-icons)
+
+Gitea 版本号格式: `1.大版本号.小版本号`
+
+Gitea 理论上小版本号变更不会修改前端布局, 所以主题的小版本号适用于所有 Gitea 大版本号相同的 Gitea 版本.
+
+比如: 主题版本 `1.24.4` 适用于 Gitea 版本 `>=1.24.0` ~ `<1.25.0`
+
+仅维护项目发布中的最新的 Gitea 版本, 其他旧版本主题不接受 Issue 和 PR.
 
 ## 安装
 
-1. 在发布页下载最新的 `theme-github-dark.css` 放入 `gitea/public/assets/css` 目录下
+1. 在发布页下载最新的 CSS 主题文件放入 `gitea/public/assets/css` 目录下
-2. 修改 `gitea/conf/app.ini`，并将 `, github` 附加到 `[ui]` 下的 `THEMES` 末尾
+2. 修改 `gitea/conf/app.ini`，并将 CSS 文件名去掉 `theme-` 的名称附加到 `[ui]` 下的 `THEMES` 末尾
 3. 重启 Gitea
 4. 在设置中查看主题
 
+> [!IMPORTANT]
+>
+> 自动颜色主题需要亮色和暗色的主题文件
+
+例: 主题文件名为 `theme-github-dark.css`，则添加 `github-dark` 到 `THEMES` 末尾
+
 `gitea/conf/app.ini` 例:
 
 ```ini
 [ui]
-THEMES = gitea-dark, github-dark
+THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-dark, github-soft-dark
 ```
 
 详细请查看 Gitea 文档
@@ -28,20 +44,71 @@ THEMES = gitea-dark, github-dark
 
 ## 截图
 
-![仓库](screenshots/repo.png)
+<details open>
+<summary>GitHub</summary>
+<h4>theme-github-light.css</h4>
+<img src="screenshots/light.png"/>
+<h4>theme-github-dark.css</h4>
+<img src="screenshots/dark.png"/>
+<h4>theme-github-soft-dark.css</h4>
+<img src="screenshots/soft-dark.png"/>
+</details>
 
-![仓库文件列表](screenshots/file_list.png)
+<details>
+<summary>其他主题</summary>
+等待贡献者ing...
+</details>
 
-![仓库发布](screenshots/release.png)
+## 自定义 CSS 变量
 
-![仓库提交](screenshots/commit.png)
+可以根据自己的偏好自定义主题的一部分样式
 
-![Actions](screenshots/actions.png)
+### 使用方法
 
-![Action](screenshots/action.png)
+在主题的 CSS 文件的头部或尾部添加以下代码
 
-![Dispatch](screenshots/dispatch.png)
+```css
+:root {
+  --custom-clone-menu-width: 150px;
+  ...
+}
+```
+
+> [!IMPORTANT]
+>
+> 请确保在 `:root` 选择器中添加自定义变量，否则无法生效
+>
+> 变量之间用 `;` 分隔
+>
+> 建议自定义变量放在单独的文件中, 通过 shell 命令等方式追加到主题文件中
+
+### CSS 变量
+
+| 变量名                            | 描述                        | 默认  | Github | 推荐  | 最小  | 最大  |
+| :-------------------------------- | :-------------------------- | :---- | :----- | :---- | :---- | :---- |
+| --custom-clone-menu-width         | 克隆菜单宽度                | Gitea | 332px  | 200px | 150px | 400px |
+| --custom-explore-repolist-columns | 探索页面的仓库列表列数      | 2     | 2      | 2     |       |       |
+| --custom-explore-userlist-columns | 探索页面的用户/组织列表列数 | 3     | 1      | 2/3   |       |       |
+| --custom-user-repolist-columns    | 用户页面的仓库列表列数      | 2     | 2      | 1/2   |       |       |
+| --custom-org-repolist-columns     | 组织页面的仓库列表列数      | 1     | 1      | 1/2   |       |       |
+| --custom-org-userlist-columns     | 组织页面的用户列表列数      | 2     | 1      | 1/2   |       |       |
+
+## 使用开发中的主题
+
+也许你会想使用开发中的主题, 而不是发布的主题
+
+请确保你已经安装了 Node.js 环境, 推荐使用 Node.js 20 或以上版本
+
+```bash
+git clone https://github.com/lutinglt/gitea-github-theme.git
+cd gitea-github-theme
+npm install
+npm run build
+```
+
+编译完成后, 会在 `dist` 目录下生成主题文件, 你可以将主题文件放入 `gitea/public/assets/css` 目录下, 然后在
+`gitea/conf/app.ini` 中添加主题名称到 `THEMES` 末尾
 
 ## 贡献
 
-欢迎提交 Issue 或 Pull Request
+请查看 [CONTRIBUTING](CONTRIBUTING.md)

TODO.md

@@ -1,19 +1,8 @@
-### 轻量
-
-- hover 动画迁移
-- 列表部分 item 展开动画迁移
-
 ### 重大
 
-- gitea issue 默认标签颜色匹配使用 github 样式
+- gitea issue 暗色模式下默认标签颜色匹配使用 github 样式
-- 探索/组织/用户仓库样式 github 布局
 - issue/PR 列表样式 github 布局
-- styles/themes 库组件导出整理
+- 用户动态仪表板样式优化
-- defineTheme 颜色生成代码重构
+- 色盲主题支持
-- 亮色主题适配/测试
+- 打开文件时的文件导航树样式和滚动高度
-- 自动颜色主题生成
+- 私有库标签大小, 组织页面下的RSS订阅按钮样式
-
-### 其他
-
-- README 更新/截图更新
-- CONTRIBUTING 更新

eslint.config.js

@@ -1,6 +1,4 @@
 import js from "@eslint/js";
-import reactHooks from "eslint-plugin-react-hooks";
-import reactRefresh from "eslint-plugin-react-refresh";
 import globals from "globals";
 import tseslint from "typescript-eslint";
 
@@ -8,17 +6,10 @@ export default tseslint.config(
   { ignores: ["dist"] },
   {
     extends: [js.configs.recommended, ...tseslint.configs.recommended],
-    files: ["**/*.{ts,tsx}"],
+    files: ["**/*.{ts}"],
     languageOptions: {
       ecmaVersion: 2020,
       globals: globals.browser,
     },
-    plugins: {
-      "react-hooks": reactHooks,
-      "react-refresh": reactRefresh,
-    },
-    rules: {
-      ...reactHooks.configs.recommended.rules,
-    },
   }
 );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitea-github-theme",
-  "version": "1.24.2",
+  "version": "1.24.4",
   "description": "A theme to make Gitea look and feel like GitHub",
   "type": "module",
   "scripts": {
@@ -12,35 +12,26 @@
     "version": "node scripts/version.cjs"
   },
   "devDependencies": {
-    "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
     "@eslint/js": "^9.29.0",
     "@linaria/core": "^6.3.0",
-    "@linaria/react": "^6.3.0",
     "@types/node": "^24.0.3",
-    "@types/react": "^19.1.8",
-    "@types/react-dom": "^19.1.6",
     "@vanilla-extract/css": "^1.17.4",
     "@vanilla-extract/vite-plugin": "^5.0.6",
-    "@vitejs/plugin-react": "^4.5.2",
-    "@vitejs/plugin-react-swc": "^3.10.2",
     "@wyw-in-js/babel-preset": "^0.7.0",
     "@wyw-in-js/vite": "^0.7.0",
     "dotenv": "^17.0.0",
     "eslint": "^9.29.0",
-    "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-react-refresh": "^0.4.20",
     "globals": "^16.2.0",
     "lightningcss": "^1.30.1",
     "polished": "^4.3.1",
     "prettier": "3.5.3",
     "prettier-plugin-organize-imports": "^4.1.0",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0",
     "sass-embedded": "^1.89.2",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.34.1",
     "typescript-plugin-css-modules": "^5.1.0",
+    "typescript-styled-plugin": "^0.18.3",
     "vite": "^6.3.5"
   },
   "prettier": {
@@ -62,8 +53,5 @@
       "prettier-plugin-organize-imports"
     ],
     "organizeImportsSkipDestructiveCodeActions": false
-  },
-  "dependencies": {
-    "typescript-styled-plugin": "^0.18.3"
   }
 }

src/core/chroma.ts

@@ -0,0 +1,61 @@
+import { prettylights2Chroma } from "./prettylights";
+
+export const defaultDarkChroma = prettylights2Chroma({
+  syntax: {
+    brackethighlighter: { angle: "#9198a1", unmatched: "#f85149" },
+    carriage: { return: { bg: "#b62324", text: "#f0f6fc" } },
+    comment: "#9198a1",
+    constant: "#79c0ff",
+    constantOtherReferenceLink: "#a5d6ff",
+    entity: "#d2a8ff",
+    entityTag: "#7ee787",
+    invalid: { illegal: { bg: "#8e1519", text: "#f0f6fc" } },
+    keyword: "#ff7b72",
+    markup: {
+      bold: "#f0f6fc",
+      changed: { bg: "#5a1e02", text: "#ffdfb6" },
+      deleted: { bg: "#67060c", text: "#ffdcd7" },
+      heading: "#1f6feb",
+      ignored: { bg: "#1158c7", text: "#f0f6fc" },
+      inserted: { bg: "#033a16", text: "#aff5b4" },
+      italic: "#f0f6fc",
+      list: "#f2cc60",
+    },
+    metaDiffRange: "#d2a8ff",
+    storageModifierImport: "#f0f6fc",
+    string: "#a5d6ff",
+    stringRegexp: "#7ee787",
+    sublimelinterGutterMark: "#3d444d",
+    variable: "#ffa657",
+  },
+});
+
+export const defaultLightChroma = prettylights2Chroma({
+  syntax: {
+    brackethighlighter: { angle: "#59636e", unmatched: "#82071e" },
+    carriage: { return: { bg: "#cf222e", text: "#f6f8fa" } },
+    comment: "#59636e",
+    constant: "#0550ae",
+    constantOtherReferenceLink: "#0a3069",
+    entity: "#6639ba",
+    entityTag: "#0550ae",
+    invalid: { illegal: { bg: "#82071e", text: "#f6f8fa" } },
+    keyword: "#cf222e",
+    markup: {
+      bold: "#1f2328",
+      changed: { bg: "#ffd8b5", text: "#953800" },
+      deleted: { bg: "#ffebe9", text: "#82071e" },
+      heading: "#0550ae",
+      ignored: { bg: "#0550ae", text: "#d1d9e0" },
+      inserted: { bg: "#dafbe1", text: "#116329" },
+      italic: "#1f2328",
+      list: "#3b2300",
+    },
+    metaDiffRange: "#8250df",
+    storageModifierImport: "#1f2328",
+    string: "#0a3069",
+    stringRegexp: "#116329",
+    sublimelinterGutterMark: "#818b98",
+    variable: "#953800",
+  },
+});

src/core/color.ts

@@ -1,7 +1,8 @@
 import { rgba, saturate } from "polished";
 import { scaleColorLight } from "src/functions";
-import type { Ansi, Console, Diff, Github, Message, Named, Other, Primary, Secondary } from "src/types";
+import type { Ansi, Chroma, Console, Diff, Github, Message, Named, Other, Primary, Secondary } from "src/types";
 import { themeVars } from "src/types/vars";
+import { defaultDarkChroma, defaultLightChroma } from "./chroma";
 import type { Theme } from "./theme";
 
 type ThemeColor = {
@@ -57,8 +58,8 @@ type ThemeColor = {
 
 /** 定义颜色, 用于生成颜色主题
  * @example
- * 文件名: "dark.css.tsx"
+ * 文件名: "dark.css.ts"
- * import type { Console, Diff, Other } from "src/types";
+ * import type { Console, Diff, Other, Github } from "src/types";
  * import { defineTheme, themeVars } from "src";
  *
  * const console: Console = {
@@ -70,7 +71,6 @@ type ThemeColor = {
  *   ...
  * }
  * ...
- * // 会经过 lightningcss 打包处理生成最终的 CSS
  * export default defineTheme({
  *   isDarkTheme: true,
  *   primary: "#0969da",
@@ -78,9 +78,10 @@ type ThemeColor = {
  *   console,
  *   diff,
  *   other,
+ *   github,
  * })
  */
-export function defineTheme(themeColor: ThemeColor): Theme {
+export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null): Theme {
   const brightDir = themeColor.isDarkTheme ? -1 : 1;
 
   const primary: Primary = {
@@ -341,6 +342,7 @@ export function defineTheme(themeColor: ThemeColor): Theme {
 
   return {
     isDarkTheme: themeColor.isDarkTheme.toString(),
+    chroma: chroma || (themeColor.isDarkTheme ? defaultDarkChroma : defaultLightChroma),
     color: {
       primary,
       secondary,

src/core/github.ts

@@ -1,5 +1,7 @@
+import { saturate } from "polished";
 import type { Console, Diff, Other } from "src";
-import type { Github } from "src/types";
+import { scaleColorLight } from "src/functions";
+import type { Chroma, Github } from "src/types";
 import { themeVars } from "src/types/vars";
 import { defineTheme } from "./color";
 import type { Theme } from "./theme";
@@ -37,113 +39,45 @@ export type GithubColor = {
     muted: string;
   };
   bgColor: {
-    accent: {
+    accent: { emphasis: string; muted: string };
-      emphasis: string;
+    attention: { muted: string };
-      muted: string;
+    success: { emphasis: string; muted: string };
-    };
+    danger: { muted: string };
-    attention: {
+    done: { emphasis: string };
-      muted: string;
-    };
-    success: {
-      emphasis: string;
-      muted: string;
-    };
-    danger: {
-      muted: string;
-    };
-    done: {
-      emphasis: string;
-    };
     default: string;
     inset: string;
     muted: string;
-    neutral: {
+    neutral: { muted: string };
-      muted: string;
-    };
   };
   borderColor: {
-    accent: {
+    accent: { emphasis: string };
-      emphasis: string;
+    attention: { emphasis: string };
-    };
-    attention: {
-      emphasis: string;
-    };
     default: string;
-    success: {
+    success: { emphasis: string };
-      emphasis: string;
+    done: { emphasis: string };
-    };
-    done: {
-      emphasis: string;
-    };
     muted: string;
     translucent: string;
   };
   button: {
-    primary: {
+    primary: { fgColor: { rest: string }; bgColor: { hover: string } };
-      fgColor: {
+    danger: { fgColor: { rest: string; hover: string }; bgColor: { hover: string } };
-        accent: string;
-        rest: string;
-      };
-      bgColor: {
-        rest: string;
-        hover: string;
-      };
-    };
-    danger: {
-      fgColor: {
-        rest: string;
-        hover: string;
-      };
-      bgColor: {
-        hover: string;
-      };
-    };
   };
   control: {
-    bgColor: {
+    bgColor: { active: string; hover: string; rest: string };
-      active: string;
+    transparent: { bgColor: { active: string; hover: string; selected: string } };
-      hover: string;
-      rest: string;
-    };
-    transparent: {
-      bgColor: {
-        active: string;
-        hover: string;
-        selected: string;
-      };
-    };
-  };
-  shadow: {
-    floating: string;
-  };
-  overlay: {
-    backdrop: {
-      bgColor: string;
-    };
-  };
-  underlineNav: {
-    borderColor: {
-      active: string;
-    };
   };
+  shadow: { floating: { small: string } };
+  overlay: { backdrop: { bgColor: string } };
+  underlineNav: { borderColor: { active: string } };
   contribution: {
     default: {
-      bgColor: {
+      bgColor: { num0: string; num1: string; num2: string; num3: string; num4: string };
-        num0: string;
+      borderColor: { num0: string };
-        num1: string;
-        num2: string;
-        num3: string;
-        num4: string;
-        num5: string;
-      };
-      borderColor: {
-        num0: string;
-      };
     };
   };
 };
 
-export function defineGithubTheme(githubColor: GithubColor): Theme {
+export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | null = null): Theme {
   const console: Console = {
     fg: {
       self: githubColor.fgColor.default,
@@ -244,7 +178,7 @@ export function defineGithubTheme(githubColor: GithubColor): Theme {
     button: githubColor.control.bgColor.rest,
     codeBg: "unset",
     shadow: {
-      self: githubColor.shadow.floating,
+      self: githubColor.shadow.floating.small,
       opaque: themeVars.color.shadow.self,
     },
     secondaryBg: "unset",
@@ -323,11 +257,11 @@ export function defineGithubTheme(githubColor: GithubColor): Theme {
       },
       primary: {
         fgColor: {
-          accent: githubColor.button.primary.fgColor.accent,
+          accent: saturate(0.1, scaleColorLight(githubColor.fgColor.success, githubColor.isDarkTheme ? 10 : -10)),
           rest: githubColor.button.primary.fgColor.rest,
         },
         bgColor: {
-          rest: githubColor.button.primary.bgColor.rest,
+          rest: themeVars.github.bgColor.success.emphasis,
           hover: githubColor.button.primary.bgColor.hover,
         },
         borderColor: {
@@ -350,6 +284,9 @@ export function defineGithubTheme(githubColor: GithubColor): Theme {
       },
     },
     control: {
+      bgColor: {
+        rest: githubColor.control.bgColor.rest,
+      },
       transparent: {
         bgColor: {
           hover: githubColor.control.transparent.bgColor.hover,
@@ -374,7 +311,10 @@ export function defineGithubTheme(githubColor: GithubColor): Theme {
           num2: githubColor.contribution.default.bgColor.num2,
           num3: githubColor.contribution.default.bgColor.num3,
           num4: githubColor.contribution.default.bgColor.num4,
-          num5: githubColor.contribution.default.bgColor.num5,
+          num5: saturate(
+            0.2,
+            scaleColorLight(githubColor.contribution.default.bgColor.num4, githubColor.isDarkTheme ? 58 : -58)
+          ),
         },
         borderColor: {
           num0: githubColor.contribution.default.borderColor.num0,
@@ -387,7 +327,8 @@ export function defineGithubTheme(githubColor: GithubColor): Theme {
       },
     },
   };
-  return defineTheme({
+  return defineTheme(
+    {
       isDarkTheme: githubColor.isDarkTheme,
       primary: githubColor.fgColor.accent,
       primaryContrast: githubColor.fgColor.default,
@@ -412,5 +353,7 @@ export function defineGithubTheme(githubColor: GithubColor): Theme {
       diff,
       other,
       github,
-  });
+    },
+    chroma
+  );
 }

src/core/prettylights.ts

@@ -0,0 +1,127 @@
+import type { Chroma } from "src/types";
+
+export type prettylightsColor = {
+  syntax: {
+    brackethighlighter: { angle: string; unmatched: string };
+    carriage: { return: { bg: string; text: string } };
+    comment: string;
+    constant: string;
+    constantOtherReferenceLink: string;
+    entity: string;
+    entityTag: string;
+    invalid: { illegal: { bg: string; text: string } };
+    keyword: string;
+    markup: {
+      bold: string;
+      changed: { bg: string; text: string };
+      deleted: { bg: string; text: string };
+      heading: string;
+      ignored: { bg: string; text: string };
+      inserted: { bg: string; text: string };
+      italic: string;
+      list: string;
+    };
+    metaDiffRange: string;
+    storageModifierImport: string;
+    string: string;
+    stringRegexp: string;
+    sublimelinterGutterMark: string;
+    variable: string;
+  };
+};
+
+export function prettylights2Chroma(prettylights: prettylightsColor): Chroma {
+  return {
+    textWhiteSpace: prettylights.syntax.brackethighlighter.unmatched,
+    err: prettylights.syntax.brackethighlighter.unmatched,
+    keyword: {
+      self: prettylights.syntax.keyword,
+      constant: prettylights.syntax.constant,
+      declaration: prettylights.syntax.keyword,
+      namespace: prettylights.syntax.keyword,
+      pseudo: prettylights.syntax.constant,
+      reserved: prettylights.syntax.keyword,
+      type: prettylights.syntax.markup.bold,
+    },
+    name: {
+      self: prettylights.syntax.markup.bold,
+      attribute: prettylights.syntax.entityTag,
+      builtin: prettylights.syntax.entity,
+      builtinPseudo: prettylights.syntax.markup.bold,
+      class: prettylights.syntax.variable,
+      constant: prettylights.syntax.variable,
+      decorator: prettylights.syntax.entity,
+      entity: prettylights.syntax.variable,
+      exception: prettylights.syntax.variable,
+      function: prettylights.syntax.entity,
+      functionMagic: prettylights.syntax.entity,
+      label: prettylights.syntax.constant,
+      other: prettylights.syntax.markup.bold,
+      namespace: prettylights.syntax.markup.bold,
+      property: prettylights.syntax.constant,
+      tag: prettylights.syntax.entityTag,
+      variable: prettylights.syntax.constant,
+      variableClass: prettylights.syntax.constant,
+      variableGlobal: prettylights.syntax.constant,
+      variableInstance: prettylights.syntax.constant,
+      variableMagic: prettylights.syntax.markup.bold,
+    },
+    literal: {
+      self: prettylights.syntax.string,
+      date: prettylights.syntax.constant,
+    },
+    string: {
+      self: prettylights.syntax.string,
+      affix: prettylights.syntax.string,
+      backtick: prettylights.syntax.string,
+      char: prettylights.syntax.string,
+      delimiter: prettylights.syntax.string,
+      doc: prettylights.syntax.comment,
+      double: prettylights.syntax.string,
+      escape: prettylights.syntax.string,
+      heredoc: prettylights.syntax.string,
+      interpol: prettylights.syntax.string,
+      other: prettylights.syntax.string,
+      regex: prettylights.syntax.stringRegexp,
+      single: prettylights.syntax.string,
+      symbol: prettylights.syntax.string,
+    },
+    number: {
+      self: prettylights.syntax.constant,
+      bin: prettylights.syntax.constant,
+      float: prettylights.syntax.constant,
+      hex: prettylights.syntax.constant,
+      integer: prettylights.syntax.constant,
+      integerLong: prettylights.syntax.constant,
+      oct: prettylights.syntax.constant,
+    },
+    operator: {
+      self: prettylights.syntax.constant,
+      word: prettylights.syntax.constant,
+    },
+    punctuation: prettylights.syntax.markup.bold,
+    comment: {
+      self: prettylights.syntax.comment,
+      hashbang: prettylights.syntax.comment,
+      multiline: prettylights.syntax.comment,
+      preproc: prettylights.syntax.constant,
+      preprocFile: prettylights.syntax.constant,
+      single: prettylights.syntax.comment,
+      special: prettylights.syntax.comment,
+    },
+    generic: {
+      self: prettylights.syntax.markup.bold,
+      deleted: prettylights.syntax.markup.deleted.text,
+      emph: prettylights.syntax.markup.italic,
+      error: prettylights.syntax.invalid.illegal.text,
+      heading: prettylights.syntax.markup.heading,
+      inserted: prettylights.syntax.markup.inserted.text,
+      output: prettylights.syntax.markup.bold,
+      prompt: prettylights.syntax.markup.bold,
+      strong: prettylights.syntax.markup.bold,
+      subheading: prettylights.syntax.markup.heading,
+      traceback: prettylights.syntax.invalid.illegal.text,
+      underline: prettylights.syntax.markup.italic,
+    },
+  };
+}

src/core/theme.ts

@@ -4,15 +4,6 @@ import type { MapLeafNodes, WithOptionalLayer } from "./types";
 
 export type Theme = WithOptionalLayer<MapLeafNodes<typeof themeVars, string>>;
 
-function stringToBoolean(str: string, name: string): boolean {
-  try {
-    return JSON.parse(str);
-  } catch (error) {
-    console.error(error);
-    throw new Error(`Invalid boolean value(${name}): ${str}`);
-  }
-}
-
 export const overlayAppearDown = "overlay-appear-down";
 export const animationDown = `200ms cubic-bezier(0.33, 1, 0.68, 1) 0s 1 normal none running ${overlayAppearDown}`;
 export const overlayAppearUp = "overlay-appear-up";
@@ -42,20 +33,20 @@ const emoji = `
 `;
 
 export function createTheme(theme: Theme): void {
-  const isDarkTheme = stringToBoolean(theme.isDarkTheme, "isDarkTheme");
+  const isDarkTheme: boolean = JSON.parse(theme.isDarkTheme);
   if (isDarkTheme) {
     globalStyle(emoji, { filter: "invert(100%) hue-rotate(180deg)" });
   }
   createGlobalTheme(":root", themeVars, theme);
   createGlobalTheme(":root", otherThemeVars, {
+    border: { radius: "6px" },
+    color: {
       git: "#f05133",
       light: {
         mimicEnabled: isDarkTheme
           ? "rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled)))"
           : "rgba(0, 0, 0, calc(6 / 255 * 222 / 255 / var(--opacity-disabled)))",
       },
-    border: {
-      radius: "6px",
     },
   });
   globalStyle(":root", {
@@ -63,11 +54,11 @@ export function createTheme(theme: Theme): void {
     colorScheme: isDarkTheme ? "dark" : "light",
   });
   globalKeyframes(overlayAppearDown, {
-    "0%": { opacity: 0, transform: "translateY(-12px)" },
+    "0%": { opacity: 0, transform: "translateY(-8px)" },
     "100%": { opacity: 1, transform: "translateY(0)" },
   });
   globalKeyframes(overlayAppearUp, {
-    "0%": { opacity: 0, transform: "translateY(12px)" },
+    "0%": { opacity: 0, transform: "translateY(8px)" },
     "100%": { opacity: 1, transform: "translateY(0)" },
   });
 }

src/core/types.ts

@@ -1,8 +1,8 @@
 type Primitive = string | boolean | number | null | undefined;
 type Tokens = { [key: string]: string | Tokens };
 
+export type CSSVarFunction = `var(--${string})`;
 export type WithOptionalLayer<T extends Tokens> = T & { "@layer"?: string };
-
 export type MapLeafNodes<Obj, LeafType> = {
   [Prop in keyof Obj]: Obj[Prop] extends Primitive
     ? LeafType

src/core/vite.ts

@@ -4,7 +4,7 @@ import fs from "node:fs";
 import path from "node:path";
 import type { Plugin } from "vite";
 
-const suffix = ".css.tsx";
+const suffix = ".css.ts";
 
 /**
  * 生成主题输入
@@ -78,23 +78,41 @@ export function themePlugin(): Plugin {
       for (const [key, value] of Object.entries(bundle)) {
         // 仅为了类型检查, 逻辑上输出中全是 asset 类型
         if (value.type === "asset") {
-          const name = `${prefix}${value.names[0]}`;
+          const name = `${prefix}${key}`;
           const fileName = `${prefix}${value.fileName}`;
           const originalFileName = value.originalFileNames.pop();
           const type = value.type;
           const source = `${styles}${value.source.toString()}`;
           // 添加主题到输出
           this.emitFile({ name, fileName, source, type, originalFileName });
+          // 自动颜色主题
+          const isDark = key.endsWith("dark.css");
+          const darkName = key.replace("light.css", "dark.css");
+          const lightName = key.replace("dark.css", "light.css");
+          const autoName = `${prefix}${key.replace("dark.css", "auto.css").replace("light.css", "auto.css")}`;
+          const findTheme = isDark ? lightName : darkName;
+          if (findTheme in bundle) {
+            const lightContent = `@import "./${prefix}${lightName}" (prefers-color-scheme: light);`;
+            const darkContent = `@import "./${prefix}${darkName}" (prefers-color-scheme: dark);`;
+            this.emitFile({
+              name: autoName,
+              fileName: autoName,
+              type: "asset",
+              source: `${lightContent}\n${darkContent}`,
+            });
+          }
+          // 删除原始的样式文件, 自动颜色主题因为删除, 永远不会生成两次
           delete bundle[key];
         }
       }
     },
     writeBundle() {
+      // 上传到服务器
       const server = process.env.SSH_SERVER;
       const user = process.env.SSH_USER || "root";
-      const path = process.env.GITEA_THEME_PATH;
+      const theme_path = process.env.GITEA_THEME_PATH;
-      if (server && path) {
+      if (server && theme_path) {
-        const cmd = `scp dist/${prefix}*.css ${user}@${server}:${path}`;
+        const cmd = `scp dist/${prefix}*.css ${user}@${server}:${theme_path}`;
         console.log("[themePlugin] exec:", cmd);
         try {
           execSync(cmd, { stdio: "inherit" });
@@ -105,6 +123,7 @@ export function themePlugin(): Plugin {
       } else {
         console.log("[themePlugin] no SSH_SERVER or GITEA_THEME_PATH, skip upload");
       }
+      console.log("[themePlugin] exec end.");
     },
   };
 }

src/functions/index.ts

@@ -1 +1,2 @@
 export { scaleColorLight } from "./scss";
+export { fallbackVar } from "./var";

src/functions/var.ts

@@ -0,0 +1,13 @@
+import type { CSSVarFunction } from "src/core/types";
+
+type CSSFallbackVar = `var(--${string}, ${string})`;
+/**
+ * 设置 CSS 变量的回退值
+ * @param cssvar `var(--${string})`
+ * @param fallback
+ * @returns `var(--${string}, fallback)`
+ */
+export function fallbackVar(cssvar: CSSVarFunction, fallback: string): CSSFallbackVar {
+  const var_name = cssvar.replace("var(--", "").replace(")", "");
+  return `var(--${var_name}, ${fallback})`;
+}

src/index.ts

@@ -1,3 +1,4 @@
 export { defineTheme } from "./core/color";
-export type { Console, Diff, Other } from "./types";
+export type { Theme } from "./core/theme";
-export { themeVars } from "./types/vars";
+export type { Chroma, Console, Diff, Github, Other } from "./types";
+export { otherThemeVars, themeVars } from "./types/vars";

src/types/color/chroma.ts

@@ -0,0 +1,255 @@
+// 注释来自 AI
+export const chroma = {
+  textWhiteSpace: "text-white-space",
+  err: null,
+  keyword: {
+    /** 所有关键字
+     * @example class function var if else return
+     */
+    self: null,
+    /** 常量关键字
+     * @example true false null
+     */
+    constant: null,
+    /** 声明关键字
+     * @example var let const
+     */
+    declaration: null,
+    /** 命名空间关键字
+     * @example package import export
+     */
+    namespace: null,
+    /** 伪关键字
+     * @example this super __init__
+     */
+    pseudo: null,
+    /** 保留关键字
+     * @example yield await goto
+     */
+    reserved: null,
+    /** 类型关键字
+     * @example int float string bool
+     */
+    type: null,
+  },
+  name: {
+    /** 通用标识符 */
+    self: null,
+    /** 属性名
+     * @example obj.foo HTML/XML 属性名 id="foo"
+     */
+    attribute: null,
+    /** 内置函数/对象
+     * @example Math.PI Math.max
+     */
+    builtin: null,
+    /** 内置伪标识符
+     * @example this super self
+     */
+    builtinPseudo: null,
+    /** 类名 */
+    class: null,
+    /** 常量名 */
+    constant: null,
+    /** 装饰器 */
+    decorator: null,
+    /** 实体名
+     * @example HTML实体名 < > &
+     */
+    entity: null,
+    /** 异常类名 */
+    exception: null,
+    /** 函数名 */
+    function: null,
+    /** 魔术方法名
+     * @example __init__ __str__
+     */
+    functionMagic: null,
+    /** 对象属性 */
+    property: null,
+    /** 标签名
+     * @example 跳转标签
+     */
+    label: null,
+    /** 命名空间 */
+    namespace: null,
+    /** 其他未归类的标识符 */
+    other: null,
+    /** 标签名
+     * @example 跳转标签
+     */
+    tag: null,
+    /** 变量名 */
+    variable: null,
+    /** 类变量 */
+    variableClass: null,
+    /** 全局变量 */
+    variableGlobal: null,
+    /** 实例变量 */
+    variableInstance: null,
+    /** 魔术变量
+     * @example __name__ __doc__
+     */
+    variableMagic: null,
+  },
+  literal: {
+    /** 通用字面量 */
+    self: null,
+    /** 日期字面量
+     * @example SQL 日期
+     */
+    date: null,
+  },
+  string: {
+    /** 通用字符串 */
+    self: null,
+    /** 字符串前缀/后缀
+     * @example f"..." 的 f
+     */
+    affix: null,
+    /** 反引号字符串
+     * @example `string`
+     */
+    backtick: null,
+    /** 字符字面量
+     * @example 'a'
+     */
+    char: null,
+    /** 字符串分隔符
+     * @example 引号自身
+     */
+    delimiter: null,
+    /** 文档字符串
+     * @example """docstring"""
+     */
+    doc: null,
+    /** 双引号字符串
+     * @example "string"
+     */
+    double: null,
+    /** 转义字符
+     * @example \n \t
+     */
+    escape: null,
+    /** 定界字符串
+     * @example <<EOF EOF>>
+     */
+    heredoc: null,
+    /** 插值字符串
+     * @example ${name}
+     */
+    interpol: null,
+    /** 其他类型字符串 */
+    other: null,
+    /** 正则表达式字面量
+     * @example /^abc/
+     */
+    regex: null,
+    /** 单引号字符串
+     * @example 'string'
+     */
+    single: null,
+    /** 符号字符串
+     * @example ruby 的 :symbol
+     */
+    symbol: null,
+  },
+  number: {
+    /** 通用数字 */
+    self: null,
+    /** 二进制数字
+     * @example 0b1010
+     */
+    bin: null,
+    /** 浮点数
+     * @example 1.23
+     */
+    float: null,
+    /** 十六进制数字
+     * @example 0x123
+     */
+    hex: null,
+    /** 普通整数
+     * @example 123
+     */
+    integer: null,
+    /** 长整数
+     * @example 123L
+     */
+    integerLong: null,
+    /** 八进制数字
+     * @example 0o123
+     */
+    oct: null,
+  },
+  operator: {
+    /** 运算符
+     * @example + - * / =
+     */
+    self: null,
+    /** 单词运算符
+     * @example and or not in is
+     */
+    word: null,
+  },
+  /** 标点符号
+   * @example , . : ; ( ) [ ] { }
+   */
+  punctuation: null,
+  comment: {
+    /** 通用注释 */
+    self: null,
+    /** Hashbang 注释
+     * @example #!/bin/bash
+     */
+    hashbang: null,
+    /** 多行注释 */
+    multiline: null,
+    /** 预处理器注释
+     * @example #include <stdio.h>
+     */
+    preproc: null,
+    /** 预处理器文件注释
+     * @example 如 python 的编码声明 # -*- coding: utf-8 -*-
+     */
+    preprocFile: null,
+    /** 单行注释 */
+    single: null,
+    /** 特殊注释
+     * @example JavaDoc 的 `@param`
+     */
+    special: null,
+  },
+  generic: {
+    /** 通用文本容器 */
+    self: null,
+    /** 被删除的内容 */
+    deleted: null,
+    /** 强调文本 (斜体) */
+    emph: null,
+    /** 错误信息 */
+    error: null,
+    /** 标题
+     * @example Markdown 标题 #
+     */
+    heading: null,
+    /** 新增内容 */
+    inserted: null,
+    /** 程序输出文本 */
+    output: null,
+    /** 交互式提示符
+     * @example shell 的 $
+     */
+    prompt: null,
+    /** 强调文本 (粗体) */
+    strong: null,
+    /** 子标题
+     * @example Markdown 子标题 ##
+     */
+    subheading: null,
+    /** 堆栈跟踪信息 */
+    traceback: null,
+    /** 下划线文本 */
+    underline: null,
+  },
+};

src/types/color/github.ts

@@ -28,6 +28,8 @@ export const github = {
        * @actions `actionViewLeft` 左侧子作业激活伪元素颜色
        * @release `releaseTagMenu` 顶部栏左侧按钮激活背景色
        * @navbar `navbarRight` 头像管理员标识背景颜色
+       * @dropdown `dropdown` emoji 的悬停背景色
+       * @menu `paginationMenu` 分页菜单的激活背景色
        */
       emphasis: null,
       /** 暗淡的背景颜色
@@ -41,6 +43,7 @@ export const github = {
     success: {
       /** 成功的背景颜色
        * @issue `babel` 重新开启图标背景颜色
+       * @issue `prMerge` 合并提交的图标背景色
        */
       emphasis: null,
     },
@@ -157,6 +160,12 @@ export const github = {
     },
   },
   control: {
+    bgColor: {
+      /** 背景色
+       * @issue `timeline` 时间线标签背景色
+       */
+      rest: null,
+    },
     transparent: {
       bgColor: {
         /** 悬停色
@@ -167,6 +176,7 @@ export const github = {
          * @menu `menu` 菜单项的悬停背景颜色
          * @repo `repoHeader` 仓库标题的悬停背景颜色
          * @commit `commit` 提交信息的 Action 按钮的悬停背景颜色
+         * @filelist `repoFiles` README 栏的按钮的悬停背景颜色
          */
         hover: null,
       },
@@ -186,6 +196,7 @@ export const github = {
       /** 下划线导航栏的边框颜色
        * @clone `clone` 按钮组的按钮下划线颜色
        * @menu `secondaryMenu` 二级菜单按钮的下划线颜色
+       * @filelist `repoFiles` README 栏的左边按钮下划线颜色
        */
       active: null,
     },
@@ -193,17 +204,17 @@ export const github = {
   /** 热力图 */
   contribution: {
     default: {
+      /** 热力图方块的颜色 */
       bgColor: {
         num0: null,
         num1: null,
         num2: null,
         num3: null,
         num4: null,
-        /** github 无此颜色需自行计算
+        /** github 无此颜色需自行计算 */
-         * @example 可参考这个颜色 `--color-prettylights-syntax-string-regexp`
-         */
         num5: null,
       },
+      /** 热力图方块的内边框颜色 */
       borderColor: {
         num0: null,
         num1: null,

src/types/color/index.ts

@@ -1,3 +1,4 @@
+export { chroma } from "./chroma";
 export { ansi, console } from "./console";
 export { diff } from "./diff";
 export { github } from "./github";

src/types/color/main.ts

@@ -1,12 +1,4 @@
-const num = {
+const num = { num1: null, num2: null, num3: null, num4: null, num5: null, num6: null, num7: null };
-  num1: null,
-  num2: null,
-  num3: null,
-  num4: null,
-  num5: null,
-  num6: null,
-  num7: null,
-};
 
 const alpha = {
   num10: null,
@@ -20,33 +12,12 @@ const alpha = {
   num90: null,
 };
 
-export const primary = {
+export const primary = { self: null, contrast: null, dark: num, light: num, alpha: alpha, hover: null, active: null };
-  self: null,
-  contrast: null,
-  dark: num,
-  light: num,
-  alpha: alpha,
-  hover: null,
-  active: null,
-};
 
 export const secondary = {
   self: null,
-  dark: {
+  dark: { num8: null, num9: null, num10: null, num11: null, num12: null, num13: null, ...num },
-    num8: null,
+  light: { num1: null, num2: null, num3: null, num4: null },
-    num9: null,
-    num10: null,
-    num11: null,
-    num12: null,
-    num13: null,
-    ...num,
-  },
-  light: {
-    num1: null,
-    num2: null,
-    num3: null,
-    num4: null,
-  },
   alpha: alpha,
   button: null,
   hover: null,

src/types/color/message.ts

@@ -1,32 +1,8 @@
-const msg = {
+const msg = { bg: null, border: null, text: null };
-  bg: null,
-  border: null,
-  text: null,
-};
 
-const error = {
+const error = { ...msg, bg: { self: null, active: null, hover: null } };
-  ...msg,
+const success = { ...msg };
-  bg: {
+const warning = { ...msg };
-    self: null,
+const info = { ...msg };
-    active: null,
-    hover: null,
-  },
-};
 
-const success = {
+export const message = { error, success, warning, info };
-  ...msg,
-};
-
-const warning = {
-  ...msg,
-};
-const info = {
-  ...msg,
-};
-
-export const message = {
-  error,
-  success,
-  warning,
-  info,
-};

src/types/color/named.ts

@@ -1,11 +1,4 @@
-const baseColor = {
+const baseColor = { self: null, light: null, dark: { num1: null, num2: null } };
-  self: null,
-  light: null,
-  dark: {
-    num1: null,
-    num2: null,
-  },
-};
 
 const commitColor = {
   /** 提交哈希值颜色 */
@@ -23,26 +16,14 @@ const commitColor = {
 
 export const named = {
   /** 红色/提交警告签名颜色 */
-  red: {
+  red: { ...commitColor, ...baseColor },
-    ...commitColor,
-    ...baseColor,
-  },
   /** 橙色/提交未匹配签名颜色 */
-  orange: {
+  orange: { ...commitColor, ...baseColor },
-    ...commitColor,
-    ...baseColor,
-  },
   /** 黄色/提交未信任签名颜色 */
-  yellow: {
+  yellow: { ...commitColor, ...baseColor },
-    ...commitColor,
-    ...baseColor,
-  },
   olive: baseColor,
   /** 绿色/提交信任签名颜色 */
-  green: {
+  green: { ...commitColor, ...baseColor },
-    ...commitColor,
-    ...baseColor,
-  },
   teal: baseColor,
   blue: baseColor,
   violet: baseColor,
@@ -50,10 +31,7 @@ export const named = {
   pink: baseColor,
   brown: baseColor,
   black: baseColor,
-  grey: {
+  grey: { self: null, light: null },
-    self: null,
-    light: null,
-  },
   gold: null,
   white: null,
 };

src/types/index.ts

@@ -1,6 +1,8 @@
 import type { MapLeafNodes } from "src/core/types";
 import * as color from "./color";
 
+/** 代码高亮色 */
+export type Chroma = MapLeafNodes<typeof color.chroma, string>;
 /** 主色调(强调色) */
 export type Primary = MapLeafNodes<typeof color.primary, string>;
 /** 副色调(边框色) */

src/types/vars.ts

@@ -1,17 +1,21 @@
 import { createGlobalThemeContract } from "@vanilla-extract/css";
 import * as color from "./color";
 
-export function varMapper(value: string | null, path: string[]) {
+function varMapper(prefix: string | null = null) {
+  return (value: string | null, path: string[]) => {
     if (value === null) {
       path = path.filter(item => item !== "self");
       path = path.map(item => item.replace(/^num/, ""));
-    return path.join("-");
+      value = path.join("-");
     }
+    if (prefix) value = `${prefix}-${value}`;
     return value;
+  };
 }
 
 const vars = {
   isDarkTheme: "is-dark-theme",
+  chroma: color.chroma,
   color: {
     ...color.other,
     ...color.message,
@@ -26,14 +30,17 @@ const vars = {
   github: color.github,
 };
 
-const otherVars = {
+const otherVars = { border: { radius: null }, color: { ...color.otherAuto } };
-  border: {
+
-    radius: null,
+const customVars = {
-  },
+  cloneMenuWidth: "clone-menu-width",
-  ...color.otherAuto,
+  explore: { repolistColumns: "explore-repolist-columns", userlistColumns: "explore-userlist-columns" },
+  userRepolistColumns: "user-repolist-columns",
+  org: { repolistColumns: "org-repolist-columns", userlistColumns: "org-userlist-columns" },
 };
 
-export const themeVars = createGlobalThemeContract(vars, varMapper);
+export const themeVars = createGlobalThemeContract(vars, varMapper());
-export const otherThemeVars = createGlobalThemeContract(otherVars, varMapper);
+export const otherThemeVars = createGlobalThemeContract(otherVars, varMapper());
+export const customThemeVars = createGlobalThemeContract(customVars, varMapper("custom"));
 
 export { css } from "@linaria/core";

styles/components/actions.ts

@@ -1,3 +1,4 @@
+import { animationDown } from "src/core/theme";
 import { css, otherThemeVars, themeVars } from "src/types/vars";
 
 // 仓库 Actions 页面
@@ -57,6 +58,7 @@ export const actions = css`
         .run-list-ref {
           background-color: ${themeVars.github.bgColor.accent.muted};
           color: ${themeVars.github.fgColor.accent};
+          font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace);
           font-weight: 400;
           &:hover {
             background-color: ${themeVars.github.bgColor.accent.muted};
@@ -132,6 +134,7 @@ export const actionViewHeader = css`
       .ui.label {
         background-color: ${themeVars.github.bgColor.accent.muted};
         color: ${themeVars.github.fgColor.accent};
+        font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace);
         font-weight: 400;
         > a {
           opacity: 1;
@@ -200,7 +203,7 @@ export const actionViewRight = css`
 
     .job-info-header {
       padding: 16px 12px 16px 24px;
-      height: auto;
+      height: 80px;
 
       .job-info-header-title {
         color: ${themeVars.github.fgColor.accent};
@@ -212,10 +215,16 @@ export const actionViewRight = css`
     }
 
     .job-step-container {
+      // 步骤标题
       .job-step-summary {
         color: ${themeVars.color.console.fg.subtle};
         padding: 8px 10px;
 
+        &.selected {
+          // 滚动时固定在顶部的高度与 job-info-header 高度相同
+          top: 80px;
+        }
+
         &.step-expandable:hover {
           color: ${themeVars.color.console.fg.subtle};
         }
@@ -238,6 +247,9 @@ export const actionViewRight = css`
           }
         }
       }
+      // 步骤日志
+      .job-step-logs {
+        animation: ${animationDown};
         /* 日志字体颜色白色 */
         .job-log-line {
           color: ${themeVars.color.console.fg.self};
@@ -248,4 +260,5 @@ export const actionViewRight = css`
         }
       }
     }
+  }
 `;

styles/components/clone.ts

@@ -1,4 +1,4 @@
-import { css, otherThemeVars, themeVars } from "src/types/vars";
+import { css, customThemeVars, otherThemeVars, themeVars } from "src/types/vars";
 
 // 克隆按钮的弹窗
 export const clone = css`
@@ -52,7 +52,9 @@ export const clone = css`
           border: 1px solid ${themeVars.color.light.border};
           border-radius: ${otherThemeVars.border.radius};
           font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace);
-          width: 332px;
+          min-width: 150px;
+          max-width: 400px;
+          width: ${customThemeVars.cloneMenuWidth};
           &:hover {
             border: 1px solid ${themeVars.color.light.border};
             border-radius: ${otherThemeVars.border.radius};

styles/components/commit.ts

@@ -8,7 +8,7 @@ export const commit = css`
       // 作者
       .author {
         // 作者名称
-        a.author-wrapper {
+        .author-wrapper {
           color: ${themeVars.color.text.light.num1};
         }
       }

styles/components/diff.ts

@@ -29,11 +29,12 @@ export const diff = css`
   }
   /* 展开/收缩按钮 */
   .code-expander-button {
-    height: 24px !important;
+    color: ${themeVars.color.text.light.num1};
-    line-height: 24px;
+    height: 28px !important;
 
     &:hover {
       background: ${themeVars.github.bgColor.accent.emphasis};
+      color: ${themeVars.color.white};
     }
   }
   /* 行号居中 */

styles/components/explore.ts

@@ -0,0 +1,164 @@
+import { fallbackVar } from "src/functions";
+import { css, customThemeVars, otherThemeVars, themeVars } from "src/types/vars";
+
+const userRepoVar = fallbackVar(customThemeVars.userRepolistColumns, "2");
+const exploreRepoVar = fallbackVar(customThemeVars.explore.repolistColumns, "2");
+const orgRepoVar = fallbackVar(customThemeVars.org.repolistColumns, "1");
+
+// 仓库列表
+export const repoList = css`
+  // 组织
+  .page-content.organization.profile > .ui.container > .ui.stackable > .ui.eleven,
+  // 用户
+  .page-content.user.profile > .ui.container > .ui.stackable > .ui.twelve,
+  // 探索
+  .page-content.explore.repositories > .ui.container {
+    // 排除用户的公开活动页
+    > .flex-list:not(#activity-feed) {
+      display: grid;
+      > .flex-item {
+        border: 1px solid ${themeVars.color.light.border};
+        border-radius: ${otherThemeVars.border.radius};
+        padding: 16px;
+        // 仓库头像
+        > .flex-item-leading {
+          img,
+          svg {
+            color: ${themeVars.color.text.light.num1};
+          }
+        }
+        // 仓库信息
+        > .flex-item-main {
+          // 仓库标题
+          > .flex-item-header {
+            // 仓库名称
+            > .flex-item-title {
+              gap: 8px;
+              // 仓库中间的间隔线
+              &:not(a) {
+                color: ${themeVars.color.text.light.num1};
+              }
+              // 仓库类型和状态标签
+              > .label-list .label {
+                padding: 3px 6px;
+              }
+            }
+            // 仓库语言, 星标
+            > .flex-item-trailing {
+              color: ${themeVars.color.text.light.num1};
+              gap: 16px;
+              font-size: 12px;
+              > .flex-text-inline .color-icon {
+                width: 12px;
+                height: 12px;
+                margin-right: 0 !important;
+              }
+            }
+          }
+          // 描述和更新时间
+          > .flex-item-body {
+            margin-top: 8px;
+            // 更新时间
+            &:last-child {
+              font-size: 12px;
+            }
+          }
+          // 主题标签
+          > .label-list {
+            margin-top: 8px;
+          }
+        }
+      }
+    }
+  }
+  // 仓库列表列数
+  // 组织
+  .page-content.organization.profile > .ui.container > .ui.stackable > .ui.eleven > .flex-list {
+    grid-template-columns: repeat(${orgRepoVar}, 1fr);
+    gap: min(${orgRepoVar} * 8px, 16px);
+  }
+  // 用户
+  // 排除用户的公开活动页
+  .page-content.user.profile > .ui.container > .ui.stackable > .ui.twelve > .flex-list:not(#activity-feed) {
+    grid-template-columns: repeat(${userRepoVar}, 1fr);
+    gap: min(${userRepoVar} * 8px, 16px);
+  }
+  // 探索
+  .page-content.explore.repositories > .ui.container > .flex-list {
+    grid-template-columns: repeat(${exploreRepoVar}, 1fr);
+    gap: min(${exploreRepoVar} * 8px, 16px);
+  }
+`;
+
+const exploreUserVar = fallbackVar(customThemeVars.explore.userlistColumns, "3");
+const orgUserVar = fallbackVar(customThemeVars.org.userlistColumns, "2");
+
+// 用户列表
+export const userList = css`
+  // 组织
+  .page-content.organization.members > .ui.container,
+  // 探索的用户和组织
+  .page-content.explore.users > .ui.container {
+    > .flex-list {
+      display: grid;
+      > .flex-item {
+        border: 1px solid ${themeVars.color.light.border};
+        border-radius: ${otherThemeVars.border.radius};
+        padding: 16px;
+        > .flex-item-main {
+          // 用户名称
+          > .flex-item-title {
+            gap: 8px;
+            margin-bottom: 8px;
+            // 用户标签
+            > .label {
+              font-size: 12px;
+              padding: 3px 6px;
+            }
+          }
+          // 用户描述
+          > .flex-item-body {
+            font-size: 12px;
+            svg {
+              width: 12px;
+              min-width: 12px;
+            }
+          }
+        }
+      }
+    }
+  }
+  // 用户列表列数
+  // 组织
+  .page-content.organization.members > .ui.container > .flex-list {
+    grid-template-columns: repeat(${orgUserVar}, 1fr);
+    gap: min(${orgUserVar} * 8px, 16px);
+  }
+  // 探索的用户和组织
+  .page-content.explore.users > .ui.container > .flex-list {
+    grid-template-columns: repeat(${exploreUserVar}, 1fr);
+    gap: min(${exploreUserVar} * 8px, 16px);
+  }
+`;
+
+// 手机下的仓库和用户列表
+export const mobileList = css`
+  @media (max-width: 767.98px) {
+    // 组织的仓库列表
+    .page-content.organization.profile > .ui.container > .ui.stackable > .ui.eleven,
+    // 用户的仓库列表
+    .page-content.user.profile > .ui.container > .ui.stackable > .ui.twelve,
+    // 探索的仓库列表
+    .page-content.explore.repositories > .ui.container,
+    // 组织的成员列表
+    .page-content.organization.members >.ui.container,
+    // 探索的用户和组织列表
+    .page-content.explore.users >.ui.container {
+      // 排除用户的公开活动页
+      > .flex-list:not(#activity-feed) {
+        grid-template-columns: 1fr;
+        gap: 8px;
+      }
+    }
+  }
+`;

styles/components/filelist.ts

@@ -1,4 +1,4 @@
-import { css, themeVars } from "src/types/vars";
+import { css, otherThemeVars, themeVars } from "src/types/vars";
 
 // 文件列表页面下的分支按钮
 export const branchButton = css`
@@ -16,12 +16,15 @@ export const branchButton = css`
   }
 `;
 
-// 仓库按钮
+// 仓库同步派生
-export const repoButton = css`
+export const syncFork = css`
   .page-content.repository.file.list {
-    // clone 按钮调整
+    .repo-home-filelist > .ui.message {
-    .repo-button-row .repo-button-row-right .ui.primary.button span {
+      background: ${themeVars.color.box.header};
-      margin: 0px 3px;
+      padding: 8px 8px 8px 16px;
+      .ui.button {
+        min-width: 96px;
+      }
     }
   }
 `;
@@ -72,6 +75,7 @@ export const repoFiles = css`
       // 文件列表
       .repo-file-item {
         .repo-file-cell {
+          height: 40px;
           &.name {
             display: flex;
             align-items: center;
@@ -84,6 +88,39 @@ export const repoFiles = css`
         }
       }
     }
+    #readme {
+      .file-header {
+        background: ${themeVars.color.body};
+        svg {
+          color: ${themeVars.color.text.light.num1};
+        }
+        .file-header-left {
+          padding: 6px 8px !important;
+          &:hover {
+            background: ${themeVars.github.control.transparent.bgColor.hover};
+            border-radius: ${otherThemeVars.border.radius};
+          }
+          &:after {
+            content: "";
+            background: ${themeVars.github.underlineNav.borderColor.active};
+            border-radius: ${otherThemeVars.border.radius};
+            bottom: 0;
+            height: 2px;
+            position: absolute;
+            left: 12px;
+            width: 113px;
+          }
+          a.muted:hover {
+            color: inherit;
+            text-decoration-line: none;
+          }
+        }
+        .file-header-right:hover {
+          background: ${themeVars.github.control.transparent.bgColor.hover};
+          border-radius: ${otherThemeVars.border.radius};
+        }
+      }
+    }
   }
 `;
 
@@ -107,6 +144,29 @@ export const repoFilesMobile = css`
   }
 `;
 
+// 仓库打开文件时的视图
+export const repoFileView = css`
+  .page-content.repository.file.list {
+    .repo-view-container {
+      // 右侧文件视图内容
+      .repo-view-content {
+        // 头部提交信息
+        #repo-file-commit-box {
+          padding: 8px 12px;
+          > .latest-commit {
+            gap: 8px;
+          }
+          // 右侧提交时间
+          > .age {
+            display: flex;
+            align-items: center;
+          }
+        }
+      }
+    }
+  }
+`;
+
 // 仓库代码布局调整, 侧边栏宽度调整
 export const repoGrid = css`
   .repo-grid-filelist-sidebar {
@@ -198,7 +258,7 @@ export const repoSidebarBottom = css`
         .color-icon {
           height: 8px;
           width: 8px;
-          margin-right: 6px;
+          margin-right: 8px;
         }
         .tw-font-semibold {
           color: ${themeVars.color.text.self};

styles/components/index.ts

@@ -3,9 +3,11 @@ import "./clone";
 import "./commit";
 import "./dashboard";
 import "./diff";
+import "./explore";
 import "./filelist";
 import "./heatmap";
 import "./issue";
+import "./signin";
 import "./newrepo";
 import "./release";
 import "./repo";

styles/components/issue.ts

@@ -0,0 +1,332 @@
+import { css, otherThemeVars, themeVars } from "src/types/vars";
+import { activeItemAfterStyle } from "styles/public/menu";
+
+export const button = css`
+  .issue-content-left .field.footer {
+    // 关闭工单按钮
+    .ui.red.basic.button#status-button {
+      color: ${themeVars.github.fgColor.done};
+      background-color: ${themeVars.color.button};
+      border-color: ${themeVars.color.light.border};
+      &:hover {
+        background-color: ${themeVars.color.hover.self};
+      }
+    }
+
+    // 重新开启按钮
+    .ui.basic.primary.button#status-button {
+      color: ${themeVars.github.fgColor.success};
+    }
+  }
+`;
+
+export const babel = css`
+  .issue-content-left {
+    .badge {
+      // 时间线打开状态标签
+      &.tw-bg-green {
+        background-color: ${themeVars.github.bgColor.success.emphasis} !important;
+      }
+      // 时间线关闭状态标签
+      &.tw-bg-red {
+        background-color: ${themeVars.github.bgColor.done.emphasis} !important;
+      }
+      // 时间线合并状态标签
+      &.tw-bg-purple {
+        background-color: ${themeVars.github.bgColor.done.emphasis} !important;
+      }
+    }
+  }
+  // 工单&PR状态标签
+  .ui.label.issue-state-label {
+    border-radius: 25px !important;
+
+    &.green {
+      color: ${themeVars.color.white} !important;
+      background-color: ${themeVars.github.bgColor.success.emphasis} !important;
+      border-color: ${themeVars.github.bgColor.success.emphasis} !important;
+    }
+
+    &.red {
+      color: ${themeVars.color.white} !important;
+      background-color: ${themeVars.github.bgColor.done.emphasis} !important;
+      border-color: ${themeVars.github.bgColor.done.emphasis} !important;
+    }
+
+    &.purple {
+      color: ${themeVars.color.white} !important;
+      background-color: ${themeVars.github.bgColor.done.emphasis} !important;
+      border-color: ${themeVars.github.bgColor.done.emphasis} !important;
+    }
+  }
+`;
+
+// PR 分支标签
+export const prBranch = css`
+  .repository.view.issue .pull-desc code,
+  #issue-list .flex-item-body .branches .branch {
+    color: ${themeVars.github.fgColor.accent};
+    background-color: ${themeVars.github.bgColor.accent.muted};
+    border-radius: ${otherThemeVars.border.radius};
+    font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace);
+    font-size: 12px;
+    padding: 0 5px;
+    line-height: 20px;
+  }
+
+  .repository.view.issue .pull-desc code {
+    padding-top: 3px;
+    padding-bottom: 3px;
+    a:hover {
+      text-decoration-line: none;
+    }
+  }
+`;
+
+// 评论
+export const comment = css`
+  .comment .comment-container {
+    // 去除评论标题左侧指向头像的小箭头
+    .comment-header,
+    &:target .comment-header {
+      &:before,
+      &:after {
+        display: none;
+      }
+    }
+    // 评论焦点样式
+    &:target {
+      .comment-container {
+        border-color: ${themeVars.github.borderColor.accent.emphasis} !important;
+        box-shadow: 0 0 0 1px ${themeVars.color.primary.self} !important;
+      }
+    }
+    .comment-header {
+      padding: 4px 4px 4px 16px;
+    }
+    .comment-header-right {
+      > .item,
+      > .label {
+        color: ${themeVars.color.text.light.num1};
+      }
+      > .ui.label {
+        background-color: initial;
+        font-size: 12px;
+        height: 20px;
+        padding: 0 6px;
+      }
+      // 隐藏顶部菜单的表情按钮
+      // 无法使用此样式, 评论无表情时底部的表情按钮元素不会渲染, 这是一个先有鸡还是先有蛋的问题
+      // 很蛋疼, 希望 Gitea 早日使用 Github 的样式, 因为 Github 的更合理, 无论是操作的方便程度还是按钮的冗余度
+      // .ui.dropdown.action.select-reaction {
+      //   display: none;
+      // }
+      .context-dropdown {
+        a.context-menu {
+          display: flex;
+          align-items: center;
+        }
+        // 评论菜单的删除按钮
+        .menu .item.delete-comment {
+          color: ${themeVars.color.red.self};
+          &:hover {
+            background-color: ${themeVars.color.red.badge.bg} !important;
+            color: ${themeVars.color.red.light};
+          }
+        }
+      }
+    }
+    // 表情菜单按钮头部+底部
+    .ui.dropdown.action.select-reaction > a {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background: ${themeVars.color.button};
+      border-radius: 25px;
+      border: 1px solid ${themeVars.color.light.border};
+      color: ${themeVars.color.text.light.num1};
+      padding: 0px 8px !important;
+      height: 28px;
+      width: 28px;
+    }
+    // 底部表情栏
+    .bottom-reactions {
+      .ui.ui.ui.label {
+        background-color: unset !important;
+        border-radius: 25px;
+        border-color: ${themeVars.color.light.border};
+        &:hover {
+          background-color: ${themeVars.color.reaction.hoverBg} !important;
+          border-color: ${themeVars.color.light.border};
+        }
+        .reaction {
+          font-size: 12px;
+        }
+        .reaction-count {
+          color: ${themeVars.color.text.light.self};
+          font-weight: 500;
+          margin-left: 0;
+        }
+      }
+      // 显示表情菜单按钮
+      .select-reaction {
+        padding: 0;
+        // 两个表情按钮看着怪怪的, 很难受
+        // visibility: visible;
+      }
+    }
+  }
+`;
+
+export const dropdown = css`
+  .repository {
+    // Issue/PR 列表下的所有筛选菜单
+    &.issue-list .ui.dropdown .menu, .ui.menu .ui.dropdown .menu,
+    // Issue/PR 详情下的右侧的上半部分选项菜单
+    &.issue.view .issue-content-right .ui.dropdown .scrolling.menu {
+      .item:hover:after {
+        content: "";
+        ${activeItemAfterStyle}
+      }
+    }
+  }
+`;
+
+// PR 界面的 PR 操作评论
+export const prMerge = css`
+  .repository.view.issue .comment-list .timeline-item.pull-merge-box {
+    // 头像
+    .timeline-avatar {
+      color: ${themeVars.color.text.self} !important;
+      border-radius: ${otherThemeVars.border.radius};
+      width: 40px;
+      height: 40px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      svg {
+        width: 24px;
+        height: 24px;
+      }
+      // 可以合并
+      &.green {
+        background-color: ${themeVars.github.bgColor.success.emphasis};
+        // 操作评论边框色
+        + .content > .ui.attached.segment {
+          border-left-color: ${themeVars.github.bgColor.success.emphasis};
+          border-right-color: ${themeVars.github.bgColor.success.emphasis};
+          &:first-child {
+            border-top-color: ${themeVars.github.bgColor.success.emphasis};
+          }
+          &:last-child {
+            border-bottom-color: ${themeVars.github.bgColor.success.emphasis};
+          }
+        }
+      }
+      // 已合并
+      &.purple {
+        background-color: ${themeVars.github.bgColor.done.emphasis};
+        + .content > .ui.attached.segment {
+          border-left-color: ${themeVars.github.bgColor.done.emphasis};
+          border-right-color: ${themeVars.github.bgColor.done.emphasis};
+          &:first-child {
+            border-top-color: ${themeVars.github.bgColor.done.emphasis};
+          }
+          &:last-child {
+            border-bottom-color: ${themeVars.github.bgColor.done.emphasis};
+          }
+        }
+      }
+    }
+    // 检查状态
+    .commit-status-panel {
+      .commit-status-header {
+        background: ${themeVars.color.body};
+        padding: 16px;
+        font-size: 16px;
+        font-weight: 600;
+        .ui.right {
+          color: ${themeVars.color.text.light.num1};
+          font-size: 14px;
+          font-weight: 400;
+        }
+      }
+      // 检查状态列表
+      .commit-status-list {
+        background: ${themeVars.color.menu};
+        .commit-status-item {
+          border-radius: ${otherThemeVars.border.radius};
+          padding: 2px 8px;
+          margin: 0px 8px;
+          height: 37px;
+          &:first-child {
+            margin-top: 8px;
+          }
+          &:last-child {
+            margin-bottom: 8px;
+          }
+          &:hover {
+            background-color: ${themeVars.color.hover.opaque};
+          }
+        }
+      }
+    }
+    // 合并信息和操作
+    .merge-section {
+      color: ${themeVars.color.text.light.num1};
+      padding: 16px;
+      display: grid;
+      gap: 8px;
+    }
+  }
+`;
+
+// 时间线
+export const timeline = css`
+  .repository.view.issue {
+    .comment-list {
+      .timeline-item,
+      .timeline-item-group {
+        padding: 16px 0;
+        // 事件
+        &.event {
+          // 修复覆盖后的位置问题
+          padding-left: 15px;
+          .avatar {
+            width: 20px;
+            height: 20px;
+          }
+          .badge {
+            border: 2px solid ${themeVars.color.body};
+          }
+          // 仅匹配只有 badge
+          .badge:not([class*=" "]) {
+            background-color: ${themeVars.github.control.bgColor.rest};
+            svg {
+              color: ${themeVars.color.text.light.num1};
+            }
+          }
+        }
+        // 提交
+        &.commits-list {
+          // 每个提交之间的间隔
+          .flex-text-block {
+            padding-top: 4px;
+          }
+          .badge svg {
+            color: ${themeVars.color.text.light.num1};
+          }
+          // 仅覆盖左侧 commit 不覆盖右侧 SHA
+          a.muted {
+            font-size: 12px;
+            color: ${themeVars.color.text.light.num1};
+            text-decoration-line: underline;
+            &:hover {
+              color: ${themeVars.color.primary.self};
+            }
+          }
+        }
+      }
+    }
+  }
+`;

styles/components/issue.tsx

@@ -1,123 +0,0 @@
-import { css, themeVars } from "src/types/vars";
-import { activeItemAfterStyle } from "styles/public/menu";
-
-export const button = css`
-  .issue-content-left .field.footer {
-    // 关闭工单按钮
-    .ui.red.basic.button#status-button {
-      color: ${themeVars.github.fgColor.done};
-      background-color: ${themeVars.color.button};
-      border-color: ${themeVars.color.light.border};
-      &:hover {
-        background-color: ${themeVars.color.hover.self};
-      }
-    }
-
-    // 重新开启按钮
-    .ui.basic.primary.button#status-button {
-      color: ${themeVars.github.fgColor.success};
-    }
-  }
-`;
-
-export const babel = css`
-  .issue-content-left {
-    .badge {
-      // 时间线打开状态标签
-      &.tw-bg-green {
-        background-color: ${themeVars.github.bgColor.success.emphasis} !important;
-        border-color: ${themeVars.github.bgColor.success.emphasis} !important;
-      }
-      // 时间线关闭状态标签
-      &.tw-bg-red {
-        background-color: ${themeVars.github.bgColor.done.emphasis} !important;
-        border-color: ${themeVars.github.bgColor.done.emphasis} !important;
-      }
-      // 时间线合并状态标签
-      &.tw-bg-purple {
-        background-color: ${themeVars.github.bgColor.done.emphasis} !important;
-        border-color: ${themeVars.github.bgColor.done.emphasis} !important;
-      }
-    }
-  }
-  // 工单&PR状态标签
-  .ui.label.issue-state-label {
-    border-radius: 25px !important;
-
-    &.green {
-      color: ${themeVars.color.text.self} !important;
-      background-color: ${themeVars.github.bgColor.success.emphasis} !important;
-      border-color: ${themeVars.github.bgColor.success.emphasis} !important;
-    }
-
-    &.red {
-      color: ${themeVars.color.text.self} !important;
-      background-color: ${themeVars.github.bgColor.done.emphasis} !important;
-      border-color: ${themeVars.github.bgColor.done.emphasis} !important;
-    }
-
-    &.purple {
-      color: ${themeVars.color.text.self} !important;
-      background-color: ${themeVars.github.bgColor.done.emphasis} !important;
-      border-color: ${themeVars.github.bgColor.done.emphasis} !important;
-    }
-  }
-`;
-
-// PR 分支标签
-export const prBranch = css`
-  .repository.view.issue .pull-desc code,
-  #issue-list .flex-item-body .branches .branch {
-    color: ${themeVars.github.fgColor.accent};
-    background-color: ${themeVars.github.bgColor.accent.muted};
-    font-size: 12px;
-    padding: 0 5px;
-  }
-`;
-
-// 评论
-export const comment = css`
-  .comment {
-    // 去除评论标题左侧指向头像的小箭头
-    .comment-header,
-    &:target .comment-header {
-      &:before,
-      &:after {
-        display: none;
-      }
-    }
-    // 评论焦点样式
-    &:target {
-      .comment-container {
-        border-color: ${themeVars.github.borderColor.accent.emphasis} !important;
-        box-shadow: 0 0 0 1px ${themeVars.color.primary.self} !important;
-      }
-    }
-    .comment-header-right {
-      .context-dropdown {
-        // 评论菜单的删除按钮
-        .menu .item.delete-comment {
-          color: ${themeVars.color.red.self};
-          &:hover {
-            background-color: ${themeVars.color.red.badge.bg} !important;
-            color: ${themeVars.color.red.light};
-          }
-        }
-      }
-    }
-  }
-`;
-
-export const dropdown = css`
-  .repository {
-    // Issue/PR 列表下的所有筛选菜单
-    &.issue-list .ui.dropdown .menu, .ui.menu .ui.dropdown .menu,
-    // Issue/PR 详情下的右侧的上半部分选项菜单
-    &.issue.view .issue-content-right .ui.dropdown .scrolling.menu {
-      .item:hover:after {
-        content: "";
-        ${activeItemAfterStyle}
-      }
-    }
-  }
-`;

styles/components/release.ts

@@ -11,6 +11,7 @@ export const releaseTagMenu = css`
           font-weight: 500;
           &.active {
             background: ${themeVars.github.bgColor.accent.emphasis} !important;
+            color: ${themeVars.color.white};
           }
         }
       }
@@ -101,6 +102,8 @@ export const rightButton = css`
     &.tags {
       .ui.small.button {
         background-color: ${themeVars.color.button};
+        border-color: ${themeVars.color.light.border};
+        color: ${themeVars.color.text.light.self};
         padding: 5px 16px;
         min-height: auto;
         line-height: 20px;

styles/components/repo.ts

@@ -6,10 +6,6 @@ export const repoHeader = css`
     // 点星/关注/克隆/RSS 按钮
     .ui.compact.button {
       padding: 3px 12px;
-      // 文本跟图标间隔, 文本在手机下不显示
-      span {
-        margin-left: 0.5rem;
-      }
     }
     // 仓库图标
     img.ui.avatar {
@@ -78,18 +74,19 @@ export const repoMenu = css`
 
 export const repoTopic = css`
   // 理应只能覆盖探索/组织/用户下仓库的 topic 标签
-  .label-list .ui.label,
+  // 避免渲染到仓库的类型标签
+  .flex-item-main > .label-list .ui.label,
   // 仓库文件列表下的 topic 标签
   #repo-topics .ui.label.repo-topic {
     border-radius: 25px;
     font-size: 12px;
+    font-weight: 500;
     padding: 5px 10px;
-    margin: 0px 1.5px 3.5px 0px;
     background-color: ${themeVars.github.bgColor.accent.muted};
     color: ${themeVars.github.fgColor.accent};
     &:hover {
       background-color: ${themeVars.github.bgColor.accent.emphasis};
-      color: ${themeVars.color.text.self};
+      color: ${themeVars.color.white};
     }
   }
 `;

styles/components/setting.ts

@@ -76,33 +76,3 @@ export const label = css`
     }
   }
 `;
-
-// 设置右面板的内容
-export const content = css`
-  .user-main-content,
-  .repo-setting-content,
-  .user-setting-content,
-  .org-setting-content,
-  .admin-setting-content {
-    .ui.top.attached.header {
-      border: 0;
-      font-size: 1.5rem;
-      font-weight: 400;
-      background-color: unset !important;
-      margin-bottom: 0.25rem;
-    }
-
-    .ui.attached.segment {
-      background-color: unset;
-      border-radius: 0.5rem !important;
-    }
-
-    .ui.attached.segment:not(.error) {
-      border: 1px solid ${themeVars.color.light.border} !important;
-    }
-
-    .ui.attached.segment.error {
-      border: 1px solid ${themeVars.color.error.border} !important;
-    }
-  }
-`;

styles/components/signin.ts

@@ -0,0 +1,49 @@
+import { css } from "src/types/vars";
+
+// 注册/登录界面
+export const signIn = css`
+  .page-content.user.signin {
+    .ui.grid > .column {
+      width: 384px;
+      padding: 16px;
+      > .ui.container {
+        max-width: unset;
+      }
+    }
+    .ui.top.attached.header {
+      border: 0;
+      font-size: 20px;
+      font-weight: 600;
+      background-color: unset !important;
+      margin-bottom: 0.25rem;
+    }
+
+    .ui.attached.segment {
+      border: 0;
+      padding: 16px 0 0 0;
+      .field:not(.inline) {
+        label {
+          font-size: 14px;
+          font-weight: 600;
+        }
+        input {
+          background: unset;
+          padding: 5px 12px;
+          height: 40px;
+          font-size: 16px;
+        }
+      }
+      .button {
+        height: 40px;
+      }
+    }
+    .ui.top.attached.header.segment {
+      font-size: 14px;
+      font-weight: 400;
+      gap: 16px;
+      .signin-passkey {
+        font-weight: 500;
+      }
+    }
+  }
+`;

styles/public/attached.ts

@@ -0,0 +1,35 @@
+import { css, themeVars, otherThemeVars } from "src/types/vars";
+
+export const attached = css`
+  // 设置右面板的内容
+  .user-main-content,
+  .repo-setting-content,
+  .user-setting-content,
+  .org-setting-content,
+  .admin-setting-content,
+  // 新建页面内容
+  .page-content.repository.new-repo,
+  .page-content.repository.new.migrate,
+  .page-content.organization.new.org {
+    .ui.top.attached.header {
+      border: 0;
+      font-size: 20px;
+      font-weight: 400;
+      background-color: unset !important;
+      margin-bottom: 0.25rem;
+    }
+
+    .ui.attached.segment {
+      background-color: unset;
+      border-radius: ${otherThemeVars.border.radius} !important;
+    }
+
+    .ui.attached.segment:not(.error) {
+      border: 1px solid ${themeVars.color.light.border} !important;
+    }
+
+    .ui.attached.segment.error {
+      border: 1px solid ${themeVars.color.error.border} !important;
+    }
+  }
+`;

styles/public/button.ts

@@ -18,16 +18,27 @@ export const baseButton = css`
     min-height: 30px;
     font-weight: 500;
     padding: 9px 16px;
+    &.ui {
+      gap: 8px;
+    }
   }
   .ui.button:not(.primary):not(.red) svg {
     color: ${themeVars.color.text.light.num1};
   }
-  .ui.primary.button {
+  // 主色调按钮保持白色
+  .ui.primary.buttons .button svg {
+    color: ${themeVars.color.text.self};
+  }
+  .ui.primary {
+    &.button,
+    // 按钮组, PR 里的压缩合并按钮
+    &.buttons .button {
       ${primaryStyle}
       &:hover {
         ${primaryHoverStyle}
       }
     }
+  }
   // 主色调基本按钮和普通按钮一样
   // 作者的关注按钮
   .ui.basic.primary.button {

styles/public/chroma.ts

@@ -0,0 +1,286 @@
+import { css, themeVars } from "src/types/vars";
+
+// https://github.com/go-gitea/gitea/blob/main/web_src/css/chroma/base.css
+export const chromaBase = css`
+  .chroma {
+    // LineTableTD
+    .lntd {
+      vertical-align: top;
+      padding: 0;
+      margin: 0;
+      border: 0;
+    }
+    // LineTable
+    .lntable {
+      border-spacing: 0;
+      padding: 0;
+      margin: 0;
+      border: 0;
+      width: auto;
+      overflow: auto;
+      display: block;
+    }
+    // LineHighlight
+    .hl {
+      display: block;
+      width: 100%;
+    }
+    // LineNumbersTable
+    .lnt,
+    // LineNumbers
+    .ln {
+      margin-right: 0.4em;
+      padding: 0 0.4em;
+    }
+    // GenericStrong
+    .gs {
+      font-weight: var(--font-weight-semibold);
+    }
+    // GenericUnderline
+    .gl {
+      text-decoration: underline;
+    }
+  }
+`;
+
+// https://github.com/alecthomas/chroma/blob/6428fb4e65f3c1493491571c8a6a8f1add1da822/types.go#L208
+export const chromaCode = css`
+  .chroma {
+    // TextWhiteSpace
+    .w {
+      color: ${themeVars.chroma.textWhiteSpace};
+    }
+    // Error
+    .err {
+      color: ${themeVars.chroma.err};
+    }
+    // Keyword
+    .k {
+      color: ${themeVars.chroma.keyword.self};
+    }
+    .kc {
+      color: ${themeVars.chroma.keyword.constant};
+    }
+    .kd {
+      color: ${themeVars.chroma.keyword.declaration};
+    }
+    .kn {
+      color: ${themeVars.chroma.keyword.namespace};
+    }
+    .kp {
+      color: ${themeVars.chroma.keyword.pseudo};
+    }
+    .kr {
+      color: ${themeVars.chroma.keyword.reserved};
+    }
+    .kt {
+      color: ${themeVars.chroma.keyword.type};
+    }
+    // Name
+    .n {
+      color: ${themeVars.chroma.name.self};
+    }
+    .na {
+      color: ${themeVars.chroma.name.attribute};
+    }
+    .nb {
+      color: ${themeVars.chroma.name.builtin};
+    }
+    .bp {
+      color: ${themeVars.chroma.name.builtinPseudo};
+    }
+    .nc {
+      color: ${themeVars.chroma.name.class};
+    }
+    .no {
+      color: ${themeVars.chroma.name.constant};
+    }
+    .nd {
+      color: ${themeVars.chroma.name.decorator};
+    }
+    .ni {
+      color: ${themeVars.chroma.name.entity};
+    }
+    .ne {
+      color: ${themeVars.chroma.name.exception};
+    }
+    .nf {
+      color: ${themeVars.chroma.name.function};
+    }
+    .fm {
+      color: ${themeVars.chroma.name.functionMagic};
+    }
+    .py {
+      color: ${themeVars.chroma.name.property};
+    }
+    .nl {
+      color: ${themeVars.chroma.name.label};
+    }
+    .nn {
+      color: ${themeVars.chroma.name.namespace};
+    }
+    .nx {
+      color: ${themeVars.chroma.name.other};
+    }
+    .nt {
+      color: ${themeVars.chroma.name.tag};
+    }
+    .nv {
+      color: ${themeVars.chroma.name.variable};
+    }
+    .vc {
+      color: ${themeVars.chroma.name.variableClass};
+    }
+    .vg {
+      color: ${themeVars.chroma.name.variableGlobal};
+    }
+    .vi {
+      color: ${themeVars.chroma.name.variableInstance};
+    }
+    .vm {
+      color: ${themeVars.chroma.name.variableMagic};
+    }
+    // Literal
+    .l {
+      color: ${themeVars.chroma.literal.self};
+    }
+    .ld {
+      color: ${themeVars.chroma.literal.date};
+    }
+    // String
+    .s {
+      color: ${themeVars.chroma.string.self};
+    }
+    .sa {
+      color: ${themeVars.chroma.string.affix};
+    }
+    .sb {
+      color: ${themeVars.chroma.string.backtick};
+    }
+    .sc {
+      color: ${themeVars.chroma.string.char};
+    }
+    .dl {
+      color: ${themeVars.chroma.string.delimiter};
+    }
+    .sd {
+      color: ${themeVars.chroma.string.doc};
+    }
+    .s2 {
+      color: ${themeVars.chroma.string.double};
+    }
+    .se {
+      color: ${themeVars.chroma.string.escape};
+    }
+    .sh {
+      color: ${themeVars.chroma.string.heredoc};
+    }
+    .si {
+      color: ${themeVars.chroma.string.interpol};
+    }
+    .sx {
+      color: ${themeVars.chroma.string.other};
+    }
+    .sr {
+      color: ${themeVars.chroma.string.regex};
+    }
+    .s1 {
+      color: ${themeVars.chroma.string.single};
+    }
+    .ss {
+      color: ${themeVars.chroma.string.symbol};
+    }
+    // Number
+    .m {
+      color: ${themeVars.chroma.number.self};
+    }
+    .mb {
+      color: ${themeVars.chroma.number.bin};
+    }
+    .mf {
+      color: ${themeVars.chroma.number.float};
+    }
+    .mh {
+      color: ${themeVars.chroma.number.hex};
+    }
+    .mi {
+      color: ${themeVars.chroma.number.integer};
+    }
+    .il {
+      color: ${themeVars.chroma.number.integerLong};
+    }
+    .mo {
+      color: ${themeVars.chroma.number.oct};
+    }
+    // Operator
+    .o {
+      color: ${themeVars.chroma.operator.self};
+    }
+    .ow {
+      color: ${themeVars.chroma.operator.word};
+    }
+    // Punctuation
+    .p {
+      color: ${themeVars.chroma.punctuation};
+    }
+    // Comment
+    .c {
+      color: ${themeVars.chroma.comment.self};
+    }
+    .ch {
+      color: ${themeVars.chroma.comment.hashbang};
+    }
+    .cm {
+      color: ${themeVars.chroma.comment.multiline};
+    }
+    .cp {
+      color: ${themeVars.chroma.comment.preproc};
+    }
+    .cpf {
+      color: ${themeVars.chroma.comment.preprocFile};
+    }
+    .c1 {
+      color: ${themeVars.chroma.comment.single};
+    }
+    .cs {
+      color: ${themeVars.chroma.comment.special};
+    }
+    // Generic
+    .g {
+      color: ${themeVars.chroma.generic.self};
+    }
+    .gd {
+      color: ${themeVars.chroma.generic.deleted};
+    }
+    .ge {
+      color: ${themeVars.chroma.generic.emph};
+    }
+    .gr {
+      color: ${themeVars.chroma.generic.error};
+    }
+    .gh {
+      color: ${themeVars.chroma.generic.heading};
+    }
+    .gi {
+      color: ${themeVars.chroma.generic.inserted};
+    }
+    .go {
+      color: ${themeVars.chroma.generic.output};
+    }
+    .gp {
+      color: ${themeVars.chroma.generic.prompt};
+    }
+    .gs {
+      color: ${themeVars.chroma.generic.strong};
+    }
+    .gu {
+      color: ${themeVars.chroma.generic.subheading};
+    }
+    .gt {
+      color: ${themeVars.chroma.generic.traceback};
+    }
+    .gu {
+      color: ${themeVars.chroma.generic.underline};
+    }
+  }
+`;

styles/public/chroma.tsx

@@ -1,277 +0,0 @@
-import { css } from "src/types/vars";
-
-export const chroma = css`
-  .chroma {
-    background-color: var(--color-code-bg);
-
-    .lntd {
-      vertical-align: top;
-      border: 0;
-      margin: 0;
-      padding: 0;
-    }
-
-    .lntable {
-      border-spacing: 0;
-      border: 0;
-      width: auto;
-      margin: 0;
-      padding: 0;
-      display: block;
-      overflow: auto;
-    }
-
-    .hl {
-      width: 100%;
-      display: block;
-    }
-
-    .lnt,
-    .ln {
-      margin-right: 0.4em;
-      padding: 0 0.4em;
-    }
-
-    .gs {
-      font-weight: var(--font-weight-semibold);
-    }
-
-    .gl {
-      text-decoration: underline;
-    }
-
-    .bp {
-      color: #fabd2f;
-    }
-
-    .c,
-    .c1,
-    .ch,
-    .cm {
-      color: #777e94;
-    }
-
-    .cp {
-      color: #8ec07c;
-    }
-
-    .cpf {
-      color: #79c0ff;
-    }
-
-    .cs {
-      color: #9075cd;
-    }
-
-    .dl {
-      color: #79c0ff;
-    }
-
-    .gd {
-      color: #fff;
-      background-color: #5f3737;
-    }
-
-    .ge {
-      color: #ddee30;
-    }
-
-    .gh {
-      color: #ffaa10;
-    }
-
-    .gi {
-      color: #fff;
-      background-color: #3a523a;
-    }
-
-    .go {
-      color: #777e94;
-    }
-
-    .gp {
-      color: #ebdbb2;
-    }
-
-    .gr {
-      color: #f43;
-    }
-
-    .gs {
-      color: #ebdbb2;
-    }
-
-    .gt {
-      color: #7ee787;
-    }
-
-    .gu {
-      color: #a5d6ff;
-    }
-
-    .il {
-      color: #79c0ff;
-    }
-
-    .k {
-      color: #ff7b72;
-    }
-
-    .kc {
-      color: #79c0ff;
-    }
-
-    .kd {
-      color: #ff7b72;
-    }
-
-    .kn {
-      color: #ff7b72;
-    }
-
-    .kp {
-      color: #5f8700;
-    }
-
-    .kr {
-      color: #7ee787;
-    }
-
-    .kt {
-      color: #ff7b72;
-    }
-
-    .m,
-    .mb,
-    .mf,
-    .mh,
-    .mi,
-    .mo {
-      color: #79c0ff;
-    }
-
-    .n {
-      color: #c9d1d9;
-    }
-
-    .na {
-      color: #d2a8ff;
-    }
-
-    .nb {
-      color: #a5d6ff;
-    }
-
-    .nc {
-      color: #e6edf3;
-    }
-
-    .nd {
-      color: #79c0ff;
-    }
-
-    .ne {
-      color: #7ee787;
-    }
-
-    .nf,
-    .ni {
-      color: #d2a8ff;
-    }
-
-    .nl {
-      color: #7ee787;
-    }
-
-    .nn {
-      color: #e6edf3;
-    }
-
-    .no {
-      color: #79c0ff;
-    }
-
-    .nt {
-      color: #7ee787;
-    }
-
-    .nv {
-      color: #ebdbb2;
-    }
-
-    .nx {
-      color: #b6bac5;
-    }
-
-    .o {
-      color: #7ee787;
-    }
-
-    .ow {
-      color: #5f8700;
-    }
-
-    .p {
-      color: #d2d4db;
-    }
-
-    .s,
-    .s1,
-    .s2 {
-      color: #a5d6ff;
-    }
-
-    .sa {
-      color: #79c0ff;
-    }
-
-    .sb {
-      color: #a5d6ff;
-    }
-
-    .sc {
-      color: #79c0ff;
-    }
-
-    .sd {
-      color: #777e94;
-    }
-
-    .se {
-      color: #7ee787;
-    }
-
-    .sh {
-      color: #79c0ff;
-    }
-
-    .si {
-      color: #ffaa10;
-    }
-
-    .sr {
-      color: #9075cd;
-    }
-
-    .ss {
-      color: #7ee787;
-    }
-
-    .sx {
-      color: #ffaa10;
-    }
-
-    .vc {
-      color: #7ee787;
-    }
-
-    .vg,
-    .vi {
-      color: #ffaa10;
-    }
-
-    .w {
-      color: #7f8699;
-    }
-  }
-`;

styles/public/dropdown.ts

@@ -19,13 +19,15 @@ export const dropdown = css`
         gap: 0.5rem;
         padding: 8px 10px !important;
         border-radius: ${otherThemeVars.border.radius} !important;
+        &:not(.emoji) {
           margin: 0 0.5rem;
-        &:first-of-type {
+        }
+        &:not(.emoji):first-of-type {
           margin-top: 0.5rem;
         }
         // 不知道为什么提交差异对比页面操作中的 cherrypick 按钮无法被选中
         &.cherry-pick-button,
-        &:last-of-type {
+        &:not(.emoji):last-of-type {
           margin-bottom: 0.5rem;
         }
         &:hover {
@@ -37,9 +39,6 @@ export const dropdown = css`
             background-color: ${themeVars.github.control.transparent.bgColor.hover} !important;
           }
         }
-        svg {
-          margin-right: 0.5rem;
-        }
         &.active,
         &.selected {
           &:after {
@@ -121,6 +120,15 @@ export const selectionDropdown = css`
       ${activeItemAfterStyle};
     }
   }
+  // 修复顶部导航栏工单管理/请求合并页面搜索框旁的选择下拉框按钮内容过窄
+  .list-header-search .ui.action.input > .dropdown.small {
+    padding: 8px 40px 8px 16px;
+  }
+  // 发布版本页面的分支按钮, 覆盖 Gitea 的样式, 避免按钮元素高度不一致
+  .repository.new.release .target .selection.dropdown {
+    padding-top: 8px;
+    padding-bottom: 8px;
+  }
   // 这个按钮项目前只在创建仓库的拥有者
   // 不实现伪元素, 因为 .item 设置溢出的元素会被截断
   .ui.selection.dropdown.ellipsis-text-items,
@@ -154,6 +162,13 @@ export const selectionDropdown = css`
     border-bottom-left-radius: ${otherThemeVars.border.radius} !important;
     border-bottom-right-radius: ${otherThemeVars.border.radius} !important;
   }
+  // 修复因为上面的排除导致的圆角问题
+  // 具体工单页面下依赖菜单选择框
+  #new-dependency-drop-list.ui.selection.dropdown.active,
+  // 提交图分支选择框
+  #git-graph-container #flow-select-refs-dropdown {
+    border-bottom-right-radius: 0 !important;
+  }
   // 修复选择框的下拉菜单向上显示时的样式问题
   .ui.upward.selection.dropdown.visible:not(.small),
   .ui.active.upward.selection.dropdown:not(.small) {
@@ -161,3 +176,38 @@ export const selectionDropdown = css`
     border-top-right-radius: ${otherThemeVars.border.radius} !important;
   }
 `;
+
+export const fixSelectionDropdown = css`
+  // 具体工单页面下依赖菜单选择框
+  #new-dependency-drop-list.ui.selection.dropdown {
+    // 高度对齐问题, 应该与 input 框高度一致
+    min-height: 32px;
+  }
+`;
+
+// 分支菜单
+export const branchDropdown = css`
+  .ui.dropdown.branch-selector-dropdown .menu > .item {
+    animation: ${animationDown};
+  }
+`;
+
+// 包含表情的下拉菜单
+export const emojiDropdown = css`
+  .ui.dropdown.action.select-reaction.active .menu:has(.emoji) {
+    display: flex !important;
+    flex-direction: row;
+    gap: 4px;
+    padding: 4px;
+    min-width: auto;
+    > .item.emoji {
+      font-size: 14px;
+      min-height: 32px;
+      height: 32px;
+      margin: 0px;
+      &:hover {
+        background-color: ${themeVars.github.bgColor.accent.emphasis} !important;
+      }
+    }
+  }
+`;

styles/public/index.ts

@@ -2,6 +2,7 @@
 // tslint:disable:ordered-imports
 // 组件导入有顺序, 禁止插件优化
 import "./radius"; // 圆角, 此样式为基础样式, 确保在其他样式之前导入
+import "./transition"; // 过渡效果
 import "./text"; // 文本或 SVG 的基本颜色
 import "./button"; // 按钮
 import "./chroma"; // 代码高亮
@@ -12,3 +13,4 @@ import "./menu"; // 菜单
 import "./modal"; // 弹窗
 import "./tippy"; // 提示框
 import "./navbar"; // 导航栏
+import "./attached"; // 附加样式

styles/public/menu.ts

@@ -193,3 +193,47 @@ export const secondaryMenu = css`
     }
   }
 `;
+
+// 分页菜单
+export const paginationMenu = css`
+  .ui.borderless.pagination.menu {
+    align-items: center;
+    background-color: unset;
+    border: 0;
+    gap: 4px;
+    .item {
+      border-radius: ${otherThemeVars.border.radius};
+      min-width: 32px;
+      min-height: 32px;
+      height: 32px;
+      justify-content: center;
+      // 避免一些 hover 效果调整内容
+      padding: 5px 10px !important;
+      &.active {
+        background: ${themeVars.github.bgColor.accent.emphasis};
+        color: ${themeVars.color.white};
+      }
+      // 设置透明边框线避免 hover 时元素大小变化
+      &:not(.active) {
+        border: 1px solid #ffffff00;
+        &:hover {
+          background: unset;
+          border-color: ${themeVars.color.secondary.self};
+          transition-duration: 0.1s;
+        }
+      }
+      &.navigation {
+        &:not(.disabled) {
+          span,
+          svg {
+            color: ${themeVars.color.primary.self};
+          }
+        }
+        // 对齐文字
+        svg {
+          margin-top: 2px;
+        }
+      }
+    }
+  }
+`;

styles/public/modal.ts

@@ -1,7 +1,9 @@
+import { animationDown } from "src/core/theme";
 import { css, themeVars } from "src/types/vars";
 
 export const modal = css`
   .ui.modal {
+    animation: ${animationDown};
     border: 1.5px solid ${themeVars.color.light.border};
 
     > .header {

styles/public/navbar.ts

@@ -1,8 +1,9 @@
-import { css, themeVars } from "src/types/vars";
+import { css, otherThemeVars, themeVars } from "src/types/vars";
 
 export const navbarRight = css`
   #navbar {
-    .navbar-right {
+    // 进入用户页面后, 避免注册, 登录和首页等意外覆盖
+    .navbar-right:has(.user-menu) {
       gap: 8px;
       // 右侧按钮, 但不包括头像
       > .item:not(:last-child) {
@@ -13,6 +14,7 @@ export const navbarRight = css`
         align-content: center;
         justify-content: center;
         border: 1px solid ${themeVars.color.light.border};
+        border-radius: ${otherThemeVars.border.radius};
         padding: unset;
         height: 32px;
         min-width: 32px;
@@ -67,7 +69,7 @@ export const navbarRight = css`
         .navbar-profile-admin {
           background-color: ${themeVars.github.bgColor.accent.emphasis};
           border-radius: 25px;
-          color: ${themeVars.color.text.self};
+          color: ${themeVars.color.white};
           font-size: 8px;
           font-weight: 600;
           padding: 2px 5px;
@@ -79,10 +81,10 @@ export const navbarRight = css`
   }
   // 手机下的创建菜单按钮
   @media (max-width: 767.98px) {
-    #navbar .navbar-right > .item:not(:last-child) {
+    #navbar .navbar-right:has(.user-menu) > .item:not(:last-child) {
       display: none;
     }
-    #navbar.navbar-menu-open .navbar-right > .item:not(:last-child) {
+    #navbar.navbar-menu-open .navbar-right:has(.user-menu) > .item:not(:last-child) {
       display: grid;
     }
   }

styles/public/radius.ts

@@ -78,8 +78,10 @@ export const radiusImportant = css`
     border-radius: ${otherThemeVars.border.radius} !important;
   }
   // 目前为仓库列表/探索的二级菜单, 改版需要替换为全圆角
-  .ui.tabular.menu .active.item {
+  .ui.secondary.tabular.menu .item {
     border-radius: ${otherThemeVars.border.radius} !important;
+    &.active,
+    &.active:hover,
     &:hover {
       border-radius: ${otherThemeVars.border.radius} !important;
     }
@@ -113,10 +115,10 @@ export const radiusTop = css`
 
 // 上半部分圆角替换(原CSS带!important)
 export const radiusTopImportant = css`
+  .ui.tabular.menu .item,
   .ui.simple.upward.dropdown {
-    &.active {
+    &.active,
-      border-radius: ${otherThemeVars.border.radius} ${otherThemeVars.border.radius} 0 0 !important;
+    &.active:hover,
-    }
     &:hover {
       border-radius: ${otherThemeVars.border.radius} ${otherThemeVars.border.radius} 0 0 !important;
     }

styles/public/transition.scss

@@ -1,45 +0,0 @@
-// Made by Luting ^-^
-@keyframes overlay-appear {
-  0% {
-    opacity: 0;
-    transform: translateY(-12px);
-  }
-
-  100% {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
-#navbar .item,
-.header-wrapper .ui.tabular.menu .item,
-.job-step-summary,
-.job-step-logs,
-.job-brief-item,
-.tippy-box .flex-items-block .item,
-.clone-panel-tab .item,
-.ui.form select,
-.ui.label,
-.ui.modal,
-.ui.selection.dropdown,
-.ui.checkbox label:before,
-.ui.checkbox input:checked ~ label:before,
-.ui.checkbox input:not([type="radio"]):indeterminate ~ label:before,
-.ui.selection.active.dropdown,
-.ui.selection.active.dropdown:hover,
-.ui.selection.active.dropdown .menu,
-.ui.selection.active.dropdown:hover .menu,
-.ui.vertical.menu .header.item,
-.ui.secondary.menu .item {
-  transition: 0.12s ease-out;
-}
-
-textarea,
-.ui.form input,
-.menu .item,
-.ui.modal,
-.job-step-summary,
-.job-step-logs,
-.job-brief-item {
-  animation: 200ms cubic-bezier(0.33, 1, 0.68, 1) 0s 1 normal none running overlay-appear;
-}

styles/public/transition.ts

@@ -0,0 +1,54 @@
+import { css } from "src/types/vars";
+
+// 简单的渐变过渡
+export const transition = css`
+  // 迁移的元素
+  #navbar .item,
+  .header-wrapper .ui.tabular.menu .item,
+  .job-step-summary,
+  .job-step-logs,
+  .job-brief-item,
+  .repo-file-cell,
+  // 差异对比的代码折叠按钮
+  .code-expander-button,
+  // 仓库 README 头部的按钮
+  .file-header-left,
+  .file-header-right,
+  .tippy-box .flex-items-block .item,
+  .clone-panel-tab .item,
+  .ui.form select,
+  .ui.label,
+  .ui.modal,
+  .ui.checkbox label:before,
+  .ui.checkbox input:checked ~ label:before,
+  .ui.checkbox input:not([type="radio"]):indeterminate ~ label:before,
+  .ui.selection.dropdown,
+  .ui.selection.active.dropdown,
+  .ui.selection.active.dropdown:hover,
+  .ui.selection.active.dropdown .menu,
+  .ui.selection.active.dropdown:hover .menu,
+  .ui.vertical.menu .header.item,
+  .ui.secondary.menu .item {
+    transition: 80ms cubic-bezier(0.33, 1, 0.68, 1);
+  }
+  // Gitea 表单元素原始过渡覆盖
+  input,
+  textarea,
+  tr,
+  .ui.input textarea,
+  .ui.form textarea,
+  .ui.form input:not([type]),
+  .ui.form input[type="date"],
+  .ui.form input[type="datetime-local"],
+  .ui.form input[type="email"],
+  .ui.form input[type="number"],
+  .ui.form input[type="password"],
+  .ui.form input[type="search"],
+  .ui.form input[type="tel"],
+  .ui.form input[type="time"],
+  .ui.form input[type="text"],
+  .ui.form input[type="file"],
+  .ui.form input[type="url"] {
+    transition: 80ms cubic-bezier(0.33, 1, 0.68, 1);
+  }
+`;

themes/dark.css.ts

@@ -1,6 +1,6 @@
-import { defineGithubTheme, type GithubColor } from "src/core/github";
+import { defineGithubTheme } from "src/core/github";
 
-const github: GithubColor = {
+export default defineGithubTheme({
   isDarkTheme: true,
   display: {
     brown: { fgColor: "#b69a6d" },
@@ -24,13 +24,13 @@ const github: GithubColor = {
     default: "#f0f6fc",
     disabled: "#656c7699",
     done: "#ab7df8",
+    muted: "#9198a1",
     neutral: "#9198a1",
     severe: "#db6d28",
     sponsors: "#db61a2",
     success: "#3fb950",
     black: "#010409",
     white: "#ffffff",
-    muted: "#9198a1",
   },
   bgColor: {
     accent: { emphasis: "#1f6feb", muted: "#388bfd1a" },
@@ -53,22 +53,20 @@ const github: GithubColor = {
     translucent: "#ffffff26",
   },
   button: {
-    primary: { fgColor: { accent: "#39d353", rest: "#ffffff" }, bgColor: { rest: "#238636", hover: "#29903b" } },
+    primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#29903b" } },
     danger: { fgColor: { rest: "#fa5e55", hover: "#ffffff" }, bgColor: { hover: "#b62324" } },
   },
   control: {
     bgColor: { active: "#2a313c", hover: "#262c36", rest: "#212830" },
     transparent: { bgColor: { active: "#656c7640", hover: "#656c7633", selected: "#656c761a" } },
   },
-  shadow: { floating: "#01040966" },
+  shadow: { floating: { small: "#01040966" } },
   overlay: { backdrop: { bgColor: "#21283066" } },
   underlineNav: { borderColor: { active: "#f78166" } },
   contribution: {
     default: {
-      bgColor: { num0: "#151b23", num1: "#033a16", num2: "#196c2e", num3: "#2ea043", num4: "#56d364", num5: "#7ee787" },
+      bgColor: { num0: "#151b23", num1: "#033a16", num2: "#196c2e", num3: "#2ea043", num4: "#56d364" },
       borderColor: { num0: "#0104090d" },
     },
   },
-};
+});
-
-export default defineGithubTheme(github);

themes/light.css.ts

@@ -0,0 +1,72 @@
+import { defineGithubTheme } from "src/core/github";
+
+export default defineGithubTheme({
+  isDarkTheme: false,
+  display: {
+    brown: { fgColor: "#755f43" },
+    cyan: { fgColor: "#006a80" },
+    indigo: { fgColor: "#494edf" },
+    lemon: { fgColor: "#786002" },
+    olive: { fgColor: "#56682c" },
+    teal: { fgColor: "#106e75" },
+  },
+  diffBlob: {
+    addtionNum: { bgColor: "#aceebb" },
+    addtionWord: { bgColor: "#aceebb" },
+    deletionNum: { bgColor: "#ffcecb" },
+    deletionWord: { bgColor: "#ffcecb" },
+    hunkNum: { bgColor: { rest: "#b6e3ff" } },
+  },
+  fgColor: {
+    accent: "#0969da",
+    attention: "#9a6700",
+    danger: "#d1242f",
+    default: "#1f2328",
+    disabled: "#818b98",
+    done: "#8250df",
+    muted: "#59636e",
+    neutral: "#59636e",
+    severe: "#bc4c00",
+    sponsors: "#bf3989",
+    success: "#1a7f37",
+    black: "#1f2328",
+    white: "#ffffff",
+  },
+  bgColor: {
+    accent: { emphasis: "#0969da", muted: "#ddf4ff" },
+    attention: { muted: "#fff8c5" },
+    success: { emphasis: "#1f883d", muted: "#dafbe1" },
+    danger: { muted: "#ffebe9" },
+    done: { emphasis: "#8250df" },
+    default: "#ffffff",
+    inset: "#f6f8fa",
+    muted: "#f6f8fa",
+    neutral: { muted: "#818b981f" },
+  },
+  borderColor: {
+    accent: { emphasis: "#0969da" },
+    default: "#d1d9e0",
+    attention: { emphasis: "#9a6700" },
+    success: { emphasis: "#1a7f37" },
+    done: { emphasis: "#8250df" },
+    muted: "#d1d9e0b3",
+    translucent: "#1f232826",
+  },
+  button: {
+    primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#1c8139" } },
+    danger: { fgColor: { rest: "#d1242f", hover: "#ffffff" }, bgColor: { hover: "#cf222e" } },
+  },
+  control: {
+    bgColor: { active: "#e6eaef", hover: "#eff2f5", rest: "#f6f8fa" },
+    transparent: { bgColor: { active: "#818b9826", hover: "#818b981a", selected: "#818b9826" } },
+  },
+  shadow: { floating: { small: "#25292e0a" } },
+  overlay: { backdrop: { bgColor: "#c8d1da66" } },
+  underlineNav: { borderColor: { active: "#fd8c73" } },
+  contribution: {
+    default: {
+      bgColor: { num0: "#eff2f5", num1: "#aceebb", num2: "#4ac26b", num3: "#2da44e", num4: "#116329" },
+      borderColor: { num0: "#1f23280d" },
+    },
+  },
+});

themes/soft-dark.css.ts

@@ -0,0 +1,104 @@
+import { defineGithubTheme } from "src/core/github";
+import { prettylights2Chroma } from "src/core/prettylights";
+
+export default defineGithubTheme(
+  {
+    isDarkTheme: true,
+    display: {
+      brown: { fgColor: "#b69a6d" },
+      cyan: { fgColor: "#07ace4" },
+      indigo: { fgColor: "#9899ec" },
+      lemon: { fgColor: "#ba9b12" },
+      olive: { fgColor: "#a2a626" },
+      teal: { fgColor: "#1cb0ab" },
+    },
+    diffBlob: {
+      addtionNum: { bgColor: "#57ab5a4d" },
+      addtionWord: { bgColor: "#46954a66" },
+      deletionNum: { bgColor: "#e5534b4d" },
+      deletionWord: { bgColor: "#e5534b66" },
+      hunkNum: { bgColor: { rest: "#143d79" } },
+    },
+    fgColor: {
+      accent: "#478be6",
+      attention: "#c69026",
+      danger: "#e5534b",
+      default: "#d1d7e0",
+      disabled: "#656c76",
+      done: "#986ee2",
+      muted: "#9198a1",
+      neutral: "#9198a1",
+      severe: "#cc6b2c",
+      sponsors: "#c96198",
+      success: "#57ab5a",
+      black: "#010409",
+      white: "#cdd9e5",
+    },
+    bgColor: {
+      accent: { emphasis: "#316dca", muted: "#4184e41a" },
+      attention: { muted: "#ae7c1426" },
+      success: { emphasis: "#347d39", muted: "#46954a26" },
+      danger: { muted: "#e5534b1a" },
+      done: { emphasis: "#8256d0" },
+      default: "#212830",
+      inset: "#151b23",
+      muted: "#262c36",
+      neutral: { muted: "#656c7633" },
+    },
+    borderColor: {
+      accent: { emphasis: "#316dca" },
+      default: "#3d444d",
+      attention: { emphasis: "#966600" },
+      success: { emphasis: "#347d39" },
+      done: { emphasis: "#8256d0" },
+      muted: "#3d444db3",
+      translucent: "#cdd9e526",
+    },
+    button: {
+      primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#3b8640" } },
+      danger: { fgColor: { rest: "#ea5c53", hover: "#ffffff" }, bgColor: { hover: "#ad2e2c" } },
+    },
+    control: {
+      bgColor: { active: "#3d444d", hover: "#2f3742", rest: "#2a313c" },
+      transparent: { bgColor: { active: "#656c7633", hover: "#656c7626", selected: "#656c761a" } },
+    },
+    shadow: { floating: { small: "#01040966" } },
+    overlay: { backdrop: { bgColor: "#262c3666" } },
+    underlineNav: { borderColor: { active: "#ec775c" } },
+    contribution: {
+      default: {
+        bgColor: { num0: "#2a313c", num1: "#1b4721", num2: "#2b6a30", num3: "#46954a", num4: "#6bc46d" },
+        borderColor: { num0: "#0104090d" },
+      },
+    },
+  },
+  prettylights2Chroma({
+    syntax: {
+      brackethighlighter: { angle: "#9198a1", unmatched: "#e5534b" },
+      carriage: { return: { bg: "#ad2e2c", text: "#f0f6fc" } },
+      comment: "#9198a1",
+      constant: "#6cb6ff",
+      constantOtherReferenceLink: "#96d0ff",
+      entity: "#dcbdfb",
+      entityTag: "#8ddb8c",
+      invalid: { illegal: { bg: "#922323", text: "#f0f6fc" } },
+      keyword: "#f47067",
+      markup: {
+        bold: "#f0f6fc",
+        changed: { bg: "#682d0f", text: "#ffddb0" },
+        deleted: { bg: "#78191b", text: "#ffd8d3" },
+        heading: "#316dca",
+        ignored: { bg: "#255ab2", text: "#f0f6fc" },
+        inserted: { bg: "#1b4721", text: "#b4f1b4" },
+        italic: "#f0f6fc",
+        list: "#eac55f",
+      },
+      metaDiffRange: "#dcbdfb",
+      storageModifierImport: "#f0f6fc",
+      string: "#96d0ff",
+      stringRegexp: "#8ddb8c",
+      sublimelinterGutterMark: "#3d444d",
+      variable: "#f69d50",
+    },
+  })
+);

tsconfig.json

@@ -23,7 +23,6 @@
     "verbatimModuleSyntax": true,
     "moduleDetection": "force",
     "noEmit": true,
-    "jsx": "react-jsx",
     /* Linting */
     "strict": true,
     "noUnusedLocals": true,

vite.config.ts

@@ -1,5 +1,4 @@
 import { vanillaExtractPlugin } from "@vanilla-extract/vite-plugin";
-import react from "@vitejs/plugin-react";
 import linaria from "@wyw-in-js/vite";
 import * as dotenv from "dotenv";
 import { Features } from "lightningcss";
@@ -24,7 +23,7 @@ export default defineConfig(({ mode }) => {
         styles: path.resolve(__dirname, "styles"),
         themes: path.resolve(__dirname, "themes"),
       },
-      extensions: [".js", ".jsx", ".ts", ".tsx", ".css.tsx"],
+      extensions: [".js", ".ts", ".css.ts"],
     },
     css: {
       transformer: "lightningcss",
@@ -35,16 +34,15 @@ export default defineConfig(({ mode }) => {
     },
     plugins: [
       linaria({
-        include: ["**/*.{ts,tsx}"],
+        include: ["**/*.ts"],
         babelOptions: {
-          presets: ["@babel/preset-typescript", "@babel/preset-react"],
+          presets: ["@babel/preset-typescript"],
         },
         preprocessor: (_selector, cssText) => sass.compileString(cssText).css, // 默认为全局样式并使用 sass-embedded 预处理 css
         tagResolver: (source, tag) =>
           // 识别从 src 导出的 css 标签，使用 @linaria/core/processors/css 处理
           source === "src/types/vars" && tag === "css" ? require.resolve("@linaria/core/processors/css") : null,
       }),
-      react(),
       vanillaExtractPlugin(),
       themePlugin(),
     ],