beta

.env.example

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

.github/release-template.md

@@ -1,3 +1,5 @@
+## 🎉
+
 ## ✨ Feature
 
 #### CSS 变量
@@ -6,6 +8,4 @@
 
 #### 更符合 GitHub 风格
 
-## 🎈 Perf
-
 ## 🐞 Fix

.github/release.md

@@ -1,21 +1,8 @@
 ## ✨ Feature
 
-- 支持自动颜色主题 (跟随系统)
+- 支持色盲主题(Beta) ( 红绿色盲和蓝色盲 ) ( Colorblind & Tritanopia )
-- 支持亮色主题
-- 支持柔和的暗色主题 (dark-dimmed)
-
-## 🌈 Style
-
-#### 更符合 GitHub 风格
-
-- 同步查看文件内容时的代码高亮色 (由于词法分析器的差异和解析问题, 只能实现大概相似, 目前观察到在 TypeScript 下词法分析器表现非常糟糕)
-
-## 🎈 Perf
-
-- 优化差异对比的代码折叠/展开按钮的高度和动画效果
 
 ## 🐞 Fix
 
-- 修复仓库页面与探索页面下仓库主题标签字重不一致的问题
+- 查看代码文件页面路径栏有时内容不会居中
-- 修复发布页面下的分支按钮点击时高度变化问题
+- 查看代码文件页面文件树头部滚动到底部时不会固定住
-- 修复首页/登录页/注册页下导航栏右侧按钮样式问题 #10

.github/workflows/release.yml

@@ -18,8 +18,10 @@ jobs:
       - name: Create release
         run: |
           export TZ=Asia/Shanghai
-          TAG="v$(npm run -s version).$(date +%y%m%d%H%M)"
+          TAG="v$(npm run -s version)"
           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 }}

CONTRIBUTING.md

@@ -1,7 +1,171 @@
+# 贡献指南
+
+## 目录结构
+
 | 目录              | 说明                         |
 | ----------------- | ---------------------------- |
-| styles            | 元素 GitHub 风格             |
+| src               | 主题生成框架与辅助工具的包   |
-| styles/components | 具体页面的元素单独风格       |
+| src/core          | 主题生成框架                 |
-| styles/public     | 适用大部分页面的元素默认风格 |
+| src/functions     | 主题辅助工具                 |
+| src/types         | 主题的颜色变量定义           |
+| styles            | 主题样式                     |
+| styles/components | 具体页面的元素的样式         |
+| styles/public     | 基础元素或跨页面的元素的样式 |
 | themes            | 颜色主题                     |
-| themes/\<theme>   | 具体颜色主题自己的颜色或风格 |
+
+## 贡献说明
+
+不推荐主题样式贡献, 因为 Gitea 主题最终是由单个 CSS 文件提供, 所以会有先后顺序覆盖, 样式影响广泛等问题.
+
+开发者每个人的思路不一样, 审核很难看出这些问题, 会极大增加维护难度.
+
+如果确定理解了 Gitea 的样式布局和我的思路, 请先提交 Issue 确认工作量和预期效果, 然后再开发提交 PR.
+
+如果认为有更好的思路, 欢迎提交 Issue.
+
+> [!IMPORTANT]
+>
+> 提交 PR 时, 请执行 `npm run commit`
+
+## 开发环境
+
+主题仅依赖于 Node.js 环境, 请确保你的环境中已经安装了 Node.js, 推荐使用 Node.js 20 或以上版本.
+
+请使用 VSCode 开发, 并安装仓库中推荐的插件.
+
+如果不喜欢多余的插件, 请务必安装 `vscode-styled-components` 插件, 此插件用于渲染和检查 TypeScript 中的 CSS 模板字符串.
+
+推荐使用 VSCode 1.102.0 版本以上开发, 此版本以上提供 TypeScript 代码中 16 进制颜色的支持.
+
+## 开发流程
+
+### 安装依赖
+
+```bash
+npm install
+```
+
+### 设置环境变量
+
+在项目根目录下创建 `.env` 文件, 变量参考 `.env.example` 文件.
+
+环境变量用于发送编译后的主题到服务器上, 快速预览主题.
+
+### 编译主题
+
+编译开发中的主题
+
+```bash
+npm run dev
+```
+
+编译所有主题
+
+```bash
+npm run build
+```
+
+格式化项目中的代码
+
+```bash
+npm run format
+```
+
+用于 PR, 检查并编译项目中的所有代码并进行格式化
+
+```bash
+npm run commit
+```
+
+## 开发规范
+
+`src`, `styles`, `themes` 为项目的主目录, 主目录下的第一个目录为模块.
+
+主目录或主目录下模块互相引用时, 请使用绝对路径, 例如 `import { defineTheme } from "src"`
+
+模块下的文件互相引用时, 请使用相对路径, 例如 `import { defineTheme } from "./theme"`
+
+## 颜色主题贡献
+
+颜色主题名称格式: `主题名称-dark.css.ts` 或 `主题名称-light.css.ts`, 分别表示深色和亮色主题.
+
+如果主题有深色和亮色模式, 会自动生成自动颜色主题, 不需要手动添加.
+
+项目接受自定义主题并会附加到发布的版本中, 但项目所有者不参与维护和审核.
+
+请在颜色主题文件头部附加自己的作者信息, 方便 Issue 提问者找到你 `@`.
+
+推荐使用 `import { defineTheme, 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,13 +1,25 @@
 # 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.大版本号.小版本号.时间戳`
 
 ## 安装
 
