green

.env.example

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

.github/release-template.md

@@ -1,11 +1,7 @@
-## 🎉
-
-## ✨ Feature
-
-#### CSS 变量
-
 ## 🌈 Style
 
 #### 更符合 GitHub 风格
 
+## 🎈 Perf
+
 ## 🐞 Fix

.github/release.md

@@ -1,8 +1,12 @@
-## ✨ Feature
+## 🌈 Style
 
-- 支持色盲主题(Beta) ( 红绿色盲和蓝色盲 ) ( Colorblind & Tritanopia )
+#### 更符合 GitHub 风格
+
+- 同步 PR 的合并提交操作面板样式
+- 同步 Issue/PR 的时间线样式
+
+## 🎈 Perf
+
+- 优化全局按钮样式
 
 ## 🐞 Fix
-
-- 查看代码文件页面路径栏有时内容不会居中
-- 查看代码文件页面文件树头部滚动到底部时不会固定住

.github/workflows/release.yml

@@ -18,10 +18,7 @@ jobs:
       - name: Create release
         run: |
           export TZ=Asia/Shanghai
-          TAG="v$(npm run -s version)"
+          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
-          tar -zcf dist/theme-github-colorblind.tar.gz --remove-files dist/theme-github-colorblind-auto.css dist/theme-github-colorblind-light.css dist/theme-github-colorblind-dark.css
-          tar -zcf dist/theme-github-tritanopia.tar.gz --remove-files dist/theme-github-tritanopia-auto.css dist/theme-github-tritanopia-light.css dist/theme-github-tritanopia-dark.css
           gh release create "$TAG" dist/* --notes-file .github/release.md --draft -t $TAG
         env:
           GH_TOKEN: ${{ github.token }}

.gitignore

@@ -1,5 +1,4 @@
 dist
 node_modules
 package-lock.json
-.env
+.env
-.VSCodeCounter

CONTRIBUTING.md

@@ -1,171 +1,7 @@
-# 贡献指南
-
-## 目录结构
-
 | 目录              | 说明                         |
 | ----------------- | ---------------------------- |
-| src               | 主题生成框架与辅助工具的包   |
+| styles            | 元素 GitHub 风格             |
-| src/core          | 主题生成框架                 |
+| styles/components | 具体页面的元素单独风格       |
-| src/functions     | 主题辅助工具                 |
+| styles/public     | 适用大部分页面的元素默认风格 |
-| 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, type ThemeColor } from "src"` 导入主题生成框架, 声明主题颜色, 然后使用 `defineTheme` 函数生成主题所有 CSS 变量,
-defineTheme 中设置了一些经过计算得到的 Gitea 变量可以减少工作量, 具体请查看函数说明和定义.
-
-颜色计算函数可以从 `src/functions` 导入, 例如 `import { scaleColorLight } from "src/functions"`, 或者使用 `polished` 库.
-
-例: `themes/主题名称-dark.css.ts`
-
-```ts
-/**
- * @author 你的名字
- * @description 主题描述
- */
-import { defineTheme, type ThemeColor } from "src";
-export const 主题名称DarkColors: ThemeColor = {
-  ...
-}
-export default defineTheme(主题名称DarkColors);
-// 使用其他主题颜色作为基础
-import dark from "themes/dark";
-import { darkColors } from "themes/dark";
-export const 主题名称DarkColors: ThemeColor = darkColors;
-export default defineTheme({
-  ...dark,
-  ...
-});
-```
-
-如果不需要自定义代码高亮色, 则不传递 chroma 参数, 框架会自动根据主题的暗色或亮色生成代码高亮色.
-
-如果需要完全自定义每个 Gitea 变量, 请导入 `import type { Theme } from "src"`
-
-例: `themes/主题名称-dark.css.ts`
-
-```ts
-/**
- * @author 你的名字
- * @description 主题描述
- */
-import type { Theme, Chroma, Primary, Secondary, ... } from "src";
-export const primary: Primary = ...;
-export const secondary: Secondary =...;
-export const chroma: Chroma =...;
-...
-export default theme: Theme = {
-  primary,
-  secondary,
-  chroma,
-  ...
-};
-```
-
-完成主题颜色开发后, 请在某个仓库的代码文件列表页, 打开 Code 菜单选择 Tea Cli 进行截图, 并放入 `screenshots`
-目录下, 截图名与主题名相同. (推荐克隆本仓库, 避免泄露个人隐私)
-
-然后将截图信息添加到 `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,44 +1,26 @@
 # 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.大版本号.小版本号.时间戳`
 
 ## 安装
 
-1. 在发布页下载最新的 CSS 主题文件放入 `gitea/public/assets/css` 目录下
+1. 在发布页下载最新的 `theme-github-dark.css` 放入 `gitea/public/assets/css` 目录下
-2. 修改 `gitea/conf/app.ini`，并将 CSS 文件名去掉 `theme-` 的名称附加到 `[ui]` 下的 `THEMES` 末尾
+2. 修改 `gitea/conf/app.ini`，并将 `, github` 附加到 `[ui]` 下的 `THEMES` 末尾
 3. 重启 Gitea
 4. 在设置中查看主题
 
-> [!IMPORTANT]
->
-> 自动颜色主题需要亮色和暗色的主题文件
-
-例: 主题文件名为 `theme-github-dark.css`，则添加 `github-dark` 到 `THEMES` 末尾
-
 `gitea/conf/app.ini` 例:
 
 ```ini
 [ui]
-THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-dark, github-soft-dark
+THEMES = gitea-dark, github-dark
 ```
 
 详细请查看 Gitea 文档
@@ -46,86 +28,20 @@ THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-
 
 ## 截图
 
-### 基本主题
+![仓库](screenshots/repo.png)
 
-```ini
+![仓库文件列表](screenshots/file_list.png)
-THEMES = github-auto, github-light, github-dark, github-soft-dark
-```
-<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>
 
-### 色盲主题 ( Beta )
+![仓库发布](screenshots/release.png)
 
-```ini
+![仓库提交](screenshots/commit.png)
-THEMES = github-colorblind-auto, github-colorblind-light, github-colorblind-dark
-THEMES = github-tritanopia-auto, github-tritanopia-light, github-tritanopia-dark
-```
 
-<details>
+![Actions](screenshots/actions.png)
-<summary>红绿色盲 & 蓝色盲 ( Colorblind & Tritanopia )</summary>
-<h4>theme-github-colorblind-light.css & theme-github-tritanopia-light.css</h4>
-<img src="screenshots/colorblind-light.png"/>
-<h4>theme-github-colorblind-dark.css & theme-github-tritanopia-dark.css</h4>
-<img src="screenshots/colorblind-dark.png"/>
-</details>
 
-## 自定义 CSS 变量
+![Action](screenshots/action.png)
 
-可以根据自己的偏好自定义主题的一部分样式
+![Dispatch](screenshots/dispatch.png)
-
-### 使用方法
-
-在主题的 CSS 文件的头部或尾部添加以下代码
-
-```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` 末尾
 
 ## 贡献
 
-请查看 [CONTRIBUTING](CONTRIBUTING.md)
+欢迎提交 Issue 或 Pull Request

TODO.md

@@ -0,0 +1,19 @@
+### 轻量
+
+- hover 动画迁移
+- 列表部分 item 展开动画迁移
+
+### 重大
+
+- gitea issue 默认标签颜色匹配使用 github 样式
+- 探索/组织/用户仓库样式 github 布局
+- issue/PR 列表样式 github 布局
+- styles/themes 库组件导出整理
+- defineTheme 颜色生成代码重构
+- 亮色主题适配/测试
+- 自动颜色主题生成
+
+### 其他
+
+- README 更新/截图更新
+- CONTRIBUTING 更新

eslint.config.js

@@ -1,4 +1,6 @@
 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";
 