@@ -15,7 +27,10 @@
 2. 修改 `gitea/conf/app.ini`，并将 CSS 文件名去掉 `theme-` 的名称附加到 `[ui]` 下的 `THEMES` 末尾
 3. 重启 Gitea
 4. 在设置中查看主题
-5. 自动颜色主题需要亮色和暗色的主题文件
+
+> [!IMPORTANT]
+>
+> 自动颜色主题需要亮色和暗色的主题文件
 
 例: 主题文件名为 `theme-github-dark.css`，则添加 `github-dark` 到 `THEMES` 末尾
 
@@ -29,6 +44,38 @@ THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-
 详细请查看 Gitea 文档
 [Gitea docs](https://docs.gitea.com/next/administration/customizing-gitea#customizing-the-look-of-gitea)
 
+## 截图
+
+### 基本主题
+
+```ini
+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 )
+
+```ini
+THEMES = github-colorblind-auto, github-colorblind-light, github-colorblind-dark
+THEMES = github-tritanopia-auto, github-tritanopia-light, github-tritanopia-dark
+```
+
+<details>
+<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 变量
 
 可以根据自己的偏好自定义主题的一部分样式
@@ -54,8 +101,8 @@ THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-
 
 ### CSS 变量
 
-| 变量名                            | 描述                        | 默认值 | Github | 推荐  | 最小值 | 最大值 |
+| 变量名                            | 描述                        | 默认  | 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   |       |       |
@@ -63,22 +110,22 @@ THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-
 | --custom-org-repolist-columns     | 组织页面的仓库列表列数      | 1     | 1      | 1/2   |       |       |
 | --custom-org-userlist-columns     | 组织页面的用户列表列数      | 2     | 1      | 1/2   |       |       |
 
-## 截图
+## 使用开发中的主题
 
-![仓库](screenshots/repo.png)
+也许你会想使用开发中的主题, 而不是发布的主题
 
-![仓库文件列表](screenshots/file_list.png)
+请确保你已经安装了 Node.js 环境, 推荐使用 Node.js 20 或以上版本
 
-![仓库发布](screenshots/release.png)
+```bash
+git clone https://github.com/lutinglt/gitea-github-theme.git
+cd gitea-github-theme
+npm install
+npm run build
+```
 
-![仓库提交](screenshots/commit.png)
+编译完成后, 会在 `dist` 目录下生成主题文件, 你可以将主题文件放入 `gitea/public/assets/css` 目录下, 然后在
-
+`gitea/conf/app.ini` 中添加主题名称到 `THEMES` 末尾
-![Actions](screenshots/actions.png)
-
-![Action](screenshots/action.png)
-
-![Dispatch](screenshots/dispatch.png)
 
 ## 贡献
 
-欢迎提交 Issue 或 Pull Request
+请查看 [CONTRIBUTING](CONTRIBUTING.md)

TODO.md

@@ -1,11 +0,0 @@
-### 重大
-
-- gitea issue 默认标签颜色匹配使用 github 样式
-- issue/PR 列表样式 github 布局
-- styles/themes 库组件导出整理
-- defineTheme 颜色生成代码重构
-
-### 其他
-
-- README 更新/截图更新
-- CONTRIBUTING 更新

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitea-github-theme",
-  "version": "1.24.4",
+  "version": "1.24.5",
   "description": "A theme to make Gitea look and feel like GitHub",
   "type": "module",
   "scripts": {

src/core/chroma.ts

@@ -0,0 +1,64 @@
+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

@@ -2,10 +2,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 { themeVars } from "src/types/vars";
-import { prettylightsDark, prettylightsLight } from "./prettylights";
+import { defaultDarkChroma, defaultLightChroma } from "./chroma";
 import type { Theme } from "./theme";
 
-type ThemeColor = {
+export type ThemeColor = {
   /** 用于标识当前是否为暗色主题: `true` 暗色 `false` 亮色 */
   isDarkTheme: boolean;
   /** 主色调(强调色) */
@@ -14,6 +14,8 @@ type ThemeColor = {
   primaryContrast: string;
   /** 副色调(边框色) */
   secondary: string;
+  /** 基础颜色 */
+  base: {
     /** 红色 */
     red: string;
     /** 橙色 */
@@ -46,6 +48,7 @@ type ThemeColor = {
     gold: string;
     /** 白色 */
     white: string;
+  };
   /** Action 日志 */
   console: Console;
   /** 提交代码对比 */
@@ -59,7 +62,7 @@ type ThemeColor = {
 /** 定义颜色, 用于生成颜色主题
  * @example
  * 文件名: "dark.css.ts"
- * import type { Console, Diff, Other } from "src/types";
+ * import type { Console, Diff, Other, Github } from "src/types";
  * import { defineTheme, themeVars } from "src";
  *
  * const console: Console = {
@@ -78,6 +81,7 @@ type ThemeColor = {
  *   console,
  *   diff,
  *   other,
+ *   github,
  * })
  */
 export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null): Theme {
@@ -160,161 +164,161 @@ export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null
 
   const named: Named = {
     red: {
-      self: themeColor.red,
+      self: themeColor.base.red,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.red, 15) : scaleColorLight(themeColor.red, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.red, 15) : scaleColorLight(themeColor.base.red, 25),
       dark: {
-        num1: scaleColorLight(themeColor.red, -10),
+        num1: scaleColorLight(themeColor.base.red, -10),
-        num2: scaleColorLight(themeColor.red, -20),
+        num2: scaleColorLight(themeColor.base.red, -20),
       },
       badge: {
-        self: themeColor.red,
+        self: themeColor.base.red,
-        bg: rgba(themeColor.red, 0.1),
+        bg: rgba(themeColor.base.red, 0.1),
         hover: {
-          bg: rgba(themeColor.red, 0.3),
+          bg: rgba(themeColor.base.red, 0.3),
         },
       },
     },
     orange: {
-      self: themeColor.orange,
+      self: themeColor.base.orange,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.orange, 15) : scaleColorLight(themeColor.orange, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.orange, 15) : scaleColorLight(themeColor.base.orange, 25),
       dark: {
-        num1: scaleColorLight(themeColor.orange, -10),
+        num1: scaleColorLight(themeColor.base.orange, -10),
-        num2: scaleColorLight(themeColor.orange, -20),
+        num2: scaleColorLight(themeColor.base.orange, -20),
       },
       badge: {
-        self: themeColor.orange,
+        self: themeColor.base.orange,
-        bg: rgba(themeColor.orange, 0.1),
+        bg: rgba(themeColor.base.orange, 0.1),
         hover: {
-          bg: rgba(themeColor.orange, 0.3),
+          bg: rgba(themeColor.base.orange, 0.3),
         },
       },
     },
     yellow: {
-      self: themeColor.yellow,
+      self: themeColor.base.yellow,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.yellow, 15) : scaleColorLight(themeColor.yellow, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.yellow, 15) : scaleColorLight(themeColor.base.yellow, 25),
       dark: {
-        num1: scaleColorLight(themeColor.yellow, -10),
+        num1: scaleColorLight(themeColor.base.yellow, -10),
-        num2: scaleColorLight(themeColor.yellow, -20),
+        num2: scaleColorLight(themeColor.base.yellow, -20),
       },
       badge: {
-        self: themeColor.yellow,
+        self: themeColor.base.yellow,
-        bg: rgba(themeColor.yellow, 0.1),
+        bg: rgba(themeColor.base.yellow, 0.1),
         hover: {
-          bg: rgba(themeColor.yellow, 0.3),
+          bg: rgba(themeColor.base.yellow, 0.3),
         },
       },
     },
     olive: {
-      self: themeColor.olive,
+      self: themeColor.base.olive,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.olive, 15) : scaleColorLight(themeColor.olive, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.olive, 15) : scaleColorLight(themeColor.base.olive, 25),
       dark: {
-        num1: scaleColorLight(themeColor.olive, -10),
+        num1: scaleColorLight(themeColor.base.olive, -10),
-        num2: scaleColorLight(themeColor.olive, -20),
+        num2: scaleColorLight(themeColor.base.olive, -20),
       },
     },
     green: {
-      self: themeColor.green,
+      self: themeColor.base.green,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.green, 15) : scaleColorLight(themeColor.green, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.green, 15) : scaleColorLight(themeColor.base.green, 25),
       dark: {
-        num1: scaleColorLight(themeColor.green, -10),
+        num1: scaleColorLight(themeColor.base.green, -10),
-        num2: scaleColorLight(themeColor.green, -20),
+        num2: scaleColorLight(themeColor.base.green, -20),
       },
       badge: {
-        self: themeColor.green,
+        self: themeColor.base.green,
-        bg: rgba(themeColor.green, 0.1),
+        bg: rgba(themeColor.base.green, 0.1),
         hover: {
-          bg: rgba(themeColor.green, 0.3),
+          bg: rgba(themeColor.base.green, 0.3),
         },
       },
     },
     teal: {
-      self: themeColor.teal,
+      self: themeColor.base.teal,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.teal, 15) : scaleColorLight(themeColor.teal, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.teal, 15) : scaleColorLight(themeColor.base.teal, 25),
       dark: {
-        num1: scaleColorLight(themeColor.teal, -10),
+        num1: scaleColorLight(themeColor.base.teal, -10),
-        num2: scaleColorLight(themeColor.teal, -20),
+        num2: scaleColorLight(themeColor.base.teal, -20),
       },
     },
     blue: {
-      self: themeColor.blue,
+      self: themeColor.base.blue,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.blue, 15) : scaleColorLight(themeColor.blue, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.blue, 15) : scaleColorLight(themeColor.base.blue, 25),
       dark: {
-        num1: scaleColorLight(themeColor.blue, -10),
+        num1: scaleColorLight(themeColor.base.blue, -10),
-        num2: scaleColorLight(themeColor.blue, -20),
+        num2: scaleColorLight(themeColor.base.blue, -20),
       },
     },
     violet: {
-      self: themeColor.violet,
+      self: themeColor.base.violet,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.violet, 15) : scaleColorLight(themeColor.violet, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.violet, 15) : scaleColorLight(themeColor.base.violet, 25),
       dark: {
-        num1: scaleColorLight(themeColor.violet, -10),
+        num1: scaleColorLight(themeColor.base.violet, -10),
-        num2: scaleColorLight(themeColor.violet, -20),
+        num2: scaleColorLight(themeColor.base.violet, -20),
       },
     },
     purple: {
-      self: themeColor.purple,
+      self: themeColor.base.purple,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.purple, 15) : scaleColorLight(themeColor.purple, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.purple, 15) : scaleColorLight(themeColor.base.purple, 25),
       dark: {
-        num1: scaleColorLight(themeColor.purple, -10),
+        num1: scaleColorLight(themeColor.base.purple, -10),
-        num2: scaleColorLight(themeColor.purple, -20),
+        num2: scaleColorLight(themeColor.base.purple, -20),
       },
     },
     pink: {
-      self: themeColor.pink,
+      self: themeColor.base.pink,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.pink, 15) : scaleColorLight(themeColor.pink, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.pink, 15) : scaleColorLight(themeColor.base.pink, 25),
       dark: {
-        num1: scaleColorLight(themeColor.pink, -10),
+        num1: scaleColorLight(themeColor.base.pink, -10),
-        num2: scaleColorLight(themeColor.pink, -20),
+        num2: scaleColorLight(themeColor.base.pink, -20),
       },
     },
     brown: {
-      self: themeColor.brown,
+      self: themeColor.base.brown,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.brown, 15) : scaleColorLight(themeColor.brown, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.brown, 15) : scaleColorLight(themeColor.base.brown, 25),
       dark: {
-        num1: scaleColorLight(themeColor.brown, -10),
+        num1: scaleColorLight(themeColor.base.brown, -10),
-        num2: scaleColorLight(themeColor.brown, -20),
+        num2: scaleColorLight(themeColor.base.brown, -20),
       },
     },
     black: {
-      self: themeColor.black,
+      self: themeColor.base.black,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.black, 15) : scaleColorLight(themeColor.black, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.black, 15) : scaleColorLight(themeColor.base.black, 25),
       dark: {
-        num1: scaleColorLight(themeColor.black, -10),
+        num1: scaleColorLight(themeColor.base.black, -10),
-        num2: scaleColorLight(themeColor.black, -20),
+        num2: scaleColorLight(themeColor.base.black, -20),
       },
     },
     grey: {
-      self: themeColor.grey,
+      self: themeColor.base.grey,
-      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.grey, 15) : scaleColorLight(themeColor.grey, 25),
+      light: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.grey, 15) : scaleColorLight(themeColor.base.grey, 25),
     },
-    gold: themeColor.gold,
+    gold: themeColor.base.gold,
-    white: themeColor.white,
+    white: themeColor.base.white,
   };
 
   const message: Message = {
     error: {
       bg: {
-        self: rgba(themeColor.red, 0.1),
+        self: rgba(themeColor.base.red, 0.1),
-        active: rgba(themeColor.red, 0.5),
+        active: rgba(themeColor.base.red, 0.5),
-        hover: rgba(themeColor.red, 0.3),
+        hover: rgba(themeColor.base.red, 0.3),
       },
-      border: rgba(themeColor.red, 0.4),
+      border: rgba(themeColor.base.red, 0.4),
-      text: saturate(0.2, themeColor.red), // 饱和度提高
+      text: saturate(0.2, themeColor.base.red), // 饱和度提高
     },
     success: {
-      bg: rgba(themeColor.green, 0.1),
+      bg: rgba(themeColor.base.green, 0.1),
-      border: rgba(themeColor.green, 0.4),
+      border: rgba(themeColor.base.green, 0.4),
-      text: saturate(0.2, themeColor.green),
+      text: saturate(0.2, themeColor.base.green),
     },
     warning: {
-      bg: rgba(themeColor.yellow, 0.1),
+      bg: rgba(themeColor.base.yellow, 0.1),
-      border: rgba(themeColor.yellow, 0.4),
+      border: rgba(themeColor.base.yellow, 0.4),
-      text: saturate(0.2, themeColor.yellow),
+      text: saturate(0.2, themeColor.base.yellow),
     },
     info: {
-      bg: rgba(themeColor.blue, 0.1),
+      bg: rgba(themeColor.base.blue, 0.1),
-      border: rgba(themeColor.blue, 0.4),
+      border: rgba(themeColor.base.blue, 0.4),
-      text: saturate(0.2, themeColor.blue),
+      text: saturate(0.2, themeColor.base.blue),
     },
   };
 
@@ -325,7 +329,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.cyan,
+    cyan: themeColor.base.cyan,
     white: themeVars.color.console.fg.subtle,
     bright: {
       black: themeVars.color.black.light,
@@ -334,14 +338,14 @@ 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.cyan, 10) : scaleColorLight(themeColor.cyan, 25),
+      cyan: themeColor.isDarkTheme ? scaleColorLight(themeColor.base.cyan, 10) : scaleColorLight(themeColor.base.cyan, 25),
       white: themeVars.color.console.fg.self,
     },
   };
 
   return {
     isDarkTheme: themeColor.isDarkTheme.toString(),
-    chroma: chroma || (themeColor.isDarkTheme ? prettylightsDark : prettylightsLight),
+    chroma: chroma || (themeColor.isDarkTheme ? defaultDarkChroma : defaultLightChroma),
     color: {
       primary,
       secondary,

src/core/github.ts

@@ -1,10 +1,9 @@
 import { saturate } from "polished";
 import type { Console, Diff, Other } from "src";
 import { scaleColorLight } from "src/functions";
-import type { Chroma, Github } from "src/types";
+import type { Github } from "src/types";
 import { themeVars } from "src/types/vars";
-import { defineTheme } from "./color";
+import { type ThemeColor } from "./color";
-import type { Theme } from "./theme";
 
 export type GithubColor = {
   isDarkTheme: boolean;
@@ -39,112 +38,45 @@ export type GithubColor = {
     muted: string;
   };
   bgColor: {
-    accent: {
+    accent: { emphasis: string; muted: string };
-      emphasis: string;
+    attention: { muted: string };
-      muted: string;
+    success: { emphasis: string; muted: string };
-    };
+    danger: { muted: string };
-    attention: {
+    done: { emphasis: string };
-      muted: string;
-    };
-    success: {
-      emphasis: string;
-      muted: string;
-    };
-    danger: {
-      muted: string;
-    };
-    done: {
-      emphasis: string;
-    };
     default: string;
     inset: string;
     muted: string;
-    neutral: {
+    neutral: { muted: string };
-      muted: string;
-    };
   };
   borderColor: {
-    accent: {
+    accent: { emphasis: string };
-      emphasis: string;
+    attention: { emphasis: string };
-    };
-    attention: {
-      emphasis: string;
-    };
     default: string;
-    success: {
+    success: { emphasis: string };
-      emphasis: string;
+    done: { emphasis: string };
-    };
-    done: {
-      emphasis: string;
-    };
     muted: string;
     translucent: string;
   };
   button: {
-    primary: {
+    primary: { fgColor: { rest: string }; bgColor: { hover: string } };
-      fgColor: {
+    danger: { fgColor: { rest: string; hover: string }; bgColor: { hover: string } };
-        rest: string;
-      };
-      bgColor: {
-        hover: string;
-      };
-    };
-    danger: {
-      fgColor: {
-        rest: string;
-        hover: string;
-      };
-      bgColor: {
-        hover: string;
-      };
-    };
   };
   control: {
-    bgColor: {
+    bgColor: { active: string; hover: string; rest: string };
-      active: string;
+    transparent: { bgColor: { active: string; hover: string; selected: string } };
-      hover: string;
-      rest: string;
-    };
-    transparent: {
-      bgColor: {
-        active: string;
-        hover: string;
-        selected: string;
-      };
-    };
-  };
-  shadow: {
-    floating: {
-      small: string;
-    };
-  };
-  overlay: {
-    backdrop: {
-      bgColor: string;
-    };
-  };
-  underlineNav: {
-    borderColor: {
-      active: string;
-    };
   };
+  shadow: { floating: { small: string } };
+  overlay: { backdrop: { bgColor: string } };
+  underlineNav: { borderColor: { active: string } };
   contribution: {
     default: {
-      bgColor: {
+      bgColor: { num0: string; num1: string; num2: string; num3: string; num4: string };
-        num0: string;
+      borderColor: { num0: string };
-        num1: string;
-        num2: string;
-        num3: string;
-        num4: string;
-      };
-      borderColor: {
-        num0: string;
-      };
     };
   };
 };
 
-export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | null = null): Theme {
+export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
   const console: Console = {
     fg: {
       self: githubColor.fgColor.default,
@@ -394,12 +326,12 @@ export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | nul
       },
     },
   };
-  return defineTheme(
+  return {
-    {
     isDarkTheme: githubColor.isDarkTheme,
     primary: githubColor.fgColor.accent,
     primaryContrast: githubColor.fgColor.default,
     secondary: githubColor.borderColor.default,
+    base: {
       red: githubColor.fgColor.danger,
       orange: githubColor.fgColor.severe,
       yellow: githubColor.fgColor.attention,
@@ -416,11 +348,10 @@ export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | nul
       grey: githubColor.fgColor.neutral,
       gold: githubColor.display.lemon.fgColor,
       white: githubColor.fgColor.white,
+    },
     console,
     diff,
     other,
     github,
-    },
+  };
-    chroma
-  );
 }

src/core/prettylights.ts

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

src/core/theme.ts

@@ -39,9 +39,7 @@ export function createTheme(theme: Theme): void {
   }
   createGlobalTheme(":root", themeVars, theme);
   createGlobalTheme(":root", otherThemeVars, {
-    border: {
+    border: { radius: "6px" },
-      radius: "6px",
-    },
     color: {
       git: "#f05133",
       light: {

src/functions/var.ts

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

src/index.ts

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

src/types/color/github.ts

@@ -29,6 +29,7 @@ export const github = {
        * @release `releaseTagMenu` 顶部栏左侧按钮激活背景色
        * @navbar `navbarRight` 头像管理员标识背景颜色
        * @dropdown `dropdown` emoji 的悬停背景色
+       * @menu `paginationMenu` 分页菜单的激活背景色
        */
       emphasis: null,
       /** 暗淡的背景颜色
@@ -175,6 +176,10 @@ export const github = {
          * @menu `menu` 菜单项的悬停背景颜色
          * @repo `repoHeader` 仓库标题的悬停背景颜色
          * @commit `commit` 提交信息的 Action 按钮的悬停背景颜色
+         * @filelist `repoFiles` README 栏的按钮的悬停背景颜色
+         * @issue `issueSidebar` 操作按钮的悬停背景颜色
+         * @issue `issueList` 头部菜单左侧开启关闭菜单的悬停背景颜色
+         * @dashboard `dashboard` 仓库列表项目的悬停背景颜色
          */
         hover: null,
       },
@@ -194,6 +199,7 @@ export const github = {
       /** 下划线导航栏的边框颜色
        * @clone `clone` 按钮组的按钮下划线颜色
        * @menu `secondaryMenu` 二级菜单按钮的下划线颜色
+       * @filelist `repoFiles` README 栏的左边按钮下划线颜色
        */
       active: null,
     },
@@ -201,17 +207,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/main.ts

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

src/types/color/message.ts

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

src/types/color/named.ts

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

src/types/vars.ts

@@ -8,9 +8,7 @@ function varMapper(prefix: string | null = null) {
       path = path.map(item => item.replace(/^num/, ""));
       value = path.join("-");
     }
-    if (prefix) {
+    if (prefix) value = `${prefix}-${value}`;
-      value = `${prefix}-${value}`;
-    }
     return value;
   };
 }
@@ -32,26 +30,13 @@ const vars = {
   github: color.github,
 };
 
-const otherVars = {
+const otherVars = { border: { radius: null }, color: { ...color.otherAuto } };
-  border: {
-    radius: null,
-  },
-  color: {
-    ...color.otherAuto,
-  },
-};
 
 const customVars = {
   cloneMenuWidth: "clone-menu-width",
-  explore: {
+  explore: { repolistColumns: "explore-repolist-columns", userlistColumns: "explore-userlist-columns" },
-    repolistColumns: "explore-repolist-columns",
-    userlistColumns: "explore-userlist-columns",
-  },
   userRepolistColumns: "user-repolist-columns",
-  org: {
+  org: { repolistColumns: "org-repolist-columns", userlistColumns: "org-userlist-columns" },
-    repolistColumns: "org-repolist-columns",
-    userlistColumns: "org-userlist-columns",
-  },
 };
 
 export const themeVars = createGlobalThemeContract(vars, varMapper());

styles/components/actions.ts

@@ -203,7 +203,7 @@ export const actionViewRight = css`
 
     .job-info-header {
       padding: 16px 12px 16px 24px;
-      height: auto;
+      height: 80px;
 
       .job-info-header-title {
         color: ${themeVars.github.fgColor.accent};
@@ -220,6 +220,11 @@ export const actionViewRight = css`
         color: ${themeVars.color.console.fg.subtle};
         padding: 8px 10px;
 
+        &.selected {
+          // 滚动时固定在顶部的高度与 job-info-header 高度相同
+          top: 80px;
+        }
+
         &.step-expandable:hover {
           color: ${themeVars.color.console.fg.subtle};
         }

styles/components/dashboard.ts

@@ -1,15 +1,66 @@
-import { css } from "src/types/vars";
+import { css, otherThemeVars, themeVars } 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;
+      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/diff.ts

@@ -34,7 +34,7 @@ export const diff = css`
 
     &:hover {
       background: ${themeVars.github.bgColor.accent.emphasis};
-      color: ${themeVars.color.white}
+      color: ${themeVars.color.white};
     }
   }
   /* 行号居中 */

styles/components/editor.ts

@@ -0,0 +1,20 @@
+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

@@ -13,7 +13,8 @@ export const repoList = css`
   .page-content.user.profile > .ui.container > .ui.stackable > .ui.twelve,
   // 探索
   .page-content.explore.repositories > .ui.container {
-    > .flex-list {
+    // 排除用户的公开活动页
+    > .flex-list:not(#activity-feed) {
       display: grid;
       > .flex-item {
         border: 1px solid ${themeVars.color.light.border};
@@ -37,10 +38,6 @@ export const repoList = css`
               &:not(a) {
                 color: ${themeVars.color.text.light.num1};
               }
-              // 仓库类型和状态标签
-              > .label-list .label {
-                padding: 3px 6px;
-              }
             }
             // 仓库语言, 星标
             > .flex-item-trailing {
@@ -77,7 +74,8 @@ export const repoList = css`
     gap: min(${orgRepoVar} * 8px, 16px);
   }
   // 用户
-  .page-content.user.profile > .ui.container > .ui.stackable > .ui.twelve > .flex-list {
+  // 排除用户的公开活动页
+  .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);
   }
@@ -111,7 +109,6 @@ export const userList = css`
             // 用户标签
             > .label {
               font-size: 12px;
-              padding: 3px 6px;
             }
           }
           // 用户描述
@@ -152,7 +149,8 @@ export const mobileList = css`
     .page-content.organization.members >.ui.container,
     // 探索的用户和组织列表
     .page-content.explore.users >.ui.container {
-      > .flex-list {
+      // 排除用户的公开活动页
+      > .flex-list:not(#activity-feed) {
         grid-template-columns: 1fr;
         gap: 8px;
       }

styles/components/filelist.ts

@@ -1,4 +1,4 @@
-import { css, themeVars } from "src/types/vars";
+import { css, otherThemeVars, themeVars } from "src/types/vars";
 
 // 文件列表页面下的分支按钮
 export const branchButton = css`
@@ -75,6 +75,7 @@ export const repoFiles = css`
       // 文件列表
       .repo-file-item {
         .repo-file-cell {
+          height: 40px;
           &.name {
             display: flex;
             align-items: center;
@@ -87,6 +88,39 @@ export const repoFiles = css`
         }
       }
     }
+    #readme {
+      .file-header {
+        background: ${themeVars.color.body};
+        svg {
+          color: ${themeVars.color.text.light.num1};
+        }
+        .file-header-left {
+          padding: 6px 8px !important;
+          &:hover {
+            background: ${themeVars.github.control.transparent.bgColor.hover};
+            border-radius: ${otherThemeVars.border.radius};
+          }
+          &:after {
+            content: "";
+            background: ${themeVars.github.underlineNav.borderColor.active};
+            border-radius: ${otherThemeVars.border.radius};
+            bottom: 0;
+            height: 2px;
+            position: absolute;
+            left: 12px;
+            width: 113px;
+          }
+          a.muted:hover {
+            color: inherit;
+            text-decoration-line: none;
+          }
+        }
+        .file-header-right:hover {
+          background: ${themeVars.github.control.transparent.bgColor.hover};
+          border-radius: ${otherThemeVars.border.radius};
+        }
+      }
+    }
   }
 `;
 
@@ -113,12 +147,77 @@ 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;
+          }
+        }
         // 头部提交信息
-        #repo-file-commit-box {
+        .ui.segment#repo-file-commit-box {
           padding: 8px 12px;
+          margin-bottom: 8px !important;
           > .latest-commit {
             gap: 8px;
           }
@@ -133,6 +232,24 @@ export const repoFileView = css`
   }
 `;
 
+// 避免手机/平板下路径容器过长导致换行, 取消固定
+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,7 +1,19 @@
-import { css, themeVars } from "src/types/vars";
+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 {
@@ -48,4 +60,30 @@ export const heatmap = css`
         }
       }
     }