@@ -6,10 +8,17 @@ export default tseslint.config(
   { ignores: ["dist"] },
   {
     extends: [js.configs.recommended, ...tseslint.configs.recommended],
-    files: ["**/*.{ts}"],
+    files: ["**/*.{ts,tsx}"],
     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.5",
+  "version": "1.24.2",
   "description": "A theme to make Gitea look and feel like GitHub",
   "type": "module",
   "scripts": {
@@ -12,26 +12,35 @@
     "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": {
@@ -53,5 +62,8 @@
       "prettier-plugin-organize-imports"
     ],
     "organizeImportsSkipDestructiveCodeActions": false
+  },
+  "dependencies": {
+    "typescript-styled-plugin": "^0.18.3"
   }
 }

src/core/chroma.ts

@@ -1,64 +0,0 @@
-import { prettylights2Chroma, type prettylightsColor } from "./prettylights";
-
-export const lightPrettylights: prettylightsColor = {
-  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",
-  },
-};
-
-export const darkPrettylights: prettylightsColor = {
-  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(lightPrettylights);
-export const defaultDarkChroma = prettylights2Chroma(darkPrettylights);

src/core/color.ts

@@ -1,11 +1,10 @@
 import { rgba, saturate } from "polished";
 import { scaleColorLight } from "src/functions";
-import type { Ansi, Chroma, Console, Diff, Github, Message, Named, Other, Primary, Secondary } from "src/types";
+import type { Ansi, 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";
 
-export type ThemeColor = {
+type ThemeColor = {
   /** 用于标识当前是否为暗色主题: `true` 暗色 `false` 亮色 */
   isDarkTheme: boolean;
   /** 主色调(强调色) */
@@ -14,41 +13,38 @@ export type ThemeColor = {
   primaryContrast: string;
   /** 副色调(边框色) */
   secondary: string;
-  /** 基础颜色 */
+  /** 红色 */
-  base: {
+  red: string;
-    /** 红色 */
+  /** 橙色 */
-    red: string;
+  orange: string;
-    /** 橙色 */
+  /** 黄色 */
-    orange: string;
+  yellow: string;
-    /** 黄色 */
+  /** 黄绿色/橄榄色 */
-    yellow: string;
+  olive: string;
-    /** 黄绿色/橄榄色 */
+  /** 绿色 */
-    olive: string;
+  green: string;
-    /** 绿色 */
+  /** 蓝绿色/青色(偏绿) */
-    green: string;
+  teal: string;
-    /** 蓝绿色/青色(偏绿) */
+  /** 蓝绿色/青色(偏蓝) */
-    teal: string;
+  cyan: string;
-    /** 蓝绿色/青色(偏蓝) */
+  /** 蓝色 */
-    cyan: string;
+  blue: string;
-    /** 蓝色 */
+  /** 蓝紫色/紫罗兰色 */
-    blue: string;
+  violet: string;
-    /** 蓝紫色/紫罗兰色 */
+  /** 紫色 */
-    violet: string;
+  purple: string;
-    /** 紫色 */
+  /** 粉红色 */
-    purple: string;
+  pink: string;
-    /** 粉红色 */
+  /** 棕色 */
-    pink: string;
+  brown: string;
-    /** 棕色 */
+  /** 黑色 */
-    brown: string;
+  black: string;
-    /** 黑色 */
+  /** 灰色 */
-    black: string;
+  grey: string;
-    /** 灰色 */
+  /** 金色 */
-    grey: string;
+  gold: string;
-    /** 金色 */
+  /** 白色 */
-    gold: string;
+  white: string;
-    /** 白色 */
-    white: string;
-  };
   /** Action 日志 */
   console: Console;
   /** 提交代码对比 */
@@ -61,8 +57,8 @@ export type ThemeColor = {
 
 /** 定义颜色, 用于生成颜色主题
  * @example
- * 文件名: "dark.css.ts"
+ * 文件名: "dark.css.tsx"
- * import type { Console, Diff, Other, Github } from "src/types";
+ * import type { Console, Diff, Other } from "src/types";
  * import { defineTheme, themeVars } from "src";
  *
  * const console: Console = {
@@ -74,6 +70,7 @@ export type ThemeColor = {
  *   ...
  * }
  * ...
+ * // 会经过 lightningcss 打包处理生成最终的 CSS
  * export default defineTheme({
  *   isDarkTheme: true,
  *   primary: "#0969da",
@@ -81,10 +78,9 @@ export type ThemeColor = {
  *   console,
  *   diff,
  *   other,
- *   github,
  * })
  */
-export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null): Theme {
+export function defineTheme(themeColor: ThemeColor): Theme {
   const brightDir = themeColor.isDarkTheme ? -1 : 1;
 
   const primary: Primary = {
@@ -164,161 +160,161 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null
 
   const named: Named = {
     red: {
-      self: themeColor.base.red,
+      self: themeColor.red,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.red, 15) : scaleColorLight(themeColor.base.red, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.red, 15) : scaleColorLight(themeColor.red, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.red, -10),
+        num1: scaleColorLight(themeColor.red, -10),
-        num2: scaleColorLight(themeColor.base.red, -20),
+        num2: scaleColorLight(themeColor.red, -20),
       },
       badge: {
-        self: themeColor.base.red,
+        self: themeColor.red,
-        bg: rgba(themeColor.base.red, 0.1),
+        bg: rgba(themeColor.red, 0.1),
         hover: {
-          bg: rgba(themeColor.base.red, 0.3),
+          bg: rgba(themeColor.red, 0.3),
         },
       },
     },
     orange: {
-      self: themeColor.base.orange,
+      self: themeColor.orange,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.orange, 15) : scaleColorLight(themeColor.base.orange, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.orange, 15) : scaleColorLight(themeColor.orange, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.orange, -10),
+        num1: scaleColorLight(themeColor.orange, -10),
-        num2: scaleColorLight(themeColor.base.orange, -20),
+        num2: scaleColorLight(themeColor.orange, -20),
       },
       badge: {
-        self: themeColor.base.orange,
+        self: themeColor.orange,
-        bg: rgba(themeColor.base.orange, 0.1),
+        bg: rgba(themeColor.orange, 0.1),
         hover: {
-          bg: rgba(themeColor.base.orange, 0.3),
+          bg: rgba(themeColor.orange, 0.3),
         },
       },
     },
     yellow: {
-      self: themeColor.base.yellow,
+      self: themeColor.yellow,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.yellow, 15) : scaleColorLight(themeColor.base.yellow, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.yellow, 15) : scaleColorLight(themeColor.yellow, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.yellow, -10),
+        num1: scaleColorLight(themeColor.yellow, -10),
-        num2: scaleColorLight(themeColor.base.yellow, -20),
+        num2: scaleColorLight(themeColor.yellow, -20),
       },
       badge: {
-        self: themeColor.base.yellow,
+        self: themeColor.yellow,
-        bg: rgba(themeColor.base.yellow, 0.1),
+        bg: rgba(themeColor.yellow, 0.1),
         hover: {
-          bg: rgba(themeColor.base.yellow, 0.3),
+          bg: rgba(themeColor.yellow, 0.3),
         },
       },
     },
     olive: {
-      self: themeColor.base.olive,
+      self: themeColor.olive,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.olive, 15) : scaleColorLight(themeColor.base.olive, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.olive, 15) : scaleColorLight(themeColor.olive, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.olive, -10),
+        num1: scaleColorLight(themeColor.olive, -10),
-        num2: scaleColorLight(themeColor.base.olive, -20),
+        num2: scaleColorLight(themeColor.olive, -20),
       },
     },
     green: {
-      self: themeColor.base.green,
+      self: themeColor.green,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.green, 15) : scaleColorLight(themeColor.base.green, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.green, 15) : scaleColorLight(themeColor.green, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.green, -10),
+        num1: scaleColorLight(themeColor.green, -10),
-        num2: scaleColorLight(themeColor.base.green, -20),
+        num2: scaleColorLight(themeColor.green, -20),
       },
       badge: {
-        self: themeColor.base.green,
+        self: themeColor.green,
-        bg: rgba(themeColor.base.green, 0.1),
+        bg: rgba(themeColor.green, 0.1),
         hover: {
-          bg: rgba(themeColor.base.green, 0.3),
+          bg: rgba(themeColor.green, 0.3),
         },
       },
     },
     teal: {
-      self: themeColor.base.teal,
+      self: themeColor.teal,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.teal, 15) : scaleColorLight(themeColor.base.teal, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.teal, 15) : scaleColorLight(themeColor.teal, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.teal, -10),
+        num1: scaleColorLight(themeColor.teal, -10),
-        num2: scaleColorLight(themeColor.base.teal, -20),
+        num2: scaleColorLight(themeColor.teal, -20),
       },
     },
     blue: {
-      self: themeColor.base.blue,
+      self: themeColor.blue,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.blue, 15) : scaleColorLight(themeColor.base.blue, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.blue, 15) : scaleColorLight(themeColor.blue, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.blue, -10),
+        num1: scaleColorLight(themeColor.blue, -10),
-        num2: scaleColorLight(themeColor.base.blue, -20),
+        num2: scaleColorLight(themeColor.blue, -20),
       },
     },
     violet: {
-      self: themeColor.base.violet,
+      self: themeColor.violet,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.violet, 15) : scaleColorLight(themeColor.base.violet, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.violet, 15) : scaleColorLight(themeColor.violet, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.violet, -10),
+        num1: scaleColorLight(themeColor.violet, -10),
-        num2: scaleColorLight(themeColor.base.violet, -20),
+        num2: scaleColorLight(themeColor.violet, -20),
       },
     },
     purple: {
-      self: themeColor.base.purple,
+      self: themeColor.purple,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.purple, 15) : scaleColorLight(themeColor.base.purple, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.purple, 15) : scaleColorLight(themeColor.purple, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.purple, -10),
+        num1: scaleColorLight(themeColor.purple, -10),
-        num2: scaleColorLight(themeColor.base.purple, -20),
+        num2: scaleColorLight(themeColor.purple, -20),
       },
     },
     pink: {
-      self: themeColor.base.pink,
+      self: themeColor.pink,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.pink, 15) : scaleColorLight(themeColor.base.pink, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.pink, 15) : scaleColorLight(themeColor.pink, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.pink, -10),
+        num1: scaleColorLight(themeColor.pink, -10),
-        num2: scaleColorLight(themeColor.base.pink, -20),
+        num2: scaleColorLight(themeColor.pink, -20),
       },
     },
     brown: {
-      self: themeColor.base.brown,
+      self: themeColor.brown,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.brown, 15) : scaleColorLight(themeColor.base.brown, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.brown, 15) : scaleColorLight(themeColor.brown, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.brown, -10),
+        num1: scaleColorLight(themeColor.brown, -10),
-        num2: scaleColorLight(themeColor.base.brown, -20),
+        num2: scaleColorLight(themeColor.brown, -20),
       },
     },
     black: {
-      self: themeColor.base.black,
+      self: themeColor.black,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.black, 15) : scaleColorLight(themeColor.base.black, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.black, 15) : scaleColorLight(themeColor.black, 25),
       dark: {
-        num1: scaleColorLight(themeColor.base.black, -10),
+        num1: scaleColorLight(themeColor.black, -10),
-        num2: scaleColorLight(themeColor.base.black, -20),
+        num2: scaleColorLight(themeColor.black, -20),
       },
     },
     grey: {
-      self: themeColor.base.grey,
+      self: themeColor.grey,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.grey, 15) : scaleColorLight(themeColor.base.grey, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.grey, 15) : scaleColorLight(themeColor.grey, 25),
     },