+  }
+`;
+
+// 动态
+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/index.ts

@@ -8,6 +8,11 @@ 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,6 +1,115 @@
 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 {
     // 关闭工单按钮
@@ -18,6 +127,11 @@ export const button = css`
       color: ${themeVars.github.fgColor.success};
     }
   }
+  // 工单&PR标题右侧按钮
+  .repository.view.issue .issue-title-buttons > .ui.button {
+    padding: 0 12px;
+    height: 32px;
+  }
 `;
 
 export const babel = css`
@@ -103,6 +217,7 @@ export const comment = css`
     }
     .comment-header {
       padding: 4px 4px 4px 16px;
+      min-height: 38px;
     }
     .comment-header-right {
       > .item,
@@ -330,3 +445,111 @@ export const timeline = css`
     }
   }
 `;
+
+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/org.ts

@@ -0,0 +1,21 @@
+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/setting.ts

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

styles/components/signin.ts

@@ -0,0 +1,49 @@
+import { css } from "src/types/vars";
+
+// 注册/登录界面
+export const signIn = css`
+  .page-content.user.signin {
+    .ui.grid > .column {
+      width: 384px;
+      padding: 16px;
+      > .ui.container {
+        max-width: unset;
+      }
+    }
+    .ui.top.attached.header {
+      border: 0;
+      font-size: 20px;
+      font-weight: 600;
+      background-color: unset !important;
+      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

@@ -0,0 +1,62 @@
+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

@@ -0,0 +1,36 @@
+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/dropdown.ts

@@ -120,6 +120,10 @@ 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;

styles/public/index.ts

@@ -5,7 +5,6 @@ import "./radius"; // 圆角, 此样式为基础样式, 确保在其他样式之
 import "./transition"; // 过渡效果
 import "./text"; // 文本或 SVG 的基本颜色
 import "./button"; // 按钮
-import "./chroma"; // 代码高亮
 import "./dropdown"; // 下拉框
 import "./input"; // 输入框
 import "./label"; // 标签
@@ -13,3 +12,4 @@ import "./menu"; // 菜单
 import "./modal"; // 弹窗
 import "./tippy"; // 提示框
 import "./navbar"; // 导航栏
+import "./attached"; // 附加样式

styles/public/label.ts

@@ -166,12 +166,19 @@ 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.ts

@@ -193,3 +193,46 @@ 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.ts

@@ -77,14 +77,27 @@ 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 > .item:not(:last-child) {
+    #navbar .navbar-right:has(.user-menu) > .item:not(:last-child) {
       display: none;
     }
-    #navbar.navbar-menu-open .navbar-right > .item:not(:last-child) {
+    #navbar.navbar-menu-open .navbar-right:has(.user-menu) > .item:not(:last-child) {
       display: grid;
     }
   }