-    gold: themeColor.base.gold,
+    gold: themeColor.gold,
-    white: themeColor.base.white,
+    white: themeColor.white,
   };
 
   const message: Message = {
     error: {
       bg: {
-        self: rgba(themeColor.base.red, 0.1),
+        self: rgba(themeColor.red, 0.1),
-        active: rgba(themeColor.base.red, 0.5),
+        active: rgba(themeColor.red, 0.5),
-        hover: rgba(themeColor.base.red, 0.3),
+        hover: rgba(themeColor.red, 0.3),
       },
-      border: rgba(themeColor.base.red, 0.4),
+      border: rgba(themeColor.red, 0.4),
-      text: saturate(0.2, themeColor.base.red), // 饱和度提高
+      text: saturate(0.2, themeColor.red), // 饱和度提高
     },
     success: {
-      bg: rgba(themeColor.base.green, 0.1),
+      bg: rgba(themeColor.green, 0.1),
-      border: rgba(themeColor.base.green, 0.4),
+      border: rgba(themeColor.green, 0.4),
-      text: saturate(0.2, themeColor.base.green),
+      text: saturate(0.2, themeColor.green),
     },
     warning: {
-      bg: rgba(themeColor.base.yellow, 0.1),
+      bg: rgba(themeColor.yellow, 0.1),
-      border: rgba(themeColor.base.yellow, 0.4),
+      border: rgba(themeColor.yellow, 0.4),
-      text: saturate(0.2, themeColor.base.yellow),
+      text: saturate(0.2, themeColor.yellow),
     },
     info: {
-      bg: rgba(themeColor.base.blue, 0.1),
+      bg: rgba(themeColor.blue, 0.1),
-      border: rgba(themeColor.base.blue, 0.4),
+      border: rgba(themeColor.blue, 0.4),
-      text: saturate(0.2, themeColor.base.blue),
+      text: saturate(0.2, themeColor.blue),
     },
   };
 
@@ -329,7 +325,7 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null
     yellow: themeVars.color.yellow.self,
     blue: themeVars.color.blue.self,
     magenta: themeVars.color.pink.self,
-    cyan: themeColor.base.cyan,
+    cyan: themeColor.cyan,
     white: themeVars.color.console.fg.subtle,
     bright: {
       black: themeVars.color.black.light,
@@ -338,14 +334,13 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null
       yellow: themeVars.color.yellow.light,
       blue: themeVars.color.blue.light,
       magenta: themeVars.color.pink.light,
-      cyan: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.cyan, 10) : scaleColorLight(themeColor.base.cyan, 25),
+      cyan: themeColor.isDarkTheme ? scaleColorLight(themeColor.cyan, 10) : scaleColorLight(themeColor.cyan, 25),
       white: themeVars.color.console.fg.self,
     },
   };
 
   return {
     isDarkTheme: themeColor.isDarkTheme.toString(),
-    chroma: chroma || (themeColor.isDarkTheme ? defaultDarkChroma : defaultLightChroma),
     color: {
       primary,
       secondary,

src/core/github.ts

@@ -1,9 +1,8 @@
-import { saturate } from "polished";
 import type { Console, Diff, Other } from "src";
-import { scaleColorLight } from "src/functions";
 import type { Github } from "src/types";
 import { themeVars } from "src/types/vars";
-import { type ThemeColor } from "./color";
+import { defineTheme } from "./color";
+import type { Theme } from "./theme";
 
 export type GithubColor = {
   isDarkTheme: boolean;
@@ -38,45 +37,113 @@ export type GithubColor = {
     muted: string;
   };
   bgColor: {
-    accent: { emphasis: string; muted: string };
+    accent: {
-    attention: { muted: string };
+      emphasis: string;
-    success: { emphasis: string; muted: string };
+      muted: string;
-    danger: { muted: string };
+    };
-    done: { emphasis: string };
+    attention: {
+      muted: string;
+    };
+    success: {
+      emphasis: string;
+      muted: string;
+    };
+    danger: {
+      muted: string;
+    };
+    done: {
+      emphasis: string;
+    };
     default: string;
     inset: string;
     muted: string;
-    neutral: { muted: string };
+    neutral: {
+      muted: string;
+    };
   };
   borderColor: {
-    accent: { emphasis: string };
+    accent: {
-    attention: { emphasis: string };
+      emphasis: string;
+    };
+    attention: {
+      emphasis: string;
+    };
     default: string;
-    success: { emphasis: string };
+    success: {
-    done: { emphasis: string };
+      emphasis: string;
+    };
+    done: {
+      emphasis: string;
+    };
     muted: string;
     translucent: string;
   };
   button: {
-    primary: { fgColor: { rest: string }; bgColor: { hover: string } };
+    primary: {
-    danger: { fgColor: { rest: string; hover: string }; bgColor: { hover: string } };
+      fgColor: {
+        accent: string;
+        rest: string;
+      };
+      bgColor: {
+        rest: string;
+        hover: string;
+      };
+    };
+    danger: {
+      fgColor: {
+        rest: string;
+        hover: string;
+      };
+      bgColor: {
+        hover: string;
+      };
+    };
   };
   control: {
-    bgColor: { active: string; hover: string; rest: string };
+    bgColor: {
-    transparent: { bgColor: { active: string; hover: string; selected: string } };
+      active: 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: { num0: string; num1: string; num2: string; num3: string; num4: string };
+      bgColor: {
-      borderColor: { num0: string };
+        num0: string;
+        num1: string;
+        num2: string;
+        num3: string;
+        num4: string;
+        num5: string;
+      };
+      borderColor: {
+        num0: string;
+      };
     };
   };
 };
 
-export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
+export function defineGithubTheme(githubColor: GithubColor): Theme {
   const console: Console = {
     fg: {
       self: githubColor.fgColor.default,
@@ -177,7 +244,7 @@ export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
     button: githubColor.control.bgColor.rest,
     codeBg: "unset",
     shadow: {
-      self: githubColor.shadow.floating.small,
+      self: githubColor.shadow.floating,
       opaque: themeVars.color.shadow.self,
     },
     secondaryBg: "unset",
@@ -256,11 +323,11 @@ export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
       },
       primary: {
         fgColor: {
-          accent: saturate(0.1, scaleColorLight(githubColor.fgColor.success, githubColor.isDarkTheme ? 10 : -10)),
+          accent: githubColor.button.primary.fgColor.accent,
           rest: githubColor.button.primary.fgColor.rest,
         },
         bgColor: {
-          rest: themeVars.github.bgColor.success.emphasis,
+          rest: githubColor.button.primary.bgColor.rest,
           hover: githubColor.button.primary.bgColor.hover,
         },
         borderColor: {
@@ -310,10 +377,7 @@ export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
           num2: githubColor.contribution.default.bgColor.num2,
           num3: githubColor.contribution.default.bgColor.num3,
           num4: githubColor.contribution.default.bgColor.num4,
-          num5: saturate(
+          num5: githubColor.contribution.default.bgColor.num5,
-            0.2,
-            scaleColorLight(githubColor.contribution.default.bgColor.num4, githubColor.isDarkTheme ? 58 : -58)
-          ),
         },
         borderColor: {
           num0: githubColor.contribution.default.borderColor.num0,
@@ -326,32 +390,30 @@ export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
       },
     },
   };
-  return {
+  return defineTheme({
     isDarkTheme: githubColor.isDarkTheme,
     primary: githubColor.fgColor.accent,
     primaryContrast: githubColor.fgColor.default,
     secondary: githubColor.borderColor.default,
-    base: {
+    red: githubColor.fgColor.danger,
-      red: githubColor.fgColor.danger,
+    orange: githubColor.fgColor.severe,
-      orange: githubColor.fgColor.severe,
+    yellow: githubColor.fgColor.attention,
-      yellow: githubColor.fgColor.attention,
+    olive: githubColor.display.olive.fgColor,
-      olive: githubColor.display.olive.fgColor,
+    green: githubColor.fgColor.success,
-      green: githubColor.fgColor.success,
+    cyan: githubColor.display.cyan.fgColor,
-      cyan: githubColor.display.cyan.fgColor,
+    teal: githubColor.display.teal.fgColor,
-      teal: githubColor.display.teal.fgColor,
+    blue: githubColor.fgColor.accent,
-      blue: githubColor.fgColor.accent,
+    violet: githubColor.display.indigo.fgColor,
-      violet: githubColor.display.indigo.fgColor,
+    purple: githubColor.fgColor.done,
-      purple: githubColor.fgColor.done,
+    pink: githubColor.fgColor.sponsors,
-      pink: githubColor.fgColor.sponsors,
+    brown: githubColor.display.brown.fgColor,
-      brown: githubColor.display.brown.fgColor,
+    black: githubColor.fgColor.black,
-      black: githubColor.fgColor.black,
+    grey: githubColor.fgColor.neutral,
-      grey: githubColor.fgColor.neutral,
+    gold: githubColor.display.lemon.fgColor,
-      gold: githubColor.display.lemon.fgColor,
+    white: githubColor.fgColor.white,
-      white: githubColor.fgColor.white,
-    },
     console,
     diff,
     other,
     github,
-  };
+  });
 }

src/core/prettylights.ts

@@ -1,127 +0,0 @@
-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,6 +4,15 @@ 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";
@@ -33,20 +42,20 @@ const emoji = `
 `;
 
 export function createTheme(theme: Theme): void {
-  const isDarkTheme: boolean = JSON.parse(theme.isDarkTheme);
+  const isDarkTheme = stringToBoolean(theme.isDarkTheme, "isDarkTheme");
   if (isDarkTheme) {
     globalStyle(emoji, { filter: "invert(100%) hue-rotate(180deg)" });
   }
   createGlobalTheme(":root", themeVars, theme);
   createGlobalTheme(":root", otherThemeVars, {
-    border: { radius: "6px" },
+    git: "#f05133",
-    color: {
+    light: {
-      git: "#f05133",
+      mimicEnabled: isDarkTheme
-      light: {
+        ? "rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled)))"
-        mimicEnabled: isDarkTheme
+        : "rgba(0, 0, 0, calc(6 / 255 * 222 / 255 / var(--opacity-disabled)))",
-          ? "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", {
@@ -54,11 +63,11 @@ export function createTheme(theme: Theme): void {
     colorScheme: isDarkTheme ? "dark" : "light",
   });
   globalKeyframes(overlayAppearDown, {
-    "0%": { opacity: 0, transform: "translateY(-8px)" },
+    "0%": { opacity: 0, transform: "translateY(-12px)" },
     "100%": { opacity: 1, transform: "translateY(0)" },
   });
   globalKeyframes(overlayAppearUp, {
-    "0%": { opacity: 0, transform: "translateY(8px)" },
+    "0%": { opacity: 0, transform: "translateY(12px)" },
     "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.ts";
+const suffix = ".css.tsx";
 
 /**
  * 生成主题输入
@@ -78,41 +78,23 @@ export function themePlugin(): Plugin {
       for (const [key, value] of Object.entries(bundle)) {
         // 仅为了类型检查, 逻辑上输出中全是 asset 类型
         if (value.type === "asset") {
-          const name = `${prefix}${key}`;
+          const name = `${prefix}${value.names[0]}`;
           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 theme_path = process.env.GITEA_THEME_PATH;
+      const path = process.env.GITEA_THEME_PATH;
-      if (server && theme_path) {
+      if (server && path) {
-        const cmd = `scp dist/${prefix}*.css ${user}@${server}:${theme_path}`;
+        const cmd = `scp dist/${prefix}*.css ${user}@${server}:${path}`;
         console.log("[themePlugin] exec:", cmd);
         try {
           execSync(cmd, { stdio: "inherit" });
@@ -123,7 +105,6 @@ 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,2 +1 @@
 export { scaleColorLight } from "./scss";
-export { fallbackVar } from "./var";

src/functions/var.ts

@@ -1,13 +0,0 @@
-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,5 +1,3 @@
-export { defaultDarkChroma, defaultLightChroma } from "./core/chroma";
+export { defineTheme } from "./core/color";
-export { defineTheme, type ThemeColor } from "./core/color";
+export type { Console, Diff, Other } from "./types";
-export type { Theme } from "./core/theme";
+export { themeVars } from "./types/vars";
-export type { Ansi, Chroma, Console, Diff, Github, Message, Named, Other, Primary, Secondary } from "./types";
-export { otherThemeVars, themeVars } from "./types/vars";

src/types/color/chroma.ts

@@ -1,255 +0,0 @@
-// 注释来自 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,8 +28,6 @@ export const github = {
        * @actions `actionViewLeft` 左侧子作业激活伪元素颜色
        * @release `releaseTagMenu` 顶部栏左侧按钮激活背景色
        * @navbar `navbarRight` 头像管理员标识背景颜色
-       * @dropdown `dropdown` emoji 的悬停背景色
-       * @menu `paginationMenu` 分页菜单的激活背景色
        */
       emphasis: null,
       /** 暗淡的背景颜色
@@ -176,10 +174,6 @@ export const github = {
          * @menu `menu` 菜单项的悬停背景颜色
          * @repo `repoHeader` 仓库标题的悬停背景颜色
          * @commit `commit` 提交信息的 Action 按钮的悬停背景颜色
-         * @filelist `repoFiles` README 栏的按钮的悬停背景颜色
-         * @issue `issueSidebar` 操作按钮的悬停背景颜色
-         * @issue `issueList` 头部菜单左侧开启关闭菜单的悬停背景颜色
-         * @dashboard `dashboard` 仓库列表项目的悬停背景颜色
          */
         hover: null,
       },
@@ -199,7 +193,6 @@ export const github = {
       /** 下划线导航栏的边框颜色
        * @clone `clone` 按钮组的按钮下划线颜色
        * @menu `secondaryMenu` 二级菜单按钮的下划线颜色
-       * @filelist `repoFiles` README 栏的左边按钮下划线颜色
        */
       active: null,
     },
@@ -207,17 +200,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,4 +1,3 @@
-export { chroma } from "./chroma";
 export { ansi, console } from "./console";
 export { diff } from "./diff";
 export { github } from "./github";

src/types/color/main.ts

@@ -1,4 +1,12 @@
-const num = { num1: null, num2: null, num3: null, num4: null, num5: null, num6: null, num7: null };
+const num = {
+  num1: null,
+  num2: null,
+  num3: null,
+  num4: null,
+  num5: null,
+  num6: null,
+  num7: null,
+};
 
 const alpha = {
   num10: null,
@@ -12,12 +20,33 @@ const alpha = {
   num90: null,
 };
 
-export const primary = { self: null, contrast: null, dark: num, light: num, alpha: alpha, hover: null, active: null };
+export const primary = {
+  self: null,
+  contrast: null,
+  dark: num,
+  light: num,
+  alpha: alpha,
+  hover: null,
+  active: null,
+};
 
 export const secondary = {
   self: null,
-  dark: { num8: null, num9: null, num10: null, num11: null, num12: null, num13: null, ...num },
+  dark: {
-  light: { num1: null, num2: null, num3: null, num4: null },
+    num8: 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,8 +1,32 @@
-const msg = { bg: null, border: null, text: null };
+const msg = {
+  bg: null,
+  border: null,
+  text: null,
+};
 
-const error = { ...msg, bg: { self: null, active: null, hover: null } };
+const error = {
-const success = { ...msg };
+  ...msg,
-const warning = { ...msg };
+  bg: {
-const info = { ...msg };
+    self: null,
+    active: null,
+    hover: null,
+  },
+};
 
-export const message = { error, success, warning, info };
+const success = {
+  ...msg,
+};
+
+const warning = {
+  ...msg,
+};
+const info = {
+  ...msg,
+};
+
+export const message = {
+  error,
+  success,
+  warning,
+  info,
+};

src/types/color/named.ts

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

src/types/index.ts

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

@@ -1,4 +1,3 @@
-import { animationDown } from "src/core/theme";
 import { css, otherThemeVars, themeVars } from "src/types/vars";
 
 // 仓库 Actions 页面
@@ -58,7 +57,6 @@ 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};
@@ -134,7 +132,6 @@ 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;
@@ -203,7 +200,7 @@ export const actionViewRight = css`
 
     .job-info-header {
       padding: 16px 12px 16px 24px;
-      height: 80px;
+      height: auto;
 
       .job-info-header-title {
         color: ${themeVars.github.fgColor.accent};
@@ -215,16 +212,10 @@ 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};
         }
@@ -247,16 +238,12 @@ export const actionViewRight = css`
           }
         }
       }
-      // 步骤日志
+      /* 日志字体颜色白色 */
-      .job-step-logs {
+      .job-log-line {
-        animation: ${animationDown};
+        color: ${themeVars.color.console.fg.self};
-        /* 日志字体颜色白色 */
+        /* 被 hover 时覆盖 ANSI 颜色 */
-        .job-log-line {
+        .log-msg:hover * {
-          color: ${themeVars.color.console.fg.self};
+          color: ${themeVars.color.console.fg.self} !important;
-          /* 被 hover 时覆盖 ANSI 颜色 */
-          .log-msg:hover * {
-            color: ${themeVars.color.console.fg.self} !important;
-          }
         }
       }
     }

styles/components/chroma.ts

@@ -1,286 +0,0 @@
-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/components/clone.tsx

@@ -1,4 +1,4 @@
-import { css, customThemeVars, otherThemeVars, themeVars } from "src/types/vars";
+import { css, otherThemeVars, themeVars } from "src/types/vars";
 
 // 克隆按钮的弹窗
 export const clone = css`
@@ -52,9 +52,7 @@ 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);
-          min-width: 150px;
+          width: 332px;
-          max-width: 400px;
-          width: ${customThemeVars.cloneMenuWidth};
           &:hover {
             border: 1px solid ${themeVars.color.light.border};
             border-radius: ${otherThemeVars.border.radius};

styles/components/commit.tsx

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

styles/components/dashboard.ts

@@ -1,66 +0,0 @@
-import { css, otherThemeVars, themeVars } from "src/types/vars";
-
-export const dashboard = css`
-  .page-content.dashboard {
-    // 仓库列表的仓库/组织切换按钮
-    .ui.two.item.menu {
-      box-shadow: ${themeVars.github.shadow.floating.small};
-      border: unset;
-      border-radius: 12px;
-      margin-bottom: 8px;
-      > .item {
-        &:first-child {
-          border-radius: 12px 0 0 12px;
-        }
-        &:last-child {
-          border-radius: 0 12px 12px 0;
-        }
-      }
-    }
-    // 仓库/组织列表标题
-    .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: ${themeVars.color.menu};
-      border: unset !important;
-      box-shadow: ${themeVars.github.shadow.floating.small};
-      &.repos-search {
-        border-top-left-radius: 12px;
-        border-top-right-radius: 12px;
-      }
-      &.table {
-        &:last-child {
-          border-bottom-left-radius: 12px !important;
-          border-bottom-right-radius: 12px !important;
-        }
-        ul {
-          padding: 8px;
-          li {
-            border-radius: ${otherThemeVars.border.radius};
-            &:not(:last-child) {
-              border-bottom: 0;
-            }
-            &:hover {
-              background: ${themeVars.github.control.transparent.bgColor.hover};
-            }
-            a.muted:hover {
-              color: inherit;
-              text-decoration-line: none;
-            }
-          }
-        }
-      }
-    }
-    // 组织列表
-    .ui.tab.dashboard-orgs .ui.attached.segment.table {
-      border-top-left-radius: 12px;
-      border-top-right-radius: 12px;
-    }
-  }
-`;

styles/components/dashboard.tsx

@@ -0,0 +1,15 @@
+import { css } from "src/types/vars";
+
+export const dashboard = css`
+  .page-content.dashboard {
+    // 动态的右侧 svg 图标
+    .flex-item .flex-item-trailing svg {
+      height: 20px;
+      width: 20px;
+    }
+    // 仓库列表的仓库/组织切换按钮
+    .ui.two.item.menu {
+      background-color: unset;
+    }
+  }
+`;

styles/components/diff.tsx

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

styles/components/editor.ts

@@ -1,20 +0,0 @@
-import { css, themeVars } from "src/types/vars";
-
-export const monaco = css`
-  .monaco-editor {
-    --vscode-editor-background: ${themeVars.color.body} !important;
-    --vscode-editorGutter-background: ${themeVars.color.body} !important;
-    .monaco-mouse-cursor-text {
-      font-size: 12px !important;
-    }
-    // 滚动时固定在顶部的行
-    .sticky-widget {
-      background: ${themeVars.color.body} !important;
-      box-shadow: 0 1px 0 ${themeVars.color.secondary.self} !important;
-      width: 100% !important;
-      .sticky-line-content {
-        font-size: 12px !important;
-      }
-    }
-  }
-`;

styles/components/explore.ts

@@ -1,159 +0,0 @@
-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};
-              }
-            }
-            // 仓库语言, 星标
-            > .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;
-            }
-          }
-          // 用户描述
-          > .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.tsx

@@ -1,4 +1,4 @@
-import { css, otherThemeVars, themeVars } from "src/types/vars";
+import { css, themeVars } from "src/types/vars";
 
 // 文件列表页面下的分支按钮
 export const branchButton = css`
@@ -16,19 +16,6 @@ export const branchButton = css`
   }
 `;
 
-// 仓库同步派生
-export const syncFork = css`
-  .page-content.repository.file.list {
-    .repo-home-filelist > .ui.message {
-      background: ${themeVars.color.box.header};
-      padding: 8px 8px 8px 16px;
-      .ui.button {
-        min-width: 96px;
-      }
-    }
-  }
-`;
-
 // 仓库文件列表
 export const repoFiles = css`
   .repository.file.list {
@@ -75,7 +62,6 @@ export const repoFiles = css`
       // 文件列表
       .repo-file-item {
         .repo-file-cell {
-          height: 40px;
           &.name {
             display: flex;
             align-items: center;
@@ -88,39 +74,6 @@ 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};
-        }
-      }
-    }
   }
 `;
 
@@ -144,112 +97,6 @@ export const repoFilesMobile = css`
   }
 `;
 
-// 仓库打开文件时的视图
-export const repoFileView = css`
-  .page-content.repository.file.list {
-    > .ui.container.fluid {
-      max-width: calc(100% - calc(2 * 16px));
-    }
-    .repo-view-container {
-      position: sticky;
-      top: 0;
-      // 左侧文件树
-      .repo-view-file-tree-container {
-        height: 100vh;
-        position: sticky;
-        top: 0;
-        &:after {
-          content: "";
-          position: absolute;
-          top: -14px;
-          right: 0;
-          width: 1px;
-          height: calc(100% + 14px);
-          background: ${themeVars.color.secondary.self};
-        }
-        > .repo-button-row {
-          align-content: center;
-          background: ${themeVars.color.body};
-          height: 64px;
-          margin: 0;
-          position: sticky;
-          top: 0;
-          &:after {
-            content: "";
-            position: absolute;
-            top: 64px;
-            left: -16px;
-            width: calc(100% + 16px);
-            height: 1px;
-            background: ${themeVars.color.secondary.self};
-          }
-        }
-        .view-file-tree-items {
-          margin-right: 0;
-          padding: 16px 16px 16px 0;
-        }
-      }
-      // 右侧文件视图内容
-      .repo-view-content {
-        .repo-button-row {
-          align-content: center;
-          background: ${themeVars.color.box.header};
-          border: 1px solid ${themeVars.color.secondary.self};
-          border-radius: ${otherThemeVars.border.radius};
-          height: 46px;
-          min-height: 46px;
-          padding: 8px;
-          position: sticky;
-          top: 0;
-          z-index: 1;
-        }
-        .non-diff-file-content {
-          // 避免分支菜单遮挡
-          position: relative;
-          z-index: 0;
-          h4.file-header {
-            position: sticky;
-            // 重叠边框线, 避免过粗
-            top: 45px;
-            z-index: 1;
-          }
-        }
-        // 头部提交信息
-        .ui.segment#repo-file-commit-box {
-          padding: 8px 12px;
-          margin-bottom: 8px !important;
-          > .latest-commit {
-            gap: 8px;
-          }
-          // 右侧提交时间
-          > .age {
-            display: flex;
-            align-items: center;
-          }
-        }
-      }
-    }
-  }
-`;
-
-// 避免手机/平板下路径容器过长导致换行, 取消固定
-export const repoFileViewMobile = css`
-  @media (max-width: 1023.98px) {
-    .page-content.repository.file.list .repo-view-container .repo-view-content {
-      .repo-button-row {
-        height: auto;
-        position: static;
-        z-index: 0;
-      }
-      .non-diff-file-content {
-        h4.file-header {
-          top: 0;
-        }
-      }
-    }
-  }
-`;
-
 // 仓库代码布局调整, 侧边栏宽度调整
 export const repoGrid = css`
   .repo-grid-filelist-sidebar {

styles/components/heatmap.ts

@@ -1,89 +0,0 @@
-import { css, otherThemeVars, themeVars } from "src/types/vars";
-
-export const heatmap = css`
-  #user-heatmap {
-    .total-contributions {
-      left: 25px + 20px;
-      bottom: 0 + 12px;
-    }
-    .total-contributions,
-    .vch__legend-right {
-      color: ${themeVars.color.text.light.num1};
-    }
-    .vch__container {
-      padding: 12px 20px;
-      border: 1px solid ${themeVars.color.secondary.self};
-      border-radius: ${otherThemeVars.border.radius};
-      // 覆盖热力图和图例的背景色
-      .vch__day__square,
-      .vch__legend__wrapper rect {
-        // 圆角
-        rx: 2.5px;
-        ry: 2.5px;
-        // hover 时的圆角
-        border-radius: 0.75px;
-        // 宽度和高度可以用来控制间隔
-        width: 9px;
-        height: 9px;
-        // 边框
-        outline: 0.5px solid ${themeVars.github.contribution.default.borderColor.num0};
-        // 边框向内偏移
-        outline-offset: -0.5px;
-
-        &[style="fill: var(--color-secondary-alpha-60);"] {
-          fill: ${themeVars.github.contribution.default.bgColor.num0} !important;
-        }
-
-        &[style="fill: var(--color-primary-light-4);"] {
-          fill: ${themeVars.github.contribution.default.bgColor.num1} !important;
-          outline-color: ${themeVars.github.contribution.default.borderColor.num1};
-        }
-
-        &[style="fill: var(--color-primary-light-2);"] {
-          fill: ${themeVars.github.contribution.default.bgColor.num2} !important;
-          outline-color: ${themeVars.github.contribution.default.borderColor.num2};
-        }
-
-        &[style="fill: var(--color-primary);"] {
-          fill: ${themeVars.github.contribution.default.bgColor.num3} !important;
-          outline-color: ${themeVars.github.contribution.default.borderColor.num3};
-        }
-
-        &[style="fill: var(--color-primary-dark-2);"] {
-          fill: ${themeVars.github.contribution.default.bgColor.num4} !important;
-          outline-color: ${themeVars.github.contribution.default.borderColor.num4};
-        }
-
-        &[style="fill: var(--color-primary-dark-4);"] {
-          fill: ${themeVars.github.contribution.default.bgColor.num5} !important;
-          outline-color: ${themeVars.github.contribution.default.borderColor.num5};
-        }
-      }
-    }
-  }
-`;
-
-// 动态
-export const activity = css`
-  #activity-feed {
-    .flex-item {
-      gap: 12px;
-      padding: 16px 0;
-      &:first-child {
-        padding-top: 6px;
-      }
-      > .flex-item-main {
-        gap: 8px !important;
-
-        relative-time {
-          color: ${themeVars.color.text.light.num1};
-        }
-      }
-      // 动态的右侧 svg 图标
-      .flex-item-trailing svg {
-        height: 20px;
-        width: 20px;
-      }
-    }
-  }
-`;

styles/components/heatmap.tsx

@@ -0,0 +1,51 @@
+import { css, themeVars } from "src/types/vars";
+
+export const heatmap = css`
+  .vch__container {
+    // 覆盖热力图和图例的背景色
+    .vch__day__square,
+    .vch__legend__wrapper rect {
+      // 圆角
+      rx: 2.5px;
+      ry: 2.5px;
+      // hover 时的圆角
+      border-radius: 0.75px;
+      // 宽度和高度可以用来控制间隔
+      width: 9px;
+      height: 9px;
+      // 边框
+      outline: 0.5px solid ${themeVars.github.contribution.default.borderColor.num0};
+      // 边框向内偏移
+      outline-offset: -0.5px;
+
+      &[style="fill: var(--color-secondary-alpha-60);"] {
+        fill: ${themeVars.github.contribution.default.bgColor.num0} !important;
+      }
+
+      &[style="fill: var(--color-primary-light-4);"] {
+        fill: ${themeVars.github.contribution.default.bgColor.num1} !important;
+        outline-color: ${themeVars.github.contribution.default.borderColor.num1};
+      }
+
+      &[style="fill: var(--color-primary-light-2);"] {
+        fill: ${themeVars.github.contribution.default.bgColor.num2} !important;
+        outline-color: ${themeVars.github.contribution.default.borderColor.num2};
+      }
+
+      &[style="fill: var(--color-primary);"] {
+        fill: ${themeVars.github.contribution.default.bgColor.num3} !important;
+        outline-color: ${themeVars.github.contribution.default.borderColor.num3};
+      }
+
+      &[style="fill: var(--color-primary-dark-2);"] {
+        fill: ${themeVars.github.contribution.default.bgColor.num4} !important;
+        outline-color: ${themeVars.github.contribution.default.borderColor.num4};
+      }
+
+      &[style="fill: var(--color-primary-dark-4);"] {
+        fill: ${themeVars.github.contribution.default.bgColor.num5} !important;
+        outline-color: ${themeVars.github.contribution.default.borderColor.num5};
+      }
+    }
+  }
+`;

styles/components/index.tsx

@@ -3,16 +3,10 @@ import "./clone";
 import "./commit";
 import "./dashboard";
 import "./diff";
-import "./explore";
 import "./filelist";
 import "./heatmap";
 import "./issue";
 import "./newrepo";
-import "./org";
 import "./release";
 import "./repo";
 import "./setting";
-import "./signin";
-import "./user";
-import "./chroma";
-import "./editor"

styles/components/issue.ts

@@ -1,555 +0,0 @@
-import { css, otherThemeVars, themeVars } from "src/types/vars";
-import { activeItemAfterStyle } from "styles/public/menu";
-
-// 工单&PR 列表
-export const issueList = css`
-  .page-content.repository.issue-list {
-    // 头部筛选菜单栏
-    .issue-list-toolbar {
-      align-items: center;
-      align-content: center;
-      background-color: ${themeVars.color.box.header};
-      border: 1px solid ${themeVars.color.light.border};
-      border-bottom: 0;
-      border-top-left-radius: ${otherThemeVars.border.radius};
-      border-top-right-radius: ${otherThemeVars.border.radius};
-      height: 48px;
-      padding: 8px;
-      .issue-list-toolbar-left {
-        // 复选框
-        input {
-          margin: 0 8px !important;
-        }
-        > .ui.compact.menu {
-          align-items: center;
-          border: 0;
-          > .item {
-            background: unset !important;
-            border-radius: ${otherThemeVars.border.radius};
-            color: ${themeVars.color.text.light.num1};
-            padding: 0px 8px;
-            height: 30px;
-            &:before {
-              display: none;
-            }
-            &:hover {
-              background: ${themeVars.github.control.transparent.bgColor.hover} !important;
-            }
-            &.active {
-              color: ${themeVars.color.text.self};
-              font-weight: 700;
-            }
-          }
-        }
-      }
-      .issue-list-toolbar-right > .ui.menu {
-        align-items: center;
-        > .item {
-          color: ${themeVars.color.text.light.num1};
-        }
-        > .ui.button {
-          padding: 0 12px;
-          height: 32px;
-        }
-      }
-    }
-    // Issue 列表
-    .flex-list#issue-list {
-      border: 1px solid ${themeVars.color.light.border};
-      border-bottom-left-radius: ${otherThemeVars.border.radius};
-      border-bottom-right-radius: ${otherThemeVars.border.radius};
-      > .flex-item {
-        align-items: center;
-        padding: 0;
-        &:last-child {
-          border-bottom-left-radius: ${otherThemeVars.border.radius};
-          border-bottom-right-radius: ${otherThemeVars.border.radius};
-        }
-        &:hover {
-          background-color: ${themeVars.color.hover.opaque};
-        }
-        > .flex-item-icon {
-          display: flex;
-          gap: 4px;
-          margin-left: 8px;
-          // 复选框
-          input {
-            background: unset;
-            margin-top: 14px;
-            margin-left: 8px;
-            margin-right: 8px !important;
-          }
-          svg {
-            margin-top: 14px;
-          }
-        }
-        > .flex-item-main {
-          gap: 4px;
-          .flex-item-header {
-            padding-top: 8px;
-          }
-          .flex-item-body {
-            font-size: 12px;
-            padding-bottom: 8px;
-          }
-        }
-        > .flex-item-trailing {
-          margin-right: 32px;
-        }
-      }
-    }
-  }
-`;
-
-// 避免手机/平板下菜单错位
-export const issueListMobile = css`
-  @media (max-width: 1023.98px) {
-    .page-content.repository.issue-list .issue-list-toolbar {
-      height: auto;
-    }
-  }
-`;
-
-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};
-    }
-  }
-  // 工单&PR标题右侧按钮
-  .repository.view.issue .issue-title-buttons > .ui.button {
-    padding: 0 12px;
-    height: 32px;
-  }
-`;
-
-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;
-      min-height: 38px;
-    }
-    .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};
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-
-const sidebarPadding = {
-  padding: "4px 8px",
-};
-
-// 侧边栏
-export const issueSidebar = css`
-  .issue-content {
-    gap: 24px;
-    .issue-content-right {
-      border: 0;
-      font-size: 12px;
-      padding: 0;
-      .ui.button {
-        font-size: 12px;
-      }
-      .ui.form,
-      a.fixed-text.muted,
-      span.text,
-      // 列表项为空时的文字
-      span.item.empty-list,
-      p {
-        color: ${themeVars.color.text.light.num1};
-        font-size: 12px;
-      }
-      .ui.dropdown.select-branch,
-      .ui.form,
-      a.fixed-text.muted,
-      span.text,
-      .ui.watching > div,
-      .ui.depending > div,
-      .flex-text-block,
-      .ui.list,
-      p {
-        ${sidebarPadding};
-      }
-      .issue-sidebar-combo {
-        .ui.dropdown > a.fixed-text.muted {
-          align-items: center;
-          border-radius: ${otherThemeVars.border.radius};
-          text-decoration-line: none;
-          height: 28px;
-          &:hover {
-            background: ${themeVars.github.control.transparent.bgColor.hover};
-          }
-        }
-        .ui.list {
-          margin-top: 0 !important;
-          margin-bottom: 0 !important;
-        }
-      }
-      // 时间追踪
-      > div:not([class]):not([id]) > .ui.dropdown.jump > a.fixed-text.muted {
-        align-items: center;
-        border-radius: ${otherThemeVars.border.radius};
-        text-decoration-line: none;
-        height: 28px;
-        &:hover {
-          background: ${themeVars.github.control.transparent.bgColor.hover};
-        }
-      }
-      // 选中日期颜色
-      .ui.form .due-date {
-        color: ${themeVars.color.text.self};
-      }
-      .divider {
-        margin: 12px 0 12px 8px;
-        width: calc(100% - 16px);
-      }
-      // 订阅按钮
-      .ui.watching .ui.button {
-        padding: 0px 8px;
-        height: 28px;
-        svg {
-          margin: 0 !important;
-        }
-      }
-      // PIN 按钮
-      .form-fetch-action.single-button-form .ui.button,
-      // 底部操作按钮
-      .ui.show-modal.button {
-        border: 0;
-        background: unset;
-        font-weight: 400;
-        ${sidebarPadding};
-        // 好像是浏览器 BUG, 最后不生效, 必须 !important
-        margin: 0 !important;
-        justify-content: left;
-        &:hover {
-          background: ${themeVars.github.control.transparent.bgColor.hover};
-        }
-      }
-      .ui.show-modal.button[data-modal="#sidebar-delete-issue"] {
-        color: ${themeVars.color.red.self};
-        svg {
-          color: ${themeVars.color.red.self};
-        }
-        &:hover {
-          background-color: ${themeVars.color.red.badge.bg};
-          color: ${themeVars.color.red.light};
-          svg {
-            color: ${themeVars.color.red.light};
-          }
-        }
-      }
-    }
-  }
-`;

styles/components/issue.tsx

@@ -0,0 +1,231 @@
+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.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}
+      }
+    }
+  }
+`;
+
+// PR 界面的 PR 操作评论
+export const prMerge = css`
+  .repository.view.issue .comment-list .timeline-item.pull-merge-box {
+    // 头像
+    .timeline-avatar.green {
+      background-color: ${themeVars.github.bgColor.success.emphasis};
+      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;
+      }
+    }
+    // 检查状态
+    .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/org.ts

@@ -1,21 +0,0 @@
-import { css, themeVars } from "src/types/vars";
-
-export const org = css`
-  .page-content.organization {
-    #org-info {
-      .ui.header {
-        // 组织页面的 RSS 订阅按钮
-        .ui.label.button {
-          padding: 4px 16px;
-          .svg {
-            width: 20px;
-            min-width: 20px;
-          }
-          &:hover {
-            border-color: ${themeVars.color.light.border};
-          }
-        }
-      }
-    }
-  }
-`;

styles/components/release.tsx

@@ -11,7 +11,6 @@ export const releaseTagMenu = css`
           font-weight: 500;
           &.active {
             background: ${themeVars.github.bgColor.accent.emphasis} !important;
-            color: ${themeVars.color.white};
           }
         }
       }