styles/public/transition.ts

@@ -2,6 +2,18 @@ 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,
@@ -9,8 +21,6 @@ export const transition = css`
   .job-step-logs,
   .job-brief-item,
   .repo-file-cell,
-  // 差异对比的代码折叠按钮
-  .code-expander-button,
   .tippy-box .flex-items-block .item,
   .clone-panel-tab .item,
   .ui.form select,

themes/colorblind-dark.css.ts

@@ -0,0 +1,73 @@
+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

@@ -0,0 +1,73 @@
+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.ts

@@ -1,6 +1,7 @@
-import { defineGithubTheme } from "src/core/github";
+import { defineTheme, type ThemeColor } from "src";
+import { github2ThemeColor, type GithubColor } from "src/core/github";
 
-export default defineGithubTheme({
+export const darkGithubColors: GithubColor = {
   isDarkTheme: true,
   display: {
     brown: { fgColor: "#b69a6d" },
@@ -22,7 +23,7 @@ export default defineGithubTheme({
     attention: "#d29922",
     danger: "#f85149",
     default: "#f0f6fc",
-    disabled: "#656c7699",
+    disabled: "#656c76",
     done: "#ab7df8",
     muted: "#9198a1",
     neutral: "#9198a1",
@@ -35,20 +36,20 @@ export default defineGithubTheme({
   bgColor: {
     accent: { emphasis: "#1f6feb", muted: "#388bfd1a" },
     attention: { muted: "#bb800926" },
-    success: { emphasis: "#238636", muted: "#2ea04326" },
     danger: { muted: "#f851491a" },
-    done: { emphasis: "#8957e5" },
     default: "#0d1117",
-    inset: "#010409",
+    done: { emphasis: "#8957e5" },
     muted: "#151b23",
     neutral: { muted: "#656c7633" },
+    success: { emphasis: "#238636", muted: "#2ea04326" },
+    inset: "#010409",
   },
   borderColor: {
     accent: { emphasis: "#1f6feb" },
-    default: "#3d444d",
     attention: { emphasis: "#9e6a03" },
-    success: { emphasis: "#238636" },
+    default: "#3d444d",
     done: { emphasis: "#8957e5" },
+    success: { emphasis: "#238636" },
     muted: "#3d444db3",
     translucent: "#ffffff26",
   },
@@ -69,4 +70,8 @@ export default defineGithubTheme({
       borderColor: { num0: "#0104090d" },
     },
   },
-});
+};
+
+export const darkColors: ThemeColor = github2ThemeColor(darkGithubColors);
+
+export default defineTheme(darkColors);

themes/light.css.ts

@@ -1,6 +1,7 @@
-import { defineGithubTheme } from "src/core/github";
+import { defineTheme, type ThemeColor } from "src";
+import { github2ThemeColor, type GithubColor } from "src/core/github";
 
-export default defineGithubTheme({
+export const lightGithubColors: GithubColor = {
   isDarkTheme: false,
   display: {
     brown: { fgColor: "#755f43" },
@@ -35,20 +36,20 @@ export default defineGithubTheme({
   bgColor: {
     accent: { emphasis: "#0969da", muted: "#ddf4ff" },
     attention: { muted: "#fff8c5" },
-    success: { emphasis: "#1f883d", muted: "#dafbe1" },
     danger: { muted: "#ffebe9" },
-    done: { emphasis: "#8250df" },
     default: "#ffffff",
-    inset: "#f6f8fa",
+    done: { emphasis: "#8250df" },
     muted: "#f6f8fa",
     neutral: { muted: "#818b981f" },
+    success: { emphasis: "#1f883d", muted: "#dafbe1" },
+    inset: "#f6f8fa",
   },
   borderColor: {
     accent: { emphasis: "#0969da" },
-    default: "#d1d9e0",
     attention: { emphasis: "#9a6700" },
-    success: { emphasis: "#1a7f37" },
+    default: "#d1d9e0",
     done: { emphasis: "#8250df" },
+    success: { emphasis: "#1a7f37" },
     muted: "#d1d9e0b3",
     translucent: "#1f232826",
   },
@@ -69,4 +70,8 @@ export default defineGithubTheme({
       borderColor: { num0: "#1f23280d" },
     },
   },
-});
+};
+
+export const lightColors: ThemeColor = github2ThemeColor(lightGithubColors);
+
+export default defineTheme(lightColors);

themes/soft-dark.css.ts

@@ -1,17 +1,11 @@
-import { defineGithubTheme } from "src/core/github";
+import { defineTheme, type Chroma, type ThemeColor } from "src";
-import { prettylights2Chroma } from "src/core/prettylights";
+import { github2ThemeColor, type GithubColor } from "src/core/github";
+import { prettylights2Chroma, type prettylightsColor } from "src/core/prettylights";
+import { darkGithubColors } from "themes/dark";
 
-export default defineGithubTheme(
+export const softDarkGithubColors: GithubColor = {
-  {
   isDarkTheme: true,
-    display: {
+  display: darkGithubColors.display,
-      brown: { fgColor: "#b69a6d" },
-      cyan: { fgColor: "#07ace4" },
-      indigo: { fgColor: "#9899ec" },
-      lemon: { fgColor: "#ba9b12" },
-      olive: { fgColor: "#a2a626" },
-      teal: { fgColor: "#1cb0ab" },
-    },
   diffBlob: {
     addtionNum: { bgColor: "#57ab5a4d" },
     addtionWord: { bgColor: "#46954a66" },
@@ -37,20 +31,20 @@ export default defineGithubTheme(
   bgColor: {
     accent: { emphasis: "#316dca", muted: "#4184e41a" },
     attention: { muted: "#ae7c1426" },
-      success: { emphasis: "#347d39", muted: "#46954a26" },
     danger: { muted: "#e5534b1a" },
-      done: { emphasis: "#8256d0" },
     default: "#212830",
-      inset: "#151b23",
+    done: { emphasis: "#8256d0" },
     muted: "#262c36",
     neutral: { muted: "#656c7633" },
+    success: { emphasis: "#347d39", muted: "#46954a26" },
+    inset: "#151b23",
   },
   borderColor: {
     accent: { emphasis: "#316dca" },
-      default: "#3d444d",
     attention: { emphasis: "#966600" },
-      success: { emphasis: "#347d39" },
+    default: "#3d444d",
     done: { emphasis: "#8256d0" },
+    success: { emphasis: "#347d39" },
     muted: "#3d444db3",
     translucent: "#cdd9e526",
   },
@@ -71,50 +65,26 @@ export default defineGithubTheme(
       borderColor: { num0: "#0104090d" },
     },
   },
-  },
+};
-  prettylights2Chroma({
+
+export const softDarkPrettylights: prettylightsColor = {
   syntax: {
-      brackethighlighter: {
+    brackethighlighter: { angle: "#9198a1", unmatched: "#e5534b" },
-        angle: "#9198a1",
+    carriage: { return: { bg: "#ad2e2c", text: "#f0f6fc" } },
-        unmatched: "#e5534b",
-      },
-      carriage: {
-        return: {
-          bg: "#ad2e2c",
-          text: "#f0f6fc",
-        },
-      },
     comment: "#9198a1",
     constant: "#6cb6ff",
     constantOtherReferenceLink: "#96d0ff",
     entity: "#dcbdfb",
     entityTag: "#8ddb8c",
-      invalid: {
+    invalid: { illegal: { bg: "#922323", text: "#f0f6fc" } },
-        illegal: {
-          bg: "#922323",
-          text: "#f0f6fc",
-        },
-      },
     keyword: "#f47067",
     markup: {
       bold: "#f0f6fc",
-        changed: {
+      changed: { bg: "#682d0f", text: "#ffddb0" },
-          bg: "#682d0f",
+      deleted: { bg: "#78191b", text: "#ffd8d3" },
-          text: "#ffddb0",
-        },
-        deleted: {
-          bg: "#78191b",
-          text: "#ffd8d3",
-        },
       heading: "#316dca",
-        ignored: {
+      ignored: { bg: "#255ab2", text: "#f0f6fc" },
-          bg: "#255ab2",
+      inserted: { bg: "#1b4721", text: "#b4f1b4" },
-          text: "#f0f6fc",
-        },
-        inserted: {
-          bg: "#1b4721",
-          text: "#b4f1b4",
-        },
       italic: "#f0f6fc",
       list: "#eac55f",
     },
@@ -125,5 +95,9 @@ export default defineGithubTheme(
     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

@@ -0,0 +1,45 @@
+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

@@ -0,0 +1,45 @@
+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);