@@ -102,8 +101,6 @@ 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.tsx

@@ -74,19 +74,18 @@ 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.white};
+      color: ${themeVars.color.text.self};
     }
   }
 `;

styles/components/setting.tsx

@@ -76,3 +76,33 @@ 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

@@ -1,49 +0,0 @@
-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;
-      padding: 16px;
-    }
-
-    .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/components/user.ts

@@ -1,62 +0,0 @@
-import { css, themeVars } from "src/types/vars";
-
-// 用户点星仓库列表
-export const stars = css`
-  .page-content.user.profile {
-    .stars {
-      > .flex-list {
-        > .flex-item {
-          padding: 24px 0;
-          &:first-child {
-            padding-top: 14px;
-          }
-          // 仓库头像
-          > .flex-item-leading {
-            img,
-            svg {
-              color: ${themeVars.color.text.light.num1};
-            }
-          }
-          // 仓库信息
-          > .flex-item-main {
-            // 仓库标题
-            > .flex-item-header {
-              // 仓库名称
-              > .flex-item-title {
-                font-size: 20px;
-                gap: 8px;
-                // 仓库中间的间隔线
-                &:not(a) {
-                  color: ${themeVars.color.primary.self};
-                }
-              }
-              // 仓库语言, 星标
-              > .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: 10px;
-              // 更新时间
-              &:last-child {
-                font-size: 12px;
-              }
-            }
-            // 主题标签
-            > .label-list {
-              margin-top: 10px;
-            }
-          }
-        }
-      }
-    }
-  }
-`;

styles/public/attached.ts

@@ -1,36 +0,0 @@
-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.repository.new.fork,
-  .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/chroma.tsx

@@ -0,0 +1,277 @@
+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.tsx

@@ -19,15 +19,13 @@ export const dropdown = css`
         gap: 0.5rem;
         padding: 8px 10px !important;
         border-radius: ${otherThemeVars.border.radius} !important;
-        &:not(.emoji) {
+        margin: 0 0.5rem;
-          margin: 0 0.5rem;
+        &:first-of-type {
-        }
-        &:not(.emoji):first-of-type {
           margin-top: 0.5rem;
         }
         // 不知道为什么提交差异对比页面操作中的 cherrypick 按钮无法被选中
         &.cherry-pick-button,
-        &:not(.emoji):last-of-type {
+        &:last-of-type {
           margin-bottom: 0.5rem;
         }
         &:hover {
@@ -39,6 +37,9 @@ export const dropdown = css`
             background-color: ${themeVars.github.control.transparent.bgColor.hover} !important;
           }
         }
+        svg {
+          margin-right: 0.5rem;
+        }
         &.active,
         &.selected {
           &:after {
@@ -120,15 +121,6 @@ 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,
@@ -162,52 +154,10 @@ 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) {
-    border-top-left-radius: ${otherThemeVars.border.radius} !important;
+    border-top-left-radius: ${otherThemeVars.border.radius}!important;
-    border-top-right-radius: ${otherThemeVars.border.radius} !important;
+    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.tsx

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

styles/public/label.tsx

@@ -166,19 +166,12 @@ export const taskStatusLabel = css`
 // 仓库标签 (私有/公开/内部)
 export const repoLabel = css`
   span,
-  // 用户切换面板的标签
   .org-visibility div {
     &.ui.basic.label {
       background-color: unset;
       color: ${themeVars.color.text.light.num1};
-      font-size: 12px;
-      font-weight: 500;
-      padding: 3px 6px;
     }
   }
-  .org-visibility span.ui.basic.label {
-    font-size: 14px;
-  }
 `;
 
 // 软件包列表

styles/public/menu.tsx

@@ -193,46 +193,3 @@ 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};
-        }
-      }
-      &.navigation {
-        &:not(.disabled) {
-          span,
-          svg {
-            color: ${themeVars.color.primary.self};
-          }
-        }
-        // 对齐文字
-        svg {
-          margin-top: 2px;
-        }
-      }
-    }
-  }
-`;

styles/public/navbar.tsx

@@ -1,9 +1,8 @@
-import { css, otherThemeVars, themeVars } from "src/types/vars";
+import { css, themeVars } from "src/types/vars";
 
 export const navbarRight = css`
   #navbar {
-    // 进入用户页面后, 避免注册, 登录和首页等意外覆盖
+    .navbar-right {
-    .navbar-right:has(.user-menu) {
       gap: 8px;
       // 右侧按钮, 但不包括头像
       > .item:not(:last-child) {
@@ -14,7 +13,6 @@ 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;
@@ -69,7 +67,7 @@ export const navbarRight = css`
         .navbar-profile-admin {
           background-color: ${themeVars.github.bgColor.accent.emphasis};
           border-radius: 25px;
-          color: ${themeVars.color.white};
+          color: ${themeVars.color.text.self};
           font-size: 8px;
           font-weight: 600;
           padding: 2px 5px;
@@ -77,27 +75,14 @@ export const navbarRight = css`
           left: 22px;
         }
       }
-      // 通知和计时器的圆点
-      a.item {
-        .notification_count,
-        .header-stopwatch-dot {
-          background-color: ${themeVars.github.bgColor.accent.emphasis};
-          border-radius: 25px;
-          color: ${themeVars.color.white};
-          font-size: 8px;
-          font-weight: 600;
-          top: -14px;
-          left: 12px;
-        }
-      }
     }
   }
   // 手机下的创建菜单按钮
   @media (max-width: 767.98px) {
-    #navbar .navbar-right:has(.user-menu) > .item:not(:last-child) {
+    #navbar .navbar-right > .item:not(:last-child) {
       display: none;
     }
-    #navbar.navbar-menu-open .navbar-right:has(.user-menu) > .item:not(:last-child) {
+    #navbar.navbar-menu-open .navbar-right > .item:not(:last-child) {
       display: grid;
     }
   }

styles/public/radius.tsx

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

styles/public/transition.scss

@@ -0,0 +1,44 @@
+// 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,
+.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

@@ -1,61 +0,0 @@
-import { css } from "src/types/vars";
-
-// 简单的渐变过渡
-export const transition = css`
-  // 差异对比的代码折叠按钮
-  .code-expander-button,
-  // 仓库 README 头部的按钮
-  .file-header-left,
-  .file-header-right,
-  // 仪表板仓库列表
-  .ui.attached.segment.table ul li,
-  // Issue 列表
-  .issue-list-toolbar .item,
-  .flex-list#issue-list > .flex-item,
-  // 分页菜单
-  .ui.borderless.pagination.menu .item,
-  // 迁移的元素
-  #navbar .item,
-  .header-wrapper .ui.tabular.menu .item,
-  .job-step-summary,
-  .job-step-logs,
-  .job-brief-item,
-  .repo-file-cell,
-  .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/colorblind-dark.css.ts

@@ -1,73 +0,0 @@
-import { defineTheme, type Chroma, type ThemeColor } from "src";
-import { github2ThemeColor, type GithubColor } from "src/core/github";
-import { prettylights2Chroma, type prettylightsColor } from "src/core/prettylights";
-import { darkGithubColors } from "themes/dark";
-
-export const colorblindDarkGithubColors: GithubColor = {
-  isDarkTheme: true,
-  display: darkGithubColors.display,
-  diffBlob: {
-    addtionNum: { bgColor: "#58a6ff4d" },
-    addtionWord: { bgColor: "#388bfd66" },
-    deletionNum: { bgColor: "#db6d284d" },
-    deletionWord: { bgColor: "#db6d2866" },
-    hunkNum: { bgColor: { rest: "#2f3742" } },
-  },
-  fgColor: {
-    ...darkGithubColors.fgColor,
-    danger: "#f0883e",
-    success: "#58a6ff",
-  },
-  bgColor: {
-    ...darkGithubColors.bgColor,
-    danger: { muted: "#db6d281a" },
-    success: { emphasis: "#1f6feb", muted: "#388bfd33" },
-  },
-  borderColor: {
-    ...darkGithubColors.borderColor,
-    success: { emphasis: "#1f6feb" },
-  },
-  button: {
-    primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#2a7aef" } },
-    danger: { fgColor: { rest: "#f0883e", hover: "#ffffff" }, bgColor: { hover: "#9b4215" } },
-  },
-  control: darkGithubColors.control,
-  shadow: darkGithubColors.shadow,
-  overlay: darkGithubColors.overlay,
-  underlineNav: darkGithubColors.underlineNav,
-  contribution: darkGithubColors.contribution,
-};
-export const colorblindDarkPrettylights: prettylightsColor = {
-  syntax: {
-    brackethighlighter: { angle: "#9198a1", unmatched: "#db6d28" },
-    carriage: { return: { bg: "#9b4215", text: "#f0f6fc" } },
-    comment: "#9198a1",
-    constant: "#79c0ff",
-    constantOtherReferenceLink: "#a5d6ff",
-    entity: "#d2a8ff",
-    entityTag: "#a5d6ff",
-    invalid: { illegal: { bg: "#762d0a", text: "#f0f6fc" } },
-    keyword: "#f0883e",
-    markup: {
-      bold: "#f0f6fc",
-      changed: { bg: "#5a1e02", text: "#ffdfb6" },
-      deleted: { bg: "#5a1e02", text: "#ffdfb6" },
-      heading: "#1f6feb",
-      ignored: { bg: "#1158c7", text: "#f0f6fc" },
-      inserted: { bg: "#0c2d6b", text: "#cae8ff" },
-      italic: "#f0f6fc",
-      list: "#f2cc60",
-    },
-    metaDiffRange: "#d2a8ff",
-    storageModifierImport: "#f0f6fc",
-    string: "#a5d6ff",
-    stringRegexp: "#a5d6ff",
-    sublimelinterGutterMark: "#3d444d",
-    variable: "#ffa657",
-  },
-};
-
-export const colorblindDarkColors: ThemeColor = github2ThemeColor(colorblindDarkGithubColors);
-export const colorblindDarkChroma: Chroma = prettylights2Chroma(colorblindDarkPrettylights);
-
-export default defineTheme(colorblindDarkColors);

themes/colorblind-light.css.ts

@@ -1,73 +0,0 @@
-import { defineTheme, type Chroma, type ThemeColor } from "src";
-import { github2ThemeColor, type GithubColor } from "src/core/github";
-import { prettylights2Chroma, type prettylightsColor } from "src/core/prettylights";
-import { lightGithubColors } from "themes/light";
-
-export const colorblindLightGithubColors: GithubColor = {
-  isDarkTheme: false,
-  display: lightGithubColors.display,
-  diffBlob: {
-    addtionNum: { bgColor: "#b6e3ff" },
-    addtionWord: { bgColor: "#b6e3ff" },
-    deletionNum: { bgColor: "#ffd8b5" },
-    deletionWord: { bgColor: "#ffd8b5" },
-    hunkNum: { bgColor: { rest: "#e6eaef" } },
-  },
-  fgColor: {
-    ...lightGithubColors.fgColor,
-    danger: "#bc4c00",
-    success: "#0969da",
-  },
-  bgColor: {
-    ...lightGithubColors.bgColor,
-    danger: { muted: "#fff1e5" },
-    success: { emphasis: "#0969da", muted: "#ddf4ff" },
-  },
-  borderColor: {
-    ...lightGithubColors.borderColor,
-    success: { emphasis: "#0969da" },
-  },
-  button: {
-    primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#0864d1" } },
-    danger: { fgColor: { rest: "#bc4c00", hover: "#ffffff" }, bgColor: { hover: "#bc4c00" } },
-  },
-  control: lightGithubColors.control,
-  shadow: lightGithubColors.shadow,
-  overlay: lightGithubColors.overlay,
-  underlineNav: lightGithubColors.underlineNav,
-  contribution: lightGithubColors.contribution,
-};
-export const colorblindLightPrettylights: prettylightsColor = {
-  syntax: {
-    brackethighlighter: { angle: "#59636e", unmatched: "#762c00" },
-    carriage: { return: { bg: "#bc4c00", text: "#f6f8fa" } },
-    comment: "#59636e",
-    constant: "#0550ae",
-    constantOtherReferenceLink: "#0a3069",
-    entity: "#6639ba",
-    entityTag: "#0550ae",
-    invalid: { illegal: { bg: "#762c00", text: "#f6f8fa" } },
-    keyword: "#bc4c00",
-    markup: {
-      bold: "#1f2328",
-      changed: { bg: "#ffd8b5", text: "#953800" },
-      deleted: { bg: "#fff1e5", text: "#762c00" },
-      heading: "#0550ae",
-      ignored: { bg: "#0550ae", text: "#d1d9e0" },
-      inserted: { bg: "#ddf4ff", text: "#0550ae" },
-      italic: "#1f2328",
-      list: "#3b2300",
-    },
-    metaDiffRange: "#8250df",
-    storageModifierImport: "#1f2328",
-    string: "#0a3069",
-    stringRegexp: "#0550ae",
-    sublimelinterGutterMark: "#818b98",
-    variable: "#953800",
-  },
-};
-
-export const colorblindLightColors: ThemeColor = github2ThemeColor(colorblindLightGithubColors);
-export const colorblindLightChroma: Chroma = prettylights2Chroma(colorblindLightPrettylights);
-
-export default defineTheme(colorblindLightColors);

themes/dark.css.tsx

@@ -1,7 +1,6 @@
-import { defineTheme, type ThemeColor } from "src";
+import { defineGithubTheme, type GithubColor } from "src/core/github";
-import { github2ThemeColor, type GithubColor } from "src/core/github";
 
-export const darkGithubColors: GithubColor = {
+const github: GithubColor = {
   isDarkTheme: true,
   display: {
     brown: { fgColor: "#b69a6d" },
@@ -23,55 +22,53 @@ export const darkGithubColors: GithubColor = {
     attention: "#d29922",
     danger: "#f85149",
     default: "#f0f6fc",
-    disabled: "#656c76",
+    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" },
     attention: { muted: "#bb800926" },
+    success: { emphasis: "#238636", muted: "#2ea04326" },
     danger: { muted: "#f851491a" },
-    default: "#0d1117",
     done: { emphasis: "#8957e5" },
+    default: "#0d1117",
+    inset: "#010409",
     muted: "#151b23",
     neutral: { muted: "#656c7633" },
-    success: { emphasis: "#238636", muted: "#2ea04326" },
-    inset: "#010409",
   },
   borderColor: {
     accent: { emphasis: "#1f6feb" },
-    attention: { emphasis: "#9e6a03" },
     default: "#3d444d",
-    done: { emphasis: "#8957e5" },
+    attention: { emphasis: "#9e6a03" },
     success: { emphasis: "#238636" },
+    done: { emphasis: "#8957e5" },
     muted: "#3d444db3",
     translucent: "#ffffff26",
   },
   button: {
-    primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#29903b" } },
+    primary: { fgColor: { accent: "#39d353", rest: "#ffffff" }, bgColor: { rest: "#238636", 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: { small: "#01040966" } },
+  shadow: { floating: "#01040966" },
   overlay: { backdrop: { bgColor: "#21283066" } },
   underlineNav: { borderColor: { active: "#f78166" } },
   contribution: {
     default: {
-      bgColor: { num0: "#151b23", num1: "#033a16", num2: "#196c2e", num3: "#2ea043", num4: "#56d364" },
+      bgColor: { num0: "#151b23", num1: "#033a16", num2: "#196c2e", num3: "#2ea043", num4: "#56d364", num5: "#7ee787" },
       borderColor: { num0: "#0104090d" },
     },
   },
 };
 
-export const darkColors: ThemeColor = github2ThemeColor(darkGithubColors);
+export default defineGithubTheme(github);
-
-export default defineTheme(darkColors);

themes/light.css.ts

@@ -1,77 +0,0 @@
-import { defineTheme, type ThemeColor } from "src";
-import { github2ThemeColor, type GithubColor } from "src/core/github";
-
-export const lightGithubColors: GithubColor = {
-  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" },
-    danger: { muted: "#ffebe9" },
-    default: "#ffffff",
-    done: { emphasis: "#8250df" },
-    muted: "#f6f8fa",
-    neutral: { muted: "#818b981f" },
-    success: { emphasis: "#1f883d", muted: "#dafbe1" },
-    inset: "#f6f8fa",
-  },
-  borderColor: {
-    accent: { emphasis: "#0969da" },
-    attention: { emphasis: "#9a6700" },
-    default: "#d1d9e0",
-    done: { emphasis: "#8250df" },
-    success: { emphasis: "#1a7f37" },
-    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" },
-    },
-  },
-};
-
-export const lightColors: ThemeColor = github2ThemeColor(lightGithubColors);
-
-export default defineTheme(lightColors);

themes/soft-dark.css.ts

@@ -1,103 +0,0 @@
-import { defineTheme, type Chroma, type ThemeColor } from "src";
-import { github2ThemeColor, type GithubColor } from "src/core/github";
-import { prettylights2Chroma, type prettylightsColor } from "src/core/prettylights";
-import { darkGithubColors } from "themes/dark";
-
-export const softDarkGithubColors: GithubColor = {
-  isDarkTheme: true,
-  display: darkGithubColors.display,
-  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" },
-    danger: { muted: "#e5534b1a" },
-    default: "#212830",
-    done: { emphasis: "#8256d0" },
-    muted: "#262c36",
-    neutral: { muted: "#656c7633" },
-    success: { emphasis: "#347d39", muted: "#46954a26" },
-    inset: "#151b23",
-  },
-  borderColor: {
-    accent: { emphasis: "#316dca" },
-    attention: { emphasis: "#966600" },
-    default: "#3d444d",
-    done: { emphasis: "#8256d0" },
-    success: { emphasis: "#347d39" },
-    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" },
-    },
-  },
-};
-
-export const softDarkPrettylights: prettylightsColor = {
-  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",
-  },
-};
-
-export const softDarkColors: ThemeColor = github2ThemeColor(softDarkGithubColors);
-export const softDarkChroma: Chroma = prettylights2Chroma(softDarkPrettylights);
-
-export default defineTheme(softDarkColors, softDarkChroma);

themes/tritanopia-dark.css.ts

@@ -1,45 +0,0 @@
-import { defineTheme, type Chroma, type ThemeColor } from "src";
-import { darkPrettylights } from "src/core/chroma";
-import { github2ThemeColor, type GithubColor } from "src/core/github";
-import { prettylights2Chroma, type prettylightsColor } from "src/core/prettylights";
-import { colorblindDarkGithubColors, colorblindDarkPrettylights } from "themes/colorblind-dark";
-import { darkGithubColors } from "themes/dark";
-
-export const tritanopiaDarkGithubColors: GithubColor = {
-  ...colorblindDarkGithubColors,
-  diffBlob: {
-    ...colorblindDarkGithubColors.diffBlob,
-    deletionNum: darkGithubColors.diffBlob.deletionNum,
-    deletionWord: darkGithubColors.diffBlob.deletionWord,
-  },
-  fgColor: {
-    ...colorblindDarkGithubColors.fgColor,
-    danger: darkGithubColors.fgColor.danger,
-  },
-  bgColor: {
-    ...colorblindDarkGithubColors.bgColor,
-    danger: darkGithubColors.bgColor.danger,
-  },
-  button: {
-    ...colorblindDarkGithubColors.button,
-    danger: darkGithubColors.button.danger,
-  },
-};
-
-export const tritanopiaDarkPrettylights: prettylightsColor = {
-  syntax: {
-    ...darkPrettylights.syntax,
-    markup: {
-      ...darkPrettylights.syntax.markup,
-      changed: { bg: "#67060c", text: "#ffdcd7" },
-      inserted: colorblindDarkPrettylights.syntax.markup.inserted,
-    },
-    stringRegexp: colorblindDarkPrettylights.syntax.stringRegexp,
-    variable: "#ffa198",
-  },
-};
-
-export const tritanopiaDarkColors: ThemeColor = github2ThemeColor(tritanopiaDarkGithubColors);
-export const tritanopiaDarkChroma: Chroma = prettylights2Chroma(tritanopiaDarkPrettylights);
-
-export default defineTheme(tritanopiaDarkColors, tritanopiaDarkChroma);

themes/tritanopia-light.css.ts

@@ -1,45 +0,0 @@
-import { defineTheme, type Chroma, type ThemeColor } from "src";
-import { lightPrettylights } from "src/core/chroma";
-import { github2ThemeColor, type GithubColor } from "src/core/github";
-import { prettylights2Chroma, type prettylightsColor } from "src/core/prettylights";
-import { colorblindLightGithubColors, colorblindLightPrettylights } from "themes/colorblind-light";
-import { lightGithubColors } from "themes/light";
-
-export const tritanopiaLightGithubColors: GithubColor = {
-  ...colorblindLightGithubColors,
-  diffBlob: {
-    ...colorblindLightGithubColors.diffBlob,
-    deletionNum: lightGithubColors.diffBlob.deletionNum,
-    deletionWord: lightGithubColors.diffBlob.deletionWord,
-  },
-  fgColor: {
-    ...colorblindLightGithubColors.fgColor,
-    danger: lightGithubColors.fgColor.danger,
-  },
-  bgColor: {
-    ...colorblindLightGithubColors.bgColor,
-    danger: lightGithubColors.bgColor.danger,
-  },
-  button: {
-    ...colorblindLightGithubColors.button,
-    danger: lightGithubColors.button.danger,
-  },
-};
-
-export const tritanopiaLightPrettylights: prettylightsColor = {
-  syntax: {
-    ...lightPrettylights.syntax,
-    markup: {
-      ...lightPrettylights.syntax.markup,
-      changed: { bg: "#ffcecb", text: "#a40e26" },
-      inserted: colorblindLightPrettylights.syntax.markup.inserted,
-    },
-    stringRegexp: colorblindLightPrettylights.syntax.stringRegexp,
-    variable: "#a40e26",
-  },
-};
-
-export const tritanopiaLightColors: ThemeColor = github2ThemeColor(tritanopiaLightGithubColors);
-export const tritanopiaLightChroma: Chroma = prettylights2Chroma(tritanopiaLightPrettylights);
-
-export default defineTheme(tritanopiaLightColors, tritanopiaLightChroma);

tsconfig.json

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

vite.config.ts

@@ -1,4 +1,5 @@
 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";
@@ -23,7 +24,7 @@ export default defineConfig(({ mode }) => {
         styles: path.resolve(__dirname, "styles"),
         themes: path.resolve(__dirname, "themes"),
       },
-      extensions: [".js", ".ts", ".css.ts"],
+      extensions: [".js", ".jsx", ".ts", ".tsx", ".css.tsx"],
     },
     css: {
       transformer: "lightningcss",
@@ -34,15 +35,16 @@ export default defineConfig(({ mode }) => {
     },
     plugins: [
       linaria({
-        include: ["**/*.ts"],
+        include: ["**/*.{ts,tsx}"],
         babelOptions: {
-          presets: ["@babel/preset-typescript"],
+          presets: ["@babel/preset-typescript", "@babel/preset-react"],
         },
         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(),
     ],