1.24.7

.github/CHANGELOG.md

@@ -0,0 +1,21 @@
+### 🎉
+
+### ✨ Feature
+
+#### CSS 变量
+
+### 🌈 Style
+
+##### 更符合 GitHub 风格
+
+### 🐞 Fix
+
+## 📃 English
+
+#### CSS Variable
+
+##### More GitHub-like style
+
+```text
+在 English 下方补充上面 Feature 以下部分的内容的中译英​
+```

.github/ISSUE_TEMPLATE/1-style-bug-report.yml

@@ -0,0 +1,91 @@
+name: 样式错误报告 ( Style bug report )
+description: 安装主题后出现颜色/位置错误等 ( Color/position errors occur after installing the theme )
+labels: ["style bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        1. 请使用最新的主题, 并使用 Ctrl+F5 刷新页面查看 Bug 是否消失 ( Please use the latest theme and refresh the page with Ctrl+F5 to see if the Bug has disappeared )
+        2. 请查看项目根目录下的 CHANGELOG.md 文件, 查看是否有修复该 Bug 的相关描述 ( Please check the CHANGELOG.md file in the project root directory for descriptions of fixes related to this Bug )
+        3. 如果有相关描述, 可以查看 README.md 自己编译开发版本是否修复了该 Bug ( If there are related descriptions, you can check if the Bug has been fixed by compiling the development version yourself in the README.md )
+        4. 请查看 Gitea 默认主题下是否有同样的错误, 确认非主题问题 ( Please check if there is the same error in the default Gitea theme, confirming that it is not a theme problem )
+  - type: input
+    id: theme-version
+    attributes:
+      label: 主题版本 ( Theme Version )
+      description:
+        主题的版本, 如果是开发版本可以查看 CSS 文件中 `--theme-version` 的值, 或者查看项目根目录下的 `package.json` 文件
+        ( The version of the theme, if it is a development version, you can check the value of `--theme-version` in the
+        CSS file, or check the `package.json` file in the project root directory )
+      placeholder: ex. 1.24.5
+    validations:
+      required: true
+  - type: input
+    id: gitea-version
+    attributes:
+      label: Gitea 版本 ( Gitea Version )
+      description: 应用主题的 Gitea 版本 ( What version of Gitea are you using? )
+      placeholder: ex. 1.24.5
+    validations:
+      required: true
+  - type: input
+    id: page
+    attributes:
+      label: 页面 ( Page )
+      description: 错误出现的页面 ( The page where the error occurred )
+      placeholder: 工单列表页 ( Issue list page )
+    validations:
+      required: true
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: 实际表现 ( Actual Behavior )
+      description: 请描述实际的错误表现 ( Please describe the actual error presentation )
+      placeholder: 页面底部的颜色错误 ( The color of the bottom of the page is incorrect )
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: 期望表现 ( Expected Behavior )
+      description: 请描述期望的正确表现 ( Please describe the expected correct presentation )
+      placeholder: 页面底部的颜色应该是白色 ( The color of the bottom of the page should be white )
+    validations:
+      required: true
+  - type: textarea
+    id: theme-screenshot
+    attributes:
+      label: 应用主题后的截图 ( Screenshot of the theme applied )
+      description: 请上传应用主题后的截图 ( Please upload a screenshot of the theme applied )
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: 复现步骤 ( Steps to reproduce )
+      description: 请描述如何复现错误 ( Please describe how to reproduce the error )
+      placeholder: 1. 安装主题 2. 刷新页面 3. 查看错误 ( 1. Install the theme 2. Refresh the page 3. View the error )
+    validations:
+      required: false
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: 错误描述 ( Bug Description )
+      description: 请描述错误的具体表现 ( Please describe the specific presentation of the error )
+      placeholder: 页面底部的颜色错误 ( The color of the bottom of the page is incorrect )
+    validations:
+      required: false
+  - type: textarea
+    id: gitea-screenshot
+    attributes:
+      label: Gitea 默认主题下的截图 ( Screenshot of the default Gitea theme )
+      description: 请上传 Gitea 默认主题下的截图 ( Please upload a screenshot of the default Gitea theme )
+    validations:
+      required: false
+  - type: textarea
+    id: github-screenshot
+    attributes:
+      label: 可供参考的 GitHub 页面对应的截图 ( Screenshot of the corresponding GitHub page )
+      description: 请上传 GitHub 页面对应的截图 ( Please upload a screenshot of the corresponding GitHub page )
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/2-feature-request.yml

@@ -0,0 +1,39 @@
+name: 功能请求 ( Feature request )
+description: 提出新的功能建议 ( Suggest new features )
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        1. 不接受非 Gitea 和 GitHub 的样式需求 ( We do not accept style requests that are not Gitea or GitHub )
+        2. 颜色需求最好自己实现 ( Color requests are best implemented by yourself )
+  - type: input
+    id: page
+    attributes:
+      label: 页面 ( Page )
+      description: 功能涉及的页面 ( The page the feature involves )
+      placeholder: 首页 ( Home page )
+    validations:
+      required: false
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: 功能描述 ( Feature Description )
+      description: 请描述你想要的功能 ( Please describe the feature you want )
+      placeholder: 菜单样式修改 ( Menu style modification )
+    validations:
+      required: true
+  - type: textarea
+    id: screenshot
+    attributes:
+      label: 截图 ( Screenshot )
+      description: 预期的主题效果 ( Expected theme effect )
+    validations:
+      required: false
+  - type: textarea
+    id: github-screenshot
+    attributes:
+      label: 可供参考的 GitHub 页面对应的截图 ( Screenshot of the corresponding GitHub page )
+      description: 请上传 GitHub 页面对应的截图 ( Please upload a screenshot of the corresponding GitHub page )
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/3-core-bug-report.yml

@@ -0,0 +1,44 @@
+name: 框架错误报告 ( Core bug report )
+description: 报告框架的错误 ( Report errors in the theme framework )
+labels: ["core bug"]
+body:
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: 实际表现 ( Actual Behavior )
+      description: 请描述实际的错误表现 ( Please describe the actual error presentation )
+      placeholder: 未生成自动颜色主题 ( No automatic color theme generated )
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: 期望表现 ( Expected Behavior )
+      description: 请描述期望的正确表现 ( Please describe the expected correct presentation )
+      placeholder: 生成自动颜色主题 ( Generate automatic color theme )
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: 复现步骤 ( Steps to reproduce )
+      description: 请描述如何复现错误 ( Please describe how to reproduce the error )
+      placeholder:
+        1. 新建颜色主题 2. 编译主题 3. 查看错误 ( 1. Create a color theme 2. Compile the theme 3. View the error )
+    validations:
+      required: false
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: 错误描述 ( Bug Description )
+      description: 请描述错误的具体表现 ( Please describe the specific presentation of the error )
+      placeholder: 未生成自动颜色主题 ( No automatic color theme generated )
+    validations:
+      required: false
+  - type: textarea
+    id: screenshot
+    attributes:
+      label: 截图 ( Screenshot )
+      description: 请上传错误的截图 ( Please upload the screenshot of the error )
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/4-doc-report.yml

@@ -0,0 +1,12 @@
+name: 文档报告 ( Document report )
+description: 改进或补充文档 ( Improve or supplement the document )
+labels: ["documentation"]
+body:
+  - type: textarea
+    id: doc-description
+    attributes:
+      label: 文档描述 ( Document Description )
+      description: 请描述文档的具体内容 ( Please describe the specific content of the document )
+      placeholder: 文档内容有误 ( The document content is incorrect )
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/release-template.md

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

.github/release.md

@@ -1,36 +0,0 @@
-## 🎉 项目已毕业! (这是最后一版开发版本)
-
-目前项目的主要功能开发已全部完成, 进入维护阶段.
-
-维护阶段项目发版频率与 Gitea 发版频率保持一致, 版本号将与 Gitea 保持一致(不再附带时间戳).
-
-每逢 Gitea 大版本更新时, 项目中间如有修复, 会发布当前版本的最后一个 `.latest` 版本. 之后会发布适配第一个大版本的 `.rc`
-预发布版本, 问题不多时会发布正式版本, 正式版本之后的修复会等 Gitea 发布下一个小版本时再发布.
-
-## 🌈 Style
-
-- 优化创建仓库/派生仓库/迁移仓库/创建组织页面的样式与设置页面的样式一致
-- 优化消息右上角小图标样式
-- 优化组织页面下的 RSS 订阅按钮样式
-
-#### 更符合 GitHub 风格
-
-- 同步代码编辑器背景色和字体大小 (修复亮色模式下编辑器背景色问题) #12
-- 同步查看代码文件内容页面/文件树样式 (包括滚动时固定的导航栏, 尽量与 GitHub 一致)
-- 同步分页菜单样式
-- 同步登录/注册页面样式
-- 同步 Issue/PR 列表样式
-- 同步 Issue/PR 详细页面侧边栏样式
-- 同步仓库代码文件页 README 导航栏样式
-- 同步用户点星仓库列表样式
-- 优化私有标签样式
-- 优化热力图和动态样式
-- 优化仪表板仓库/组织列表样式
-- 略微增加仓库代码文件列表的单行高度
-
-## 🐞 Fix
-
-- Action 作业步骤页面标题选中时滚动固定的高度
-- 用户公开活动页动态布局
-- 顶部导航栏工单管理/请求合并页面搜索框旁的选择下拉框按钮内容过窄
-- 手机页面下注册/登录页导航栏注册按钮换行

.github/workflows/release.yml

@@ -17,9 +17,19 @@ jobs:
           npm run build
       - name: Create release
         run: |
-          export TZ=Asia/Shanghai
+          tar -zcf dist/theme-github-base.tar.gz --remove-files \
-          TAG="v$(npm run -s version).$(date +%y%m%d%H%M)"
+          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.tar.gz --remove-files dist/theme-github-auto.css dist/theme-github-light.css dist/theme-github-dark.css dist/theme-github-soft-dark.css
+
-          gh release create "$TAG" dist/* --notes-file .github/release.md --draft -t $TAG
+          tar -zcf dist/theme-github-colorblindness-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-colorblindness-tritanopia.tar.gz --remove-files \
+          dist/theme-github-tritanopia-auto.css dist/theme-github-tritanopia-light.css dist/theme-github-tritanopia-dark.css
+
+          tar -zcf dist/theme-github-extra-pink.tar.gz --remove-files \
+          dist/theme-github-pink-auto.css dist/theme-github-pink-light.css dist/theme-github-pink-dark.css dist/theme-github-pink-soft-dark.css
+
+          TAG="v$(npm run -s version)"
+          gh release create "$TAG" dist/* --notes-file CHANGELOG.md --draft -t $TAG
         env:
           GH_TOKEN: ${{ github.token }}

CHANGELOG.md

@@ -0,0 +1,51 @@
+### 🌈 Style
+
+- 优化顶部和二级导航栏的样式和颜色 #18
+
+##### 更符合 GitHub 风格
+
+- 修复并同步工单或 PR 详细页面下的标签菜单样式 #19
+- 统一仓库/用户/组织列表无搜索结果时的样式 #20
+- 同步页脚样式
+- 优化下拉菜单的样式
+- 优化创建标签菜单的菜单项的样式
+- 同步亮色和柔和暗色主题下的菜单颜色
+- 同步工作流运行页面的运行时间字体样式和重新运行按钮样式
+- VSCode 和 VSCodium 图标添加颜色
+
+### 🐞 Fix
+
+- 修复 Wiki 页面搜索项目没有正确隐藏的问题 #15
+- 修复后台账户管理排序菜单项的宽度问题
+- 修复合并提交中的主色调按钮组阴影问题
+- 修复仓库页面下二级导航栏下划线过粗的问题
+- 修复仪表板切换用户按钮菜单下无创建组织按钮时的菜单圆角问题
+- 修复导航栏工单/PR等仪表板下筛选等菜单的子项的间距问题
+- 修复手机下仪表板二级导航栏用户菜单按钮没有居中的问题
+
+## 📃 English
+
+### 🌈 Style
+
+- Optimized styles and colors for top and secondary navigation bars #18
+
+##### More aligned with GitHub style
+
+- Fixed and synchronized label menu styles under issue or PR detail pages #19
+- Unified styles for repository/user/organization lists when no search results are found #20
+- Synchronized footer styles
+- Optimized dropdown menu styles
+- Optimized menu item styles for creating label menus
+- Synchronized menu colors in light and soft dark themes
+- Synchronized font styles for run time and rerun button styles on workflow run pages
+- Added colors to VSCode and VSCodium icons
+
+### 🐞 Fix
+
+- Fixed issue where Wiki page search items were not properly hidden #15
+- Fixed width issue for sorting menu items in admin account management
+- Fixed shadow issue for primary color button groups in merge commits
+- Fixed issue where underlines in secondary navigation bars on repository pages were too thick
+- Fixed menu corner radius issue when no create organization button exists under dashboard user switching button menu
+- Fixed spacing issue for sub-items in filter menus under navigation bar issues/PRs dashboards
+- Fixed issue where user menu buttons in secondary navigation bars on mobile dashboards were not centered

CONTRIBUTING.md

@@ -95,8 +95,8 @@ npm run commit
 
 请在颜色主题文件头部附加自己的作者信息, 方便 Issue 提问者找到你 `@`.
 
-推荐使用 `import { defineTheme } from "src"` 导入主题生成框架, 然后使用 `defineTheme` 函数生成主题,
+推荐使用 `import { defineTheme, type ThemeColor } from "src"` 导入主题生成框架, 声明主题颜色, 然后使用 `defineTheme`
-defineTheme 中设置了一些经过计算得到的 Gitea 变量可以减少工作量, 具体请查看函数说明.
+函数生成主题所有 CSS 变量, defineTheme 中设置了一些经过计算得到的 Gitea 变量可以减少工作量, 具体请查看函数说明和定义.
 
 颜色计算函数可以从 `src/functions` 导入, 例如 `import { scaleColorLight } from "src/functions"`, 或者使用 `polished` 库.
 
@@ -107,12 +107,15 @@ defineTheme 中设置了一些经过计算得到的 Gitea 变量可以减少工
  * @author 你的名字
  * @description 主题描述
  */
-import { defineTheme } from "src";
+import { defineTheme, type ThemeColor } from "src";
-export default defineTheme({
+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,
   ...
@@ -130,17 +133,26 @@ export default defineTheme({
  * @author 你的名字
  * @description 主题描述
  */
-import type { Theme } from "src";
+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`
-目录下, 截图名与主题名相同. (推荐克隆 Github 的 actions/checkout 仓库, 该仓库信息较全, 避免泄露个人隐私)
+目录下, 截图名与主题名相同. (推荐克隆本仓库, 避免泄露个人隐私)
 
 然后将截图信息添加到 `README.md` 文件中, 可以在折叠部分中添加自己的说明.
 
+主题颜色复用案例可以参考本主题的色盲主题.
+
 ## 主题样式贡献
 
 主题样式使用 TypeScript 的 css 模板字符串开发, 该模板字符串会经过 sass 预处理器处理, 支持 SCSS 语法并且主题只接受 SCSS 嵌套语法, 请不要使用 CSS 语法, 如果一定要用请说明原因.

README.md

@@ -1,10 +1,24 @@
-# gitea-github-theme
+<h1 align="center">
+  <p>Gitea GitHub Theme</p>
+  <img src="https://img.shields.io/github/issues-raw/lutinglt/gitea-github-theme?style=for-the-badge&labelColor=25292e&color=1a7f37">
+  <img src="https://img.shields.io/github/issues-closed-raw/lutinglt/gitea-github-theme?style=for-the-badge&labelColor=25292e&color=8250df">
+  <img src="https://img.shields.io/github/downloads/lutinglt/gitea-github-theme/total?style=for-the-badge&labelColor=25292e&color=1f6feb">
+  <img src="https://img.shields.io/github/downloads/lutinglt/gitea-github-theme/latest/total?style=for-the-badge&labelColor=25292e&color=238636">
+</h1>
 
-一个精致模仿 Github 风格的 Gitea 主题
+<div align="center">
+
+中文 • [English](README_EN.md)
+
+不仅仅是在颜色上, 在样式细节上也追求 GitHub 风格的 Gitea 主题.
+
+</div>
+
+![Dashboard](screenshots/dashboard.png)
 
 > [!TIP]
 >
-> 推荐搭配文件图标浏览器插件一起使用更佳
+> 推荐搭配 Catppuccin 文件图标浏览器插件一起使用更佳
 > [web-file-explorer-icons](https://github.com/catppuccin/web-file-explorer-icons)
 
 ## 版本号说明
@@ -15,12 +29,18 @@ Gitea 版本号格式: `1.大版本号.小版本号`
 
 Gitea 理论上小版本号变更不会修改前端布局, 所以主题的小版本号适用于所有 Gitea 大版本号相同的 Gitea 版本.
 
-比如: 主题版本 `1.24.4` 适用于 Gitea 版本 `>=1.24.0` ~ `<1.25.0`
+比如: 主题版本 `1.24.5` 适用于 Gitea 版本 `>=1.24.0` `<1.25.0`
 
 仅维护项目发布中的最新的 Gitea 版本, 其他旧版本主题不接受 Issue 和 PR.
 
 > 开发阶段的主题版本号格式: `1.大版本号.小版本号.时间戳`
 
+### 主题版本发布规则
+
+- 当 Gitea 发布小版本时, 主题中间如有变更, 则发布新的和 Gitea 小版本相同的主题版本
+- 当 Gitea 发布大版本时, 主题中间如有变更, 会发布 `1.旧大版本号.latest` 的主题版本并不再维护旧版本
+- 适配大版本的预发布版本为 `1.大版本号.rc`, 当无明显 BUG 时发布与 Gitea 大版本相同的主题版本
+
 ## 安装
 
 1. 在发布页下载最新的 CSS 主题文件放入 `gitea/public/assets/css` 目录下
@@ -46,8 +66,14 @@ THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-
 
 ## 截图
 
-<details open>
+### 基本主题
-<summary>GitHub</summary>
+
+```ini
+THEMES = github-auto, github-light, github-dark, github-soft-dark
+```
+
+<details>
+<summary>Base</summary>
 <h4>theme-github-light.css</h4>
 <img src="screenshots/light.png"/>
 <h4>theme-github-dark.css</h4>
@@ -56,9 +82,35 @@ THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-
 <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>其他主题</summary>
+<summary>Colorblind & Tritanopia (红绿色盲 & 蓝色盲)</summary>
-等待贡献者ing...
+<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>
+
+### 粉色主题
+
+```ini
+THEMES = github-pink-auto, github-pink-light, github-pink-dark, github-pink-soft-dark
+```
+
+<details>
+<summary>Pink</summary>
+<h4>theme-github-pink-light.css</h4>
+<img src="screenshots/pink/pink-light.png"/>
+<h4>theme-github-pink-dark.css</h4>
+<img src="screenshots/pink/pink-dark.png"/>
+<h4>theme-github-pink-soft-dark.css</h4>
+<img src="screenshots/pink/pink-soft-dark.png"/>
 </details>
 
 ## 自定义 CSS 变量
@@ -88,7 +140,9 @@ THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-
 
 | 变量名                            | 描述                        | 默认  | Github | 推荐  | 最小  | 最大  |
 | :-------------------------------- | :-------------------------- | :---- | :----- | :---- | :---- | :---- |
-| --custom-clone-menu-width         | 克隆菜单宽度                | Gitea | 332px  | 200px | 150px | 400px |
+| --custom-branch-menu-width        | 分支菜单的宽度              | 320px | 320px  | 320px | Gitea | 640px |
+| --custom-clone-menu-width         | 克隆按钮的菜单宽度          | Gitea | 332px  | 200px | 150px | 400px |
+| --custom-user-menu-width          | 用户菜单的宽度              | 192px | 256px  |       | Gitea | 320px |
 | --custom-explore-repolist-columns | 探索页面的仓库列表列数      | 2     | 2      | 2     |       |       |
 | --custom-explore-userlist-columns | 探索页面的用户/组织列表列数 | 3     | 1      | 2/3   |       |       |
 | --custom-user-repolist-columns    | 用户页面的仓库列表列数      | 2     | 2      | 1/2   |       |       |
@@ -110,7 +164,3 @@ npm run build
 
 编译完成后, 会在 `dist` 目录下生成主题文件, 你可以将主题文件放入 `gitea/public/assets/css` 目录下, 然后在
 `gitea/conf/app.ini` 中添加主题名称到 `THEMES` 末尾
-
-## 贡献
-
-请查看 [CONTRIBUTING](CONTRIBUTING.md)

README_EN.md

@@ -0,0 +1,173 @@
+<h1 align="center">
+  <p>Gitea GitHub Theme</p>
+  <img src="https://img.shields.io/github/issues-raw/lutinglt/gitea-github-theme?style=for-the-badge&labelColor=25292e&color=1a7f37">
+  <img src="https://img.shields.io/github/issues-closed-raw/lutinglt/gitea-github-theme?style=for-the-badge&labelColor=25292e&color=8250df">
+  <img src="https://img.shields.io/github/downloads/lutinglt/gitea-github-theme/total?style=for-the-badge&labelColor=25292e&color=1f6feb">
+  <img src="https://img.shields.io/github/downloads/lutinglt/gitea-github-theme/latest/total?style=for-the-badge&labelColor=25292e&color=238636">
+</h1>
+
+<div align="center">
+
+English • [中文](README.md)
+
+A Gitea theme that pursues GitHub style not only in colors but also in styling details.
+
+</div>
+
+![Dashboard](screenshots/en/dashboard-en.png)
+
+> [!TIP]
+>
+> Recommend using Catppuccin file icon browser plugin together for better performance.
+> [web-file-explorer-icons](https://github.com/catppuccin/web-file-explorer-icons)
+
+## Version Number Explanation
+
+The theme version number is kept consistent with the Gitea version number
+
+Gitea version number format: `1.major.minor`
+
+Theoretically, minor version changes in Gitea do not modify the frontend layout, so the minor version of the theme is
+applicable to all Gitea versions with the same major version number.
+
+For example: Theme version `1.24.5` is applicable to Gitea versions `>=1.24.0` `<1.25.0`
+
+Only the latest released Gitea version is maintained. Issues and PRs for other older theme versions will not be
+accepted.
+
+> Development stage theme version number format: `1.major.minor.timestamp`
+
+### Theme Version Release Rules
+
+- When Gitea releases a minor version, if there are changes in the theme, a new theme version with the same minor
+  version as Gitea will be released
+- When Gitea releases a major version, if there are changes in the theme, a theme version `1.old_major_version.latest`
+  will be released and the old version will no longer be maintained
+- The pre-release version for major version adaptation is `1.major_version.rc`, and when there are no obvious bugs, a
+  theme version with the same major version as Gitea will be released
+
+## Installation
+
+1. Download the latest CSS theme file from the release page and place it in the `gitea/public/assets/css` directory
+2. Modify `gitea/conf/app.ini` and append the CSS filename without the `theme-` prefix to the end of `THEMES` under the
+   `[ui]` section
+3. Restart Gitea
+4. Check the theme in the settings
+
+> [!IMPORTANT]
+>
+> Automatic color theme requires both light and dark theme files.
+
+Example: If the theme filename is `theme-github-dark.css`, add `github-dark` to the end of `THEMES`
+
+Example `gitea/conf/app.ini`:
+
+```ini
+[ui]
+THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-dark, github-soft-dark
+```
+
+For details, please refer to the Gitea documentation
+[Gitea docs](https://docs.gitea.com/next/administration/customizing-gitea#customizing-the-look-of-gitea)
+
+## Screenshots
+
+### Basic Themes
+
+```ini
+THEMES = github-auto, github-light, github-dark, github-soft-dark
+```
+
+<details>
+<summary>Base</summary>
+<h4>theme-github-light.css</h4>
+<img src="screenshots/en/light.png"/>
+<h4>theme-github-dark.css</h4>
+<img src="screenshots/en/dark.png"/>
+<h4>theme-github-soft-dark.css</h4>
+<img src="screenshots/en/soft-dark.png"/>
+</details>
+
+### Colorblind Themes (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/en/colorblind-light.png"/>
+<h4>theme-github-colorblind-dark.css & theme-github-tritanopia-dark.css</h4>
+<img src="screenshots/en/colorblind-dark.png"/>
+</details>
+
+### Pink Themes
+
+```ini
+THEMES = github-pink-auto, github-pink-light, github-pink-dark, github-pink-soft-dark
+```
+
+<details>
+<summary>Pink</summary>
+<h4>theme-github-pink-light.css</h4>
+<img src="screenshots/pink/en/pink-light-en.png"/>
+<h4>theme-github-pink-dark.css</h4>
+<img src="screenshots/pink/en/pink-dark-en.png"/>
+<h4>theme-github-pink-soft-dark.css</h4>
+<img src="screenshots/pink/en/pink-soft-dark-en.png"/>
+</details>
+
+## Custom CSS Variables
+
+You can customize parts of the theme style according to your preferences
+
+### Usage Method
+
+Add the following code at the beginning or end of the theme's CSS file
+
+```css
+:root {
+  --custom-clone-menu-width: 150px;
+  ...
+}
+```
+
+> [!IMPORTANT]
+>
+> Please ensure to add custom variables in the `:root` selector, otherwise they will not take effect
+>
+> Variables are separated by `;`
+>
+> It is recommended to place custom variables in a separate file and append them to the theme file using shell commands
+> or other methods
+
+### CSS Variables
+
+| Variable Name                     | Description                                              | Default | Github | Recommend | Min   | Max   |
+| :-------------------------------- | :------------------------------------------------------- | :------ | :----- | :-------- | :---- | :---- |
+| --custom-branch-menu-width        | Branch menu width                                        | 320px   | 320px  | 320px     | Gitea | 640px |
+| --custom-clone-menu-width         | Clone button menu width                                  | Gitea   | 332px  | 200px     | 150px | 400px |
+| --custom-user-menu-width          | User menu width                                          | 192px   | 200px  |           | Gitea | 320px |
+| --custom-explore-repolist-columns | Number of repository list columns on explore page        | 2       | 2      | 2         |       |       |
+| --custom-explore-userlist-columns | Number of user/organization list columns on explore page | 3       | 1      | 2/3       |       |       |
+| --custom-user-repolist-columns    | Number of repository list columns on user page           | 2       | 2      | 1/2       |       |       |
+| --custom-org-repolist-columns     | Number of repository list columns on organization page   | 1       | 1      | 1/2       |       |       |
+| --custom-org-userlist-columns     | Number of user list columns on organization page         | 2       | 1      | 1/2       |       |       |
+
+## Using Development Version of the Theme
+
+You might want to use the development version of the theme instead of the released version
+
+Please ensure you have Node.js environment installed, Node.js 20 or above is recommended
+
+```bash
+git clone https://github.com/lutinglt/gitea-github-theme.git
+cd gitea-github-theme
+npm install
+npm run build
+```
+
+After compilation, theme files will be generated in the `dist` directory. You can place the theme files into the
+`gitea/public/assets/css` directory, then add the theme name to the end of `THEMES` in `gitea/conf/app.ini`

package.json

@@ -1,7 +1,6 @@
 {
   "name": "gitea-github-theme",
-  "version": "1.24.4",
+  "version": "1.24.7",
-  "description": "A theme to make Gitea look and feel like GitHub",
   "type": "module",
   "scripts": {
     "dev": "vite build --mode dev",
@@ -32,7 +31,7 @@
     "typescript-eslint": "^8.34.1",
     "typescript-plugin-css-modules": "^5.1.0",
     "typescript-styled-plugin": "^0.18.3",
-    "vite": "^6.3.5"
+    "vite": "^7.1.9"
   },
   "prettier": {
     "printWidth": 120,

src/core/chroma.ts

@@ -1,36 +1,6 @@
-import { prettylights2Chroma } from "./prettylights";
+import { prettylights2Chroma, type prettylightsColor } from "./prettylights";
 
-export const defaultDarkChroma = prettylights2Chroma({
+export const lightPrettylights: 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({
   syntax: {
     brackethighlighter: { angle: "#59636e", unmatched: "#82071e" },
     carriage: { return: { bg: "#cf222e", text: "#f6f8fa" } },
@@ -58,4 +28,37 @@ export const defaultLightChroma = prettylights2Chroma({
     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

@@ -5,7 +5,7 @@ import { themeVars } from "src/types/vars";
 import { defaultDarkChroma, defaultLightChroma } from "./chroma";
 import type { Theme } from "./theme";
 
-type ThemeColor = {
+export type ThemeColor = {
   /** 用于标识当前是否为暗色主题: `true` 暗色 `false` 亮色 */
   isDarkTheme: boolean;
   /** 主色调(强调色) */
@@ -14,38 +14,41 @@ type ThemeColor = {
   primaryContrast: string;
   /** 副色调(边框色) */
   secondary: string;
-  /** 红色 */
+  /** 基础颜色 */
-  red: string;
+  base: {
-  /** 橙色 */
+    /** 红色 */
-  orange: string;
+    red: string;
-  /** 黄色 */
+    /** 橙色 */
-  yellow: string;
+    orange: string;
-  /** 黄绿色/橄榄色 */
+    /** 黄色 */
-  olive: string;
+    yellow: string;
-  /** 绿色 */
+    /** 黄绿色/橄榄色 */
-  green: string;
+    olive: string;
-  /** 蓝绿色/青色(偏绿) */
+    /** 绿色 */
-  teal: string;
+    green: string;
-  /** 蓝绿色/青色(偏蓝) */
+    /** 蓝绿色/青色(偏绿) */
-  cyan: string;
+    teal: string;
-  /** 蓝色 */
+    /** 蓝绿色/青色(偏蓝) */
-  blue: string;
+    cyan: string;
-  /** 蓝紫色/紫罗兰色 */
+    /** 蓝色 */
-  violet: string;
+    blue: string;
-  /** 紫色 */
+    /** 蓝紫色/紫罗兰色 */
-  purple: string;
+    violet: string;
-  /** 粉红色 */
+    /** 紫色 */
-  pink: string;
+    purple: string;
-  /** 棕色 */
+    /** 粉红色 */
-  brown: string;
+    pink: string;
-  /** 黑色 */
+    /** 棕色 */
-  black: string;
+    brown: string;
-  /** 灰色 */
+    /** 黑色 */
-  grey: string;
+    black: string;
-  /** 金色 */
+    /** 灰色 */
-  gold: string;
+    grey: string;
-  /** 白色 */
+    /** 金色 */
-  white: string;
+    gold: string;
+    /** 白色 */
+    white: string;
+  };
   /** Action 日志 */
   console: Console;
   /** 提交代码对比 */
@@ -81,7 +84,7 @@ type ThemeColor = {
  *   github,
  * })
  */
-export function defineTheme(themeColor: ThemeColor, chroma: Chroma | null = null): Theme {
+export function defineTheme(themeColor: ThemeColor, chroma?: Chroma): Theme {
   const brightDir = themeColor.isDarkTheme ? -1 : 1;
 
   const primary: Primary = {
@@ -161,161 +164,187 @@ 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),
     },
   };
 
@@ -326,7 +355,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,
@@ -335,7 +364,9 @@ 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,
     },
   };

src/core/display.ts

@@ -0,0 +1,85 @@
+import { saturate } from "polished";
+import { scaleColorLight } from "src/functions";
+import { type GithubColor } from "./github";
+
+export type DisplayColor = {
+  num0: string;
+  num1: string;
+  num2: string;
+  num3: string;
+  num4: string;
+  num5: string;
+  num6: string;
+  num7: string;
+  num8: string;
+  num9: string;
+};
+
+export function display2GithubColor(
+  displayColor: DisplayColor,
+  baseGithubColor: GithubColor,
+  soft?: boolean
+): GithubColor {
+  return {
+    ...baseGithubColor,
+    diffBlob: {
+      ...baseGithubColor.diffBlob,
+      hunkNum: { bgColor: { rest: soft ? displayColor.num2 : displayColor.num1 } },
+    },
+    fgColor: {
+      ...baseGithubColor.fgColor,
+      accent: soft ? displayColor.num7 : displayColor.num6,
+    },
+    bgColor: {
+      ...baseGithubColor.bgColor,
+      accent: {
+        emphasis: soft ? saturate(-0.1, scaleColorLight(displayColor.num5, -2)) : displayColor.num5,
+        muted: soft ? displayColor.num1 : displayColor.num0,
+      },
+    },
+    borderColor: {
+      ...baseGithubColor.borderColor,
+      accent: {
+        emphasis: soft ? displayColor.num6 : displayColor.num5,
+      },
+    },
+    button: {
+      ...baseGithubColor.button,
+      primary: {
+        ...baseGithubColor.button.primary,
+        fgColor: {
+          ...baseGithubColor.button.primary.fgColor,
+          accent: soft ? displayColor.num7 : displayColor.num6,
+        },
+        bgColor: {
+          ...baseGithubColor.button.primary.bgColor,
+          rest: soft ? saturate(-0.1, scaleColorLight(displayColor.num5, -2)) : displayColor.num5,
+          hover: soft ? saturate(-0.1, scaleColorLight(displayColor.num5, 3)) : scaleColorLight(displayColor.num5, 5),
+        },
+      },
+      star: {
+        iconColor: soft
+          ? scaleColorLight(displayColor.num6, -2)
+          : saturate(0.1, scaleColorLight(displayColor.num6, -2)),
+      },
+    },
+    underlineNav: {
+      borderColor: {
+        active: soft ? scaleColorLight(saturate(0.1, displayColor.num6), -5) : saturate(0.2, displayColor.num6),
+      },
+    },
+    contribution: {
+      ...baseGithubColor.contribution,
+      default: {
+        ...baseGithubColor.contribution.default,
+        bgColor: {
+          num0: baseGithubColor.contribution.default.bgColor.num0,
+          num1: soft ? displayColor.num2 : displayColor.num1,
+          num2: soft ? displayColor.num3 : displayColor.num2,
+          num3: soft ? displayColor.num5 : displayColor.num4,
+          num4: soft ? displayColor.num7 : displayColor.num6,
+        },
+      },
+    },
+  };
+}

src/core/github.ts

@@ -1,14 +1,14 @@
 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;
   display: {
+    blue: { fgColor: string };
     brown: { fgColor: string };
     cyan: { fgColor: string };
     indigo: { fgColor: string };
@@ -37,10 +37,12 @@ export type GithubColor = {
     black: string;
     white: string;
     muted: string;
+    onEmphasis: string;
   };
   bgColor: {
     accent: { emphasis: string; muted: string };
     attention: { muted: string };
+    emphasis: string;
     success: { emphasis: string; muted: string };
     danger: { muted: string };
     done: { emphasis: string };
@@ -59,15 +61,16 @@ export type GithubColor = {
     translucent: string;
   };
   button: {
-    primary: { fgColor: { rest: string }; bgColor: { hover: string } };
+    primary: { fgColor: { accent: string; rest: string }; bgColor: { rest: string; hover: string } };
     danger: { fgColor: { rest: string; hover: string }; bgColor: { hover: string } };
+    star: { iconColor: string };
   };
   control: {
     bgColor: { active: string; hover: string; rest: string };
     transparent: { bgColor: { active: string; hover: string; selected: string } };
   };
-  shadow: { floating: { small: string } };
+  shadow: { floating: { small: string }; resting: { small: string } };
-  overlay: { backdrop: { bgColor: string } };
+  overlay: { backdrop: { bgColor: string }; bgColor: string };
   underlineNav: { borderColor: { active: string } };
   contribution: {
     default: {
@@ -77,7 +80,7 @@ export type GithubColor = {
   };
 };
 
-export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | null = null): Theme {
+export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
   const console: Console = {
     fg: {
       self: githubColor.fgColor.default,
@@ -88,7 +91,7 @@ export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | nul
     activeBg: githubColor.control.bgColor.active,
     hoverBg: githubColor.control.transparent.bgColor.hover,
     menu: {
-      bg: githubColor.bgColor.inset,
+      bg: githubColor.overlay.bgColor,
       border: githubColor.borderColor.muted,
     },
   };
@@ -166,7 +169,7 @@ export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | nul
       opaque: themeVars.color.box.header,
     },
     active: githubColor.control.transparent.bgColor.selected,
-    menu: githubColor.bgColor.inset,
+    menu: githubColor.overlay.bgColor,
     card: themeVars.color.body,
     markup: {
       tableRow: githubColor.bgColor.muted,
@@ -193,15 +196,15 @@ export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | nul
       activeBg: githubColor.bgColor.accent.muted,
     },
     tooltip: {
-      text: githubColor.fgColor.default,
+      text: githubColor.fgColor.onEmphasis,
-      bg: githubColor.bgColor.default,
+      bg: githubColor.bgColor.emphasis,
     },
     nav: {
-      bg: githubColor.bgColor.inset,
+      bg: githubColor.bgColor.muted,
       hoverBg: githubColor.control.transparent.bgColor.hover,
       text: themeVars.color.text.self,
     },
-    secondaryNavBg: themeVars.color.nav.bg,
+    secondaryNavBg: themeVars.color.body,
     label: {
       text: themeVars.color.text.self,
       bg: githubColor.bgColor.neutral.muted,
@@ -257,11 +260,14 @@ export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | nul
       },
       primary: {
         fgColor: {
-          accent: saturate(0.1, scaleColorLight(githubColor.fgColor.success, githubColor.isDarkTheme ? 10 : -10)),
+          accent: saturate(
+            0.1,
+            scaleColorLight(githubColor.button.primary.fgColor.accent, githubColor.isDarkTheme ? 10 : -10)
+          ),
           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: {
@@ -282,6 +288,9 @@ export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | nul
           hover: githubColor.borderColor.translucent,
         },
       },
+      star: {
+        iconColor: githubColor.button.star.iconColor,
+      },
     },
     control: {
       bgColor: {
@@ -297,6 +306,9 @@ export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | nul
       floating: {
         small: `0px 0px 0px 1px ${themeVars.color.light.border}, 0px 6px 12px -3px ${themeVars.color.shadow.self}, 0px 6px 18px 0px ${themeVars.color.shadow.self};`,
       },
+      resting: {
+        small: `0px 1px 1px 0px ${githubColor.shadow.resting.small}, 0px 1px 3px 0px ${githubColor.shadow.resting.small};`,
+      },
     },
     underlineNav: {
       borderColor: {
@@ -327,12 +339,12 @@ export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | nul
       },
     },
   };
-  return defineTheme(
+  return {
-    {
+    isDarkTheme: githubColor.isDarkTheme,
-      isDarkTheme: githubColor.isDarkTheme,
+    primary: githubColor.fgColor.accent,
-      primary: githubColor.fgColor.accent,
+    primaryContrast: githubColor.fgColor.default,
-      primaryContrast: githubColor.fgColor.default,
+    secondary: githubColor.borderColor.default,
-      secondary: githubColor.borderColor.default,
+    base: {
       red: githubColor.fgColor.danger,
       orange: githubColor.fgColor.severe,
       yellow: githubColor.fgColor.attention,
@@ -340,7 +352,7 @@ export function defineGithubTheme(githubColor: GithubColor, chroma: Chroma | nul
       green: githubColor.fgColor.success,
       cyan: githubColor.display.cyan.fgColor,
       teal: githubColor.display.teal.fgColor,
-      blue: githubColor.fgColor.accent,
+      blue: githubColor.display.blue.fgColor,
       violet: githubColor.display.indigo.fgColor,
       purple: githubColor.fgColor.done,
       pink: githubColor.fgColor.sponsors,
@@ -349,11 +361,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
+    console,
-  );
+    diff,
+    other,
+    github,
+  };
 }

src/core/prettylights.ts

@@ -73,7 +73,7 @@ export function prettylights2Chroma(prettylights: prettylightsColor): Chroma {
     string: {
       self: prettylights.syntax.string,
       affix: prettylights.syntax.string,
-      backtick: prettylights.syntax.string,
+      backtick: prettylights.syntax.constant,
       char: prettylights.syntax.string,
       delimiter: prettylights.syntax.string,
       doc: prettylights.syntax.comment,

src/core/theme.ts

@@ -1,5 +1,7 @@
-import { createGlobalTheme, globalKeyframes, globalStyle } from "@vanilla-extract/css";
+import { createGlobalTheme, globalStyle } from "@vanilla-extract/css";
-import { otherThemeVars, themeVars } from "src/types/vars";
+import fs from "node:fs";
+import path from "node:path";
+import { otherThemeVars, themeInfoVars, themeVars } from "src/types/vars";
 import type { MapLeafNodes, WithOptionalLayer } from "./types";
 
 export type Theme = WithOptionalLayer<MapLeafNodes<typeof themeVars, string>>;
@@ -32,11 +34,19 @@ const emoji = `
 .emoji[aria-label="musical notes"]
 `;
 
+// 版本号: 版本号.YYMMDD
+const now = new Date();
+const year = now.getFullYear().toString().slice(-2);
+const month = (now.getMonth() + 1).toString().padStart(2, "0");
+const day = now.getDate().toString().padStart(2, "0");
+
+const pkgPath = path.join(__dirname, "../..", "package.json");
+const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+const version = `"${pkg.version}.${year}${month}${day}"`;
+
 export function createTheme(theme: Theme): void {
   const isDarkTheme: boolean = JSON.parse(theme.isDarkTheme);
-  if (isDarkTheme) {
+  createGlobalTheme(":root", themeInfoVars, { version });
-    globalStyle(emoji, { filter: "invert(100%) hue-rotate(180deg)" });
-  }
   createGlobalTheme(":root", themeVars, theme);
   createGlobalTheme(":root", otherThemeVars, {
     border: { radius: "6px" },
@@ -53,12 +63,5 @@ export function createTheme(theme: Theme): void {
     accentColor: themeVars.color.accent,
     colorScheme: isDarkTheme ? "dark" : "light",
   });
-  globalKeyframes(overlayAppearDown, {
+  if (isDarkTheme) globalStyle(emoji, { filter: "invert(100%) hue-rotate(180deg)" });
-    "0%": { opacity: 0, transform: "translateY(-8px)" },
-    "100%": { opacity: 1, transform: "translateY(0)" },
-  });
-  globalKeyframes(overlayAppearUp, {
-    "0%": { opacity: 0, transform: "translateY(8px)" },
-    "100%": { opacity: 1, transform: "translateY(0)" },
-  });
 }

src/core/vite.ts

@@ -50,6 +50,11 @@ export function themeInput(outDir: string, themeDir: string, mode: string): { [k
   return input;
 }
 
+function giteaThemeMetaInfo(nameGroup: string[]): string {
+  const displayName = nameGroup.map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(" ");
+  return `gitea-theme-meta-info{--theme-display-name:"GitHub ${displayName}";}`; // 不要省略分号, 也不要追加任何变量, 否则 Gitea 不识别
+}
+
 const prefix = "theme-github-";
 
 /**
@@ -82,23 +87,28 @@ export function themePlugin(): Plugin {
           const fileName = `${prefix}${value.fileName}`;
           const originalFileName = value.originalFileNames.pop();
           const type = value.type;
-          const source = `${styles}${value.source.toString()}`;
+          // 合并样式文件和主题信息
+          const meta = giteaThemeMetaInfo(key.split(".")[0].split("-"));
+          const source = `${meta}${value.source.toString()}${styles}`;
           // 添加主题到输出
           this.emitFile({ name, fileName, source, type, originalFileName });
           // 自动颜色主题
           const isDark = key.endsWith("dark.css");
-          const darkName = key.replace("light.css", "dark.css");
+          const darkName = key.replace("light", "dark");
-          const lightName = key.replace("dark.css", "light.css");
+          const lightName = darkName.replace("dark", "light");
-          const autoName = `${prefix}${key.replace("dark.css", "auto.css").replace("light.css", "auto.css")}`;
           const findTheme = isDark ? lightName : darkName;
           if (findTheme in bundle) {
+            const autoName = `${prefix}${darkName.replace("dark", "auto")}`;
             const lightContent = `@import "./${prefix}${lightName}" (prefers-color-scheme: light);`;
             const darkContent = `@import "./${prefix}${darkName}" (prefers-color-scheme: dark);`;
+            const nameGroup = key.split(".")[0].split("-").slice(0, -1);
+            nameGroup.push("auto");
+            const metaInfo = giteaThemeMetaInfo(nameGroup);
             this.emitFile({
               name: autoName,
               fileName: autoName,
               type: "asset",
-              source: `${lightContent}\n${darkContent}`,
+              source: `${lightContent}\n${darkContent}\n${metaInfo}`,
             });
           }
           // 删除原始的样式文件, 自动颜色主题因为删除, 永远不会生成两次

src/index.ts

@@ -1,4 +1,5 @@
-export { defineTheme } from "./core/color";
+export { defaultDarkChroma, defaultLightChroma } from "./core/chroma";
+export { defineTheme, type ThemeColor } from "./core/color";
 export type { Theme } from "./core/theme";
-export type { Chroma, Console, Diff, Github, Other } from "./types";
+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

@@ -25,7 +25,6 @@ export const github = {
     accent: {
       /** 强调色
        * @diff 折叠/展开按钮的悬停颜色
-       * @actions `actionViewLeft` 左侧子作业激活伪元素颜色
        * @release `releaseTagMenu` 顶部栏左侧按钮激活背景色
        * @navbar `navbarRight` 头像管理员标识背景颜色
        * @dropdown `dropdown` emoji 的悬停背景色
@@ -37,6 +36,7 @@ export const github = {
        * @repo `repoTopic` 仓库主题标签背景颜色
        * @actions `actions` 分支标签按钮背景颜色
        * @actions `actionViewHeader` 分支标签按钮背景颜色
+       * @notification `notification` 通知列表悬停时的背景颜色
        */
       muted: null,
     },
@@ -60,8 +60,10 @@ export const github = {
        * @input `input` 输入框被选中时的边框颜色
        * @clone `clone` 克隆地址框被选中时的边框颜色
        * @issue `comment` 评论框被选中时的边框颜色
+       * @actions `actionViewLeft` 左侧子作业激活伪元素颜色
        * @menu `verticalMenu` 垂直菜单项激活时左侧的伪元素颜色
        * @dropdown `selectionDropdown` 选择输入框的内部边框颜色
+       * @notification `notification` 通知列表悬停时的左边框颜色
        */
       emphasis: null,
     },
@@ -158,6 +160,10 @@ export const github = {
         hover: null,
       },
     },
+    star: {
+      /** 已标星的星星颜色 */
+      iconColor: null,
+    },
   },
   control: {
     bgColor: {
@@ -174,12 +180,14 @@ export const github = {
          * @dropdown `dropdown` 下拉框子项的悬停背景颜色
          * @menu `verticalMenu` 垂直菜单项的悬停背景颜色
          * @menu `menu` 菜单项的悬停背景颜色
+         * @menu `secondaryMenu` 二级菜单按钮的悬停背景颜色
          * @repo `repoHeader` 仓库标题的悬停背景颜色
          * @commit `commit` 提交信息的 Action 按钮的悬停背景颜色
          * @filelist `repoFiles` README 栏的按钮的悬停背景颜色
          * @issue `issueSidebar` 操作按钮的悬停背景颜色
          * @issue `issueList` 头部菜单左侧开启关闭菜单的悬停背景颜色
          * @dashboard `dashboard` 仓库列表项目的悬停背景颜色
+         * @notification `notification` 通知列表的按钮悬停背景颜色
          */
         hover: null,
       },
@@ -190,6 +198,17 @@ export const github = {
       /** 悬浮阴影
        * @tippy `tippyBox` 悬浮框阴影
        * @dropdown `dropdown` 下拉框阴影
+       * @dashboard `dashboard` 仓库/组织切换按钮和列表边框和阴影
+       * @heatmap `heatmap` 热力图阴影
+       * @heatmap `activity` 动态活动阴影
+       */
+      small: null,
+    },
+    resting: {
+      /** 静止阴影
+       * @button `primaryStyle` 主色调按钮阴影
+       * @button `redButton` 红色按钮悬浮阴影
+       * @setting `button` 红色按钮阴影
        */
       small: null,
     },

src/types/color/other.ts

@@ -114,7 +114,7 @@ export const other = {
     /** 点击后颜色 */
     activeBg: "color-reaction-active-bg",
   },
-  /** 不知道是干啥的 */
+  /** 鼠标悬浮时的提示文本, 比如提交的具体时间, 任务状态等 */
   tooltip: {
     text: null,
     bg: null,

src/types/vars.ts

@@ -33,14 +33,21 @@ const vars = {
 const otherVars = { border: { radius: null }, color: { ...color.otherAuto } };
 
 const customVars = {
+  branchMenuWidth: "branch-menu-width",
   cloneMenuWidth: "clone-menu-width",
+  userMenuWidth: "user-menu-width",
   explore: { repolistColumns: "explore-repolist-columns", userlistColumns: "explore-userlist-columns" },
   userRepolistColumns: "user-repolist-columns",
   org: { repolistColumns: "org-repolist-columns", userlistColumns: "org-userlist-columns" },
 };
 
+const themeInfo = {
+  version: null,
+};
+
 export const themeVars = createGlobalThemeContract(vars, varMapper());
 export const otherThemeVars = createGlobalThemeContract(otherVars, varMapper());
 export const customThemeVars = createGlobalThemeContract(customVars, varMapper("custom"));
+export const themeInfoVars = createGlobalThemeContract(themeInfo, varMapper("theme"));
 
 export { css } from "@linaria/core";

styles/components/actions.ts

@@ -27,7 +27,7 @@ export const actions = css`
         margin-bottom: 24px;
         margin-left: 2px;
       }
-
+      // 工作流列表标题栏菜单
       .ui.secondary.menu {
         background-color: ${themeVars.color.box.header};
         border: 1px solid ${themeVars.color.light.border};
@@ -36,6 +36,9 @@ export const actions = css`
         border-top-right-radius: ${otherThemeVars.border.radius};
         padding: 16px;
         margin-bottom: 0;
+        > .item {
+          color: ${themeVars.color.text.light.num1};
+        }
       }
 
       .ui.info.message {
@@ -58,7 +61,7 @@ export const actions = css`
         .run-list-ref {
           background-color: ${themeVars.github.bgColor.accent.muted};
           color: ${themeVars.github.fgColor.accent};
-          font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace);
+          font-family: var(--fonts-monospace);
           font-weight: 400;
           &:hover {
             background-color: ${themeVars.github.bgColor.accent.muted};
@@ -180,7 +183,7 @@ export const actionViewLeft = css`
 
           &:after {
             overflow: visible;
-            background: ${themeVars.github.bgColor.accent.emphasis};
+            background: ${themeVars.github.borderColor.accent.emphasis};
             border-radius: ${otherThemeVars.border.radius};
             content: "";
             height: 24px;
@@ -190,6 +193,26 @@ export const actionViewLeft = css`
             width: 4px;
           }
         }
+        .job-brief-item-right {
+          svg.job-brief-rerun {
+            display: none;
+            color: ${themeVars.color.console.fg.subtle};
+            &:hover {
+              color: ${themeVars.color.text.self};
+            }
+          }
+          .step-summary-duration {
+            color: ${themeVars.color.console.fg.subtle};
+            font-family: var(--fonts-monospace);
+          }
+        }
+        &:hover {
+          .job-brief-item-right {
+            svg.job-brief-rerun {
+              display: inline-block;
+            }
+          }
+        }
       }
     }
   }
@@ -246,6 +269,11 @@ export const actionViewRight = css`
             color: ${themeVars.color.console.fg.self} !important;
           }
         }
+        // 步骤耗时
+        .step-summary-duration {
+          font-size: 12px;
+          font-family: var(--fonts-monospace);
+        }
       }
       // 步骤日志
       .job-step-logs {

styles/components/clone.ts

@@ -92,7 +92,7 @@ export const clone = css`
         .item {
           border-radius: ${otherThemeVars.border.radius};
           padding: 6px 8px;
-          line-height: 1.5;
+          height: 32px;
           margin: 0;
           svg {
             color: ${themeVars.color.text.light.num1};

styles/components/commit.ts

@@ -42,13 +42,24 @@ export const commit = css`
           color: ${themeVars.color.text.light.num1};
         }
       }
-      // 整行悬停色
+      tr {
-      tr:hover {
+        // 整行悬停色
-        background-color: ${themeVars.color.hover.opaque};
+        &:hover {
-      }
+          background-color: ${themeVars.color.hover.opaque};
-      // 偶数行悬停色
+        }
-      tr:nth-child(2n):hover {
+        // 偶数行悬停色
-        background-color: ${themeVars.color.hover.opaque} !important;
+        &:nth-child(2n):hover {
+          background-color: ${themeVars.color.hover.opaque} !important;
+        }
+        // 尾行圆角
+        &:last-child {
+          td:first-child {
+            border-bottom-left-radius: ${otherThemeVars.border.radius};
+          }
+          td:last-child {
+            border-bottom-right-radius: ${otherThemeVars.border.radius};
+          }
+        }
       }
     }
   }

styles/components/dashboard.ts

@@ -1,19 +1,33 @@
 import { css, otherThemeVars, themeVars } from "src/types/vars";
 
 export const dashboard = css`
-  .page-content.dashboard {
+  // 首页仪表板, 避免选中管理员后台的维护管理面板
+  .page-content.dashboard.feeds {
     // 仓库列表的仓库/组织切换按钮
     .ui.two.item.menu {
-      box-shadow: ${themeVars.github.shadow.floating.small};
+      background: ${themeVars.color.hover.self};
-      border: unset;
+      border: 0;
       border-radius: 12px;
       margin-bottom: 8px;
       > .item {
-        &:first-child {
+        background: unset;
-          border-radius: 12px 0 0 12px;
+        border-radius: 12px;
+        padding: 6px 12px !important;
+        &.active {
+          background: ${themeVars.color.menu};
+          box-shadow: ${themeVars.github.shadow.floating.small};
+          font-weight: 600;
         }
-        &:last-child {
+        &::before {
-          border-radius: 0 12px 12px 0;
+          display: none;
+        }
+        &:not(.active) {
+          border-radius: ${otherThemeVars.border.radius};
+          margin: 6px !important;
+          width: calc(50% - 12px);
+          &:hover {
+            background: ${themeVars.github.control.transparent.bgColor.hover};
+          }
         }
       }
     }
@@ -43,6 +57,7 @@ export const dashboard = css`
           padding: 8px;
           li {
             border-radius: ${otherThemeVars.border.radius};
+            padding: 6px 8px !important;
             &:not(:last-child) {
               border-bottom: 0;
             }
@@ -64,3 +79,66 @@ export const dashboard = css`
     }
   }
 `;
+
+// 导航栏的工单/PR/里程碑仪表板
+export const dashboardIssues = css`
+  .page-content.dashboard.issues {
+    .list-header {
+      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: 54px;
+      padding: 16px 8px;
+      .list-header-toggle {
+        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;
+          }
+        }
+      }
+      .list-header-filters {
+        > .item {
+          border-radius: ${otherThemeVars.border.radius};
+          color: ${themeVars.color.text.light.num1};
+          padding: 0px 12px;
+          height: 32px;
+          &:hover {
+            background: ${themeVars.github.control.transparent.bgColor.hover};
+          }
+        }
+      }
+    }
+  }
+`;
+
+// 避免手机/平板下菜单错位
+export const issueListMobile = css`
+  @media (max-width: 767.98px) {
+    .page-content.dashboard.issues .list-header {
+      height: auto;
+    }
+  }
+`;
+
+// 修复仪表板下二级面板选择菜单组织的标签间隔
+export const fixOrgLabel = css`
+  .dashboard .secondary-nav .org-visibility .label {
+    margin-right: 0;
+  }
+`;

styles/components/diff.ts

@@ -31,7 +31,6 @@ export const diff = css`
   .code-expander-button {
     color: ${themeVars.color.text.light.num1};
     height: 28px !important;
-
     &:hover {
       background: ${themeVars.github.bgColor.accent.emphasis};
       color: ${themeVars.color.white};
@@ -41,4 +40,33 @@ export const diff = css`
   .lines-num {
     text-align: center !important;
   }
+  // 差异对比文件盒子
+  .diff-file-box {
+    // 差异对比文件头
+    .diff-file-header {
+      // 文件名
+      .diff-file-name {
+        font-weight: 400;
+        .fold-file.btn svg {
+          min-width: 16px;
+          min-height: 16px;
+          height: 16px;
+          width: 16px;
+        }
+        .diff-stats-bar {
+          height: 8px;
+        }
+        > div,
+        .file-link {
+          font-size: 12px;
+        }
+      }
+      // 操作按钮
+      .diff-file-header-actions {
+        color: ${themeVars.color.text.light.num1};
+        font-size: 12px;
+        font-weight: 400;
+      }
+    }
+  }
 `;

styles/components/editor.ts

@@ -4,17 +4,11 @@ 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

@@ -157,3 +157,33 @@ export const mobileList = css`
     }
   }
 `;
+
+// 统一无搜索结果时的样式
+export const notMatch = 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,
+  // 组织的成员列表
+  .page-content.organization.members >.ui.container,
+  // 探索的用户和组织列表
+  .page-content.explore.users >.ui.container {
+    // 排除用户的公开活动页
+    > .flex-list:not(#activity-feed) {
+      &:has(> div:only-child):not(:has(.flex-item-main)) {
+        grid-template-columns: 1fr;
+        > div {
+          border: 1px solid ${themeVars.color.light.border};
+          border-radius: ${otherThemeVars.border.radius};
+          font-size: 16px;
+          font-weight: 500;
+          padding: 32px;
+          display: flex;
+          justify-content: center;
+        }
+      }
+    }
+  }
+`;

styles/components/filelist.ts

@@ -10,7 +10,7 @@ export const branchButton = css`
         border: 1px solid ${themeVars.color.light.border};
         margin-top: 1px;
         margin-left: auto;
-        margin-right: 16px; // gitea 有 RSS 留出足够的空间
+        margin-right: 20px; // gitea 有 RSS 留出足够的空间
       }
     }
   }
@@ -22,6 +22,7 @@ export const syncFork = css`
     .repo-home-filelist > .ui.message {
       background: ${themeVars.color.box.header};
       padding: 8px 8px 8px 16px;
+      margin: 16px 0px;
       .ui.button {
         min-width: 96px;
       }
@@ -31,8 +32,13 @@ export const syncFork = css`
 
 // 仓库文件列表
 export const repoFiles = css`
+  // 文件列表和提交列表的按钮组
+  .repo-button-row {
+    margin: 16px 0;
+  }
   .repository.file.list {
     #repo-files-table {
+      margin: 16px 0;
       // 头部最后一次提交
       .repo-file-line {
         padding-right: 16px;
@@ -91,11 +97,15 @@ export const repoFiles = css`
     #readme {
       .file-header {
         background: ${themeVars.color.body};
+        min-height: 48px;
+        padding: 0px 8px !important;
         svg {
           color: ${themeVars.color.text.light.num1};
         }
         .file-header-left {
-          padding: 6px 8px !important;
+          padding: 8px !important;
+          // 伪元素宽度等于按钮宽度而不是父元素宽度
+          position: relative;
           &:hover {
             background: ${themeVars.github.control.transparent.bgColor.hover};
             border-radius: ${otherThemeVars.border.radius};
@@ -104,11 +114,11 @@ export const repoFiles = css`
             content: "";
             background: ${themeVars.github.underlineNav.borderColor.active};
             border-radius: ${otherThemeVars.border.radius};
-            bottom: 0;
+            bottom: -7px;
+            left: 0;
             height: 2px;
             position: absolute;
-            left: 12px;
+            width: 100%;
-            width: 113px;
           }
           a.muted:hover {
             color: inherit;
@@ -146,69 +156,179 @@ export const repoFilesMobile = css`
 
 // 仓库打开文件时的视图
 export const repoFileView = css`
+  // 隐藏主内容的下内容和页脚, 避免滚动文件树时滚动条遮挡
+  body > .full.height:has(.repo-view-file-tree-container) {
+    padding-bottom: 0;
+    + .page-footer {
+      display: none;
+    }
+  }
   .page-content.repository.file.list {
+    &:has(.repo-view-file-tree-container) {
+      // 取消下间隔优化观看体验
+      .secondary-nav {
+        margin-bottom: 0 !important;
+        .ui.tabs.divider {
+          margin-bottom: 0;
+        }
+      }
+    }
     > .ui.container.fluid {
       max-width: calc(100% - calc(2 * 16px));
     }
     .repo-view-container {
+      position: sticky;
+      top: 0;
       // 左侧文件树
       .repo-view-file-tree-container {
-        height: 100vh;
+        height: calc(100vh - 64px); // 减去头部高度
+        // 固定头部
         position: sticky;
         top: 0;
         &:after {
           content: "";
           position: absolute;
-          top: -14px;
+          top: 0;
           right: 0;
           width: 1px;
-          height: calc(100% + 14px);
+          height: calc(100% + 64px); // 头部高度
           background: ${themeVars.color.secondary.self};
         }
         > .repo-button-row {
-          height: 32px;
+          align-content: center;
-          margin: 16px 0;
+          background: ${themeVars.color.body};
+          font-size: 16px;
+          height: 64px;
+          margin: 0;
+          // 固定头部, 早期父元素有多余的页脚和内容高度导致滚动时无法固定, 修复后也可保留此属性无需删除
+          position: sticky;
+          top: 0;
           &:after {
             content: "";
             position: absolute;
-            top: 32px + 32px;
+            top: 64px;
             left: -16px;
             width: calc(100% + 16px);
             height: 1px;
             background: ${themeVars.color.secondary.self};
           }
+          .ui.compact.icon.button {
+            border: 0;
+          }
+        }
+        .view-file-tree-items {
+          margin-right: 0;
+          padding: 12px 16px 8px 0;
         }
       }
       // 右侧文件视图内容
       .repo-view-content {
+        padding-bottom: 40px;
         .repo-button-row {
-          align-items: center;
+          align-content: center;
           background: ${themeVars.color.box.header};
           border: 1px solid ${themeVars.color.secondary.self};
           border-radius: ${otherThemeVars.border.radius};
+          margin: 16px 0;
           height: 46px;
           min-height: 46px;
           padding: 8px;
           position: sticky;
           top: 0;
           z-index: 1;
+          .ui.button {
+            min-height: 32px;
+          }
+          // 打开文件树按钮
+          .repo-view-file-tree-toggle-show {
+            background: initial;
+            border-color: #0000;
+            padding: 0;
+            min-width: 32px;
+          }
+          // 分支选择按钮
+          .branch-dropdown-button {
+            padding: 0 12px;
+          }
+          // 路径
+          .repo-path {
+            gap: 4px;
+            .section {
+              &:first-child,
+              &.active {
+                font-weight: 600;
+              }
+            }
+            .btn {
+              svg {
+                margin-left: 4px;
+                color: ${themeVars.color.text.light.num1};
+              }
+            }
+          }
         }
         .non-diff-file-content {
           // 避免分支菜单遮挡
           position: relative;
           z-index: 0;
           h4.file-header {
+            padding: 8px 12px !important;
             position: sticky;
-            top: 46px;
+            // 重叠边框线, 避免过粗
+            top: 45px;
             z-index: 1;
+            .file-header-left {
+              color: ${themeVars.color.text.light.num1};
+              font-size: 12px;
+            }
+            .file-header-right {
+              // 按钮组
+              > .ui.buttons {
+                margin: 0 8px 0 0 !important; // 完全不知道为什么浏览器最终效果没生效, 只能 !important 了
+                .ui.mini.button {
+                  min-height: 28px;
+                  height: 28px;
+                  font-size: 12px;
+                  padding: 0 8px;
+                }
+              }
+              // 右侧操作按钮
+              > .btn-octicon {
+                display: flex;
+                align-items: center;
+                background: ${themeVars.color.button};
+                border: 1px solid ${themeVars.color.light.border};
+                height: 28px;
+                padding: 0 8px;
+                svg {
+                  color: ${themeVars.color.text.light.num1};
+                }
+                &:first-of-type {
+                  border-top-left-radius: ${otherThemeVars.border.radius};
+                  border-bottom-left-radius: ${otherThemeVars.border.radius};
+                }
+                &:last-of-type {
+                  border-top-right-radius: ${otherThemeVars.border.radius};
+                  border-bottom-right-radius: ${otherThemeVars.border.radius};
+                }
+                &:hover {
+                  background: ${themeVars.color.hover.self};
+                  color: ${themeVars.color.text.light.num1};
+                }
+              }
+            }
           }
         }
         // 头部提交信息
         .ui.segment#repo-file-commit-box {
           padding: 8px 12px;
-          margin-bottom: 8px !important;
+          margin-bottom: 16px !important;
+          min-height: 46px;
           > .latest-commit {
             gap: 8px;
+            .commit-summary {
+              color: ${themeVars.color.text.light.num1};
+            }
           }
           // 右侧提交时间
           > .age {
@@ -242,7 +362,8 @@ export const repoFileViewMobile = css`
 // 仓库代码布局调整, 侧边栏宽度调整
 export const repoGrid = css`
   .repo-grid-filelist-sidebar {
-    grid-template-columns: auto 296px;
+    grid-template-columns: auto 312px;
+    gap: 24px;
   }
 
   @media (max-width: 767.98px) {
@@ -261,11 +382,15 @@ export const repoSidebarTop = css`
       }
       .flex-item {
         padding: 10px 0 0 0;
+        // 仓库描述本身
         .flex-item-title {
-          margin-top: 2px;
+          margin-top: 12px;
         }
+        // 仓库描述内容
         .flex-item-body {
-          padding: 8px 0 0 0;
+          > .tw-flex:first-child {
+            margin-top: 21px !important;
+          }
           .repo-description {
             color: ${themeVars.color.text.self};
           }

styles/components/footer.ts

@@ -0,0 +1,43 @@
+import { css, themeVars } from "src/types/vars";
+
+export const footer = css`
+  .page-footer {
+    background-color: ${themeVars.color.body};
+    border-top: 0;
+    color: ${themeVars.color.text.light.num1};
+    font-size: 12px;
+    gap: 32px;
+    justify-content: center;
+    padding: 16px 0 40px 0;
+    > .left-links {
+      gap: 4px;
+      > a {
+        color: ${themeVars.color.text.light.num1};
+        &:hover {
+          color: ${themeVars.color.primary.self};
+        }
+      }
+      > strong {
+        font-weight: 400;
+      }
+    }
+    > .right-links {
+      gap: 16px;
+      > .ui.dropdown {
+        font-size: 12px;
+        &:hover {
+          color: ${themeVars.color.primary.self};
+        }
+      }
+      > a {
+        border-left: 0;
+        color: ${themeVars.color.text.light.num1};
+        padding-left: 0;
+        margin-left: 0;
+        &:hover {
+          color: ${themeVars.color.primary.self};
+        }
+      }
+    }
+  }
+`;

styles/components/heatmap.ts

@@ -1,7 +1,11 @@
-import { css, otherThemeVars, themeVars } from "src/types/vars";
+import { css, themeVars } from "src/types/vars";
 
 export const heatmap = css`
   #user-heatmap {
+    + .divider:not(.divider-text) {
+      border-color: #0000;
+      margin: 8px 0px;
+    }
     .total-contributions {
       left: 25px + 20px;
       bottom: 0 + 12px;
@@ -12,8 +16,8 @@ export const heatmap = css`
     }
     .vch__container {
       padding: 12px 20px;
-      border: 1px solid ${themeVars.color.secondary.self};
+      box-shadow: ${themeVars.github.shadow.floating.small};
-      border-radius: ${otherThemeVars.border.radius};
+      border-radius: 12px;
       // 覆盖热力图和图例的背景色
       .vch__day__square,
       .vch__legend__wrapper rect {
@@ -65,16 +69,19 @@ export const heatmap = css`
 
 // 动态
 export const activity = css`
-  #activity-feed {
+  .flex-list#activity-feed {
-    .flex-item {
+    border-radius: 12px;
+    box-shadow: ${themeVars.github.shadow.floating.small};
+    > .flex-item {
       gap: 12px;
-      padding: 16px 0;
+      padding: 12px 8px 16px 14px;
-      &:first-child {
-        padding-top: 6px;
-      }
       > .flex-item-main {
         gap: 8px !important;
-
+        > div:not([class]) {
+          display: flex;
+          gap: 8px;
+          flex-wrap: wrap;
+        }
         relative-time {
           color: ${themeVars.color.text.light.num1};
         }
@@ -85,5 +92,9 @@ export const activity = css`
         width: 20px;
       }
     }
+    > .page.buttons {
+      border-top: 1px solid ${themeVars.color.secondary.self};
+      padding: 12px 0px;
+    }
   }
 `;

styles/components/index.ts

@@ -1,18 +1,23 @@
 import "./actions";
+import "./chroma";
 import "./clone";
 import "./commit";
 import "./dashboard";
 import "./diff";
+import "./editor";
 import "./explore";
 import "./filelist";
+import "./footer";
 import "./heatmap";
 import "./issue";
+import "./milestones";
+import "./navbar";
 import "./newrepo";
+import "./notification";
 import "./org";
+import "./packages";
 import "./release";
 import "./repo";
 import "./setting";
 import "./signin";
 import "./user";
-import "./chroma";
-import "./editor"

styles/components/issue.ts

@@ -3,6 +3,9 @@ import { activeItemAfterStyle } from "styles/public/menu";
 
 // 工单&PR 列表
 export const issueList = css`
+  // 仓库页面的里程碑列表菜单栏
+  .page-content.repository.milestones,
+  .page-content.repository.milestone-issue-list,
   .page-content.repository.issue-list {
     // 头部筛选菜单栏
     .issue-list-toolbar {
@@ -15,6 +18,7 @@ export const issueList = css`
       border-top-right-radius: ${otherThemeVars.border.radius};
       height: 48px;
       padding: 8px;
+      margin-top: 16px;
       .issue-list-toolbar-left {
         // 复选框
         input {
@@ -53,7 +57,15 @@ export const issueList = css`
         }
       }
     }
-    // Issue 列表
+  }
+  // 里程碑详细页面的 Issue 列表
+  .page-content.repository.milestone-issue-list,
+  // 顶部仪表板的 Issue 列表
+  .page-content.dashboard.issues,
+  // 用户订阅的 Issue 列表
+  .page-content.user.notification,
+  // 仓库 Issue 列表
+  .page-content.repository.issue-list {
     .flex-list#issue-list {
       border: 1px solid ${themeVars.color.light.border};
       border-bottom-left-radius: ${otherThemeVars.border.radius};
@@ -71,12 +83,11 @@ export const issueList = css`
         > .flex-item-icon {
           display: flex;
           gap: 4px;
-          margin-left: 8px;
+          margin-left: 16px;
           // 复选框
           input {
             background: unset;
             margin-top: 14px;
-            margin-left: 8px;
             margin-right: 8px !important;
           }
           svg {
@@ -99,13 +110,72 @@ export const issueList = css`
       }
     }
   }
+  // 里程碑列表
+  // [TODO] 暂时排除项目的列表
+  .page-content.repository.milestones:not(.projects) .milestone-list {
+    border: 1px solid ${themeVars.color.light.border};
+    border-bottom-left-radius: ${otherThemeVars.border.radius};
+    border-bottom-right-radius: ${otherThemeVars.border.radius};
+    .milestone-card {
+      padding: 8px 16px 10px 16px;
+      .milestone-header {
+        h3 {
+          font-size: 16px;
+          font-weight: 500;
+        }
+        div span {
+          font-size: 14px;
+          font-weight: 600;
+        }
+      }
+    }
+    .milestone-toolbar {
+      font-size: 12px;
+      .group > a {
+        font-size: 13px;
+      }
+    }
+  }
 `;
 
 // 避免手机/平板下菜单错位
 export const issueListMobile = css`
   @media (max-width: 1023.98px) {
-    .page-content.repository.issue-list .issue-list-toolbar {
+    .page-content.repository.milestones,
-      height: auto;
+    .page-content.repository.milestone-issue-list,
+    .page-content.repository.issue-list {
+      .issue-list-toolbar {
+        height: auto;
+      }
+    }
+  }
+`;
+
+// 置顶 Issue
+export const issuePins = css`
+  #issue-pins {
+    gap: 12px;
+    margin-bottom: 16px;
+    .issue-card {
+      padding: 16px 12px;
+      .content {
+        .issue-card-title {
+          font-size: 16px;
+          font-weight: 600;
+        }
+        svg {
+          color: ${themeVars.color.text.light.num1};
+          height: 100%;
+          margin-right: 3px;
+        }
+        .meta {
+          font-size: 12px;
+          padding-top: 4px;
+        }
+      }
+      .issue-card-bottom {
+        display: none;
+      }
     }
   }
 `;
@@ -293,6 +363,16 @@ export const comment = css`
   }
 `;
 
+// 评论书写框
+export const commentForm = css`
+  .repository .comment.form .content .segment {
+    &::before,
+    &::after {
+      display: none;
+    }
+  }
+`;
+
 export const dropdown = css`
   .repository {
     // Issue/PR 列表下的所有筛选菜单
@@ -312,7 +392,7 @@ export const prMerge = css`
   .repository.view.issue .comment-list .timeline-item.pull-merge-box {
     // 头像
     .timeline-avatar {
-      color: ${themeVars.color.text.self} !important;
+      color: ${themeVars.color.white} !important;
       border-radius: ${otherThemeVars.border.radius};
       width: 40px;
       height: 40px;
@@ -392,6 +472,12 @@ export const prMerge = css`
       padding: 16px;
       display: grid;
       gap: 8px;
+      &.no-header {
+        &::before,
+        &::after {
+          display: none;
+        }
+      }
     }
   }
 `;
@@ -400,6 +486,11 @@ export const prMerge = css`
 export const timeline = css`
   .repository.view.issue {
     .comment-list {
+      // 时间线本线
+      .timeline::before {
+        // 不遮挡归档信息框, 归档信息框背景色有透明度时会漏出线
+        height: calc(100% - 62px);
+      }
       .timeline-item,
       .timeline-item-group {
         padding: 16px 0;
@@ -452,37 +543,106 @@ const sidebarPadding = {
 
 // 侧边栏
 export const issueSidebar = css`
-  .issue-content {
+  // 工单&创建工单&PR页面侧边栏
-    gap: 24px;
+  .page-content.repository.issue {
-    .issue-content-right {
+    .issue-content {
-      border: 0;
+      gap: 24px;
-      font-size: 12px;
+      // 侧边栏
-      padding: 0;
+      .issue-content-right {
-      .ui.button {
+        border: 0;
         font-size: 12px;
-      }
+        padding: 0;
-      .ui.form,
+        .ui.button {
-      a.fixed-text.muted,
+          font-size: 12px;
-      span.text,
+        }
-      // 列表项为空时的文字
+        .ui.form,
-      span.item.empty-list,
+        a.fixed-text.muted,
-      p {
+        span.text,
-        color: ${themeVars.color.text.light.num1};
+        // 列表项为空时的文字
-        font-size: 12px;
+        span.item.empty-list,
-      }
+        p {
-      .ui.dropdown.select-branch,
+          color: ${themeVars.color.text.light.num1};
-      .ui.form,
+          font-size: 12px;
-      a.fixed-text.muted,
+        }
-      span.text,
+        .ui.dropdown.select-branch,
-      .ui.watching > div,
+        .ui.form,
-      .ui.depending > div,
+        a.fixed-text.muted,
-      .flex-text-block,
+        span.text,
-      .ui.list,
+        .ui.watching > div,
-      p {
+        .ui.depending > div,
-        ${sidebarPadding};
+        .flex-text-block,
-      }
+        .ui.list,
-      .issue-sidebar-combo {
+        .toggle-wip,
-        .ui.dropdown > a.fixed-text.muted {
+        p {
+          ${sidebarPadding};
+        }
+        // 允许维护者编辑
+        > .ui.checkbox {
+          margin: 4px 8px;
+          strong {
+            font-weight: 400;
+          }
+        }
+        .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;
+          }
+          // 标签菜单项
+          .ui.dropdown > .menu > .scrolling.menu > .item:has(.item-secondary-info) {
+            // 修复标签菜单中描述文本过长没有换行挤掉标签的问题
+            display: grid !important;
+            grid-template-columns: auto auto 1fr;
+            row-gap: 0px; // 去除行间距, 仅当有描述信息时才有间距(.tw-pl-\\\[20px\\\])
+            // 如果是归档标签则隐藏
+            &.tw-hidden {
+              display: none !important;
+            }
+            // 默认隐藏多余信息避免标签对齐问题
+            .item-secondary-info {
+              display: none;
+              grid-column: 2 / -1; // 从第2列对齐
+              color: ${themeVars.color.text.light.num1};
+              > .tw-pl-\\\[20px\\\] {
+                // 已经与第二列对齐, 不需要额外的 padding
+                padding-left: 0px !important;
+                padding-top: 4px;
+                // 显示全部描述信息与 Github 保持一致
+                white-space: normal;
+                small {
+                  font-size: 12px;
+                }
+              }
+              > .archived-label-hint {
+                // 与父元素 item 的 padding 对齐 (dropdown.ts .ui.dropdown .menu > .item)
+                top: 6px;
+                right: 8px;
+              }
+              // 如果有描述信息则显示
+              &:has(.tw-pl-\\\[20px\\\]) {
+                display: block;
+                > .archived-label-hint {
+                  top: 4px; // 有描述信息的归档标签与标签对齐需要更高点
+                }
+              }
+              // 如果有归档标签则显示
+              &:has(.archived-label-hint > .ui.label) {
+                display: block;
+              }
+            }
+          }
+        }
+        // 时间追踪
+        > div:not([class]):not([id]) > .ui.dropdown.jump > a.fixed-text.muted {
           align-items: center;
           border-radius: ${otherThemeVars.border.radius};
           text-decoration-line: none;
@@ -491,62 +651,49 @@ export const issueSidebar = css`
             background: ${themeVars.github.control.transparent.bgColor.hover};
           }
         }
-        .ui.list {
+        // 选中日期颜色
-          margin-top: 0 !important;
+        .ui.form .due-date {
-          margin-bottom: 0 !important;
+          color: ${themeVars.color.text.self};
         }
-      }
+        // 分割线
-      // 时间追踪
+        > .divider {
-      > div:not([class]):not([id]) > .ui.dropdown.jump > a.fixed-text.muted {
+          margin: 12px 0 12px 8px;
-        align-items: center;
+          width: calc(100% - 16px);
-        border-radius: ${otherThemeVars.border.radius};
-        text-decoration-line: none;
-        height: 28px;
-        &:hover {
-          background: ${themeVars.github.control.transparent.bgColor.hover};
         }
-      }
+        // 订阅按钮
-      // 选中日期颜色
+        .ui.watching .ui.button {
-      .ui.form .due-date {
+          padding: 0px 8px;
-        color: ${themeVars.color.text.self};
+          height: 28px;
-      }
-      .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 {
+            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/milestones.ts

@@ -0,0 +1,59 @@
+import { css, themeVars } from "src/types/vars";
+
+export const milestone = css`
+  // 里程碑头部
+  .milestone-header {
+    gap: 16px;
+    // 进度条
+    progress {
+      height: 5px;
+      width: 300px;
+      max-width: 80vw;
+    }
+  }
+  // 里程碑 Issue 列表的进度条
+  .milestone-progress-big {
+    height: 8px;
+  }
+  // 里程碑 Issue 列表
+  .page-content.repository.milestone-issue-list {
+    > .ui.container {
+      > .flex-text-block:first-child {
+        margin-bottom: 16px;
+        > h1 {
+          font-size: 32px;
+          font-weight: 600;
+          line-height: 48px;
+          word-break: keep-all;
+        }
+        + .tw-flex {
+          flex-direction: row !important;
+          align-items: center;
+          gap: 8px !important;
+          padding-top: 8px;
+          padding-bottom: 10px;
+          font-size: 14px;
+          color: ${themeVars.color.text.light.num1};
+          strong {
+            color: ${themeVars.color.text.self};
+          }
+          > .flex-text-block {
+            gap: 8px !important;
+          }
+        }
+      }
+      > .divider {
+        border-top-color: #0000;
+      }
+    }
+  }
+`;
+
+// 避免手机/平板下菜单错位
+export const milestoneMobile = css`
+  @media (max-width: 767.98px) {
+    .page-content.repository.milestone-issue-list > .ui.container > .flex-text-block:first-child + .tw-flex {
+      flex-direction: column !important;
+    }
+  }
+`;

styles/components/navbar.ts

@@ -1,7 +1,32 @@
-import { css, otherThemeVars, themeVars } from "src/types/vars";
+import { fallbackVar } from "src/functions";
+import { css, customThemeVars, otherThemeVars, themeVars } from "src/types/vars";
 
 export const navbarRight = css`
   #navbar {
+    border-bottom: 0;
+    padding: 0px 16px;
+    min-height: 64px;
+    .navbar-left {
+      gap: 8px;
+      > .item {
+        padding: 4px 8px;
+        min-height: 20px;
+        &.active {
+          font-weight: 600;
+        }
+        &#navbar-logo {
+          // 与下方的用户切换头像对齐
+          padding-left: 6px;
+          &:hover {
+            background: unset;
+          }
+          img {
+            height: 32px;
+            width: 32px;
+          }
+        }
+      }
+    }
     // 进入用户页面后, 避免注册, 登录和首页等意外覆盖
     .navbar-right:has(.user-menu) {
       gap: 8px;
@@ -35,7 +60,7 @@ export const navbarRight = css`
             grid-auto-flow: column;
             align-items: center;
             > svg {
-              margin-right: 8px;
+              margin-right: 4px;
             }
             // 三角号纠正高度保持居中
             .not-mobile {
@@ -69,12 +94,13 @@ export const navbarRight = css`
         .navbar-profile-admin {
           background-color: ${themeVars.github.bgColor.accent.emphasis};
           border-radius: 25px;
+          border: 2px solid ${themeVars.color.nav.bg};
           color: ${themeVars.color.white};
-          font-size: 8px;
+          font-size: 9px;
           font-weight: 600;
           padding: 2px 5px;
-          top: -3px;
+          top: -7px;
-          left: 22px;
+          left: 21px;
         }
       }
       // 通知和计时器的圆点
@@ -84,13 +110,31 @@ export const navbarRight = css`
           background-color: ${themeVars.github.bgColor.accent.emphasis};
           border-radius: 25px;
           color: ${themeVars.color.white};
-          font-size: 8px;
+          font-size: 9px;
           font-weight: 600;
-          top: -14px;
+          top: -15px;
-          left: 12px;
+          left: 11px;
         }
       }
     }
+    // 用户菜单
+    .navbar-right .user-menu {
+      width: ${fallbackVar(customThemeVars.userMenuWidth, "192px")};
+      max-width: 320px;
+      > .header {
+        font-size: 14px;
+        font-weight: 400;
+        margin: 0;
+        padding: 16px 16px 8px 16px;
+        strong {
+          font-weight: 600;
+        }
+      }
+      > .divider {
+        margin: 8px;
+        width: calc(100% - 16px);
+      }
+    }
   }
   // 手机下的创建菜单按钮
   @media (max-width: 767.98px) {
@@ -102,3 +146,31 @@ export const navbarRight = css`
     }
   }
 `;
+
+// 二级导航栏
+export const secondaryNav = css`
+  .page-content > :first-child.secondary-nav {
+    margin-bottom: 16px;
+    // 仪表板界面的二级导航栏用户菜单
+    > .ui.secondary.stackable.menu {
+      gap: 0px;
+      min-height: 48px;
+      > .item {
+        // 修复手机下的菜单按钮没有居中的问题
+        margin-top: auto;
+        margin-bottom: auto;
+        > .ui.dropdown > .text {
+          display: inline-flex;
+          align-items: center;
+          gap: 4px;
+          svg {
+            margin-right: 4px;
+          }
+        }
+      }
+      > .right.menu {
+        gap: 4px;
+      }
+    }
+  }
+`;

styles/components/notification.ts

@@ -0,0 +1,182 @@
+import { css, otherThemeVars, themeVars } from "src/types/vars";
+
+// 用户订阅/关注页面
+export const notification = css`
+  .page-content.user.notification {
+    > .ui.container {
+      > .ui.attached.segment {
+        border: 0;
+        padding: 0;
+        > .divider {
+          display: none;
+        }
+        // 订阅列表
+        &:has(#issue-list) {
+          > .tw-flex {
+            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: 52px;
+            padding: 8px;
+            // 左侧菜单
+            > .tw-flex:first-child > .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;
+                }
+              }
+            }
+            // 右侧菜单
+            > .tw-flex:last-child > .ui.menu {
+              align-items: center;
+              > .item {
+                color: ${themeVars.color.text.light.num1};
+              }
+              > .ui.button {
+                padding: 0 12px;
+                height: 32px;
+              }
+            }
+          }
+        }
+        // 关注列表
+        > .flex-list:not([id]) {
+          border: 1px solid ${themeVars.color.light.border};
+          border-radius: ${otherThemeVars.border.radius};
+          > .flex-item {
+            padding: 16px;
+            > .flex-item-main {
+              gap: 4px;
+              > .flex-item-header {
+                > .flex-item-title {
+                  gap: 12px;
+                }
+                > .flex-item-trailing {
+                  color: ${themeVars.color.text.light.num1};
+                  font-size: 12px;
+                  font-weight: 400;
+                  gap: 16px;
+                  .color-icon {
+                    width: 12px;
+                    height: 12px;
+                    margin-right: 0 !important;
+                  }
+                }
+              }
+              > .flex-item-body:last-child {
+                font-size: 12px;
+              }
+            }
+          }
+        }
+      }
+      // 通知列表
+      &:has(#notification_table) {
+        > .tw-flex:first-child {
+          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: 52px;
+          padding: 8px;
+          margin-bottom: 0 !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;
+              }
+              .notifications-unread-count {
+                margin-left: 4px;
+              }
+            }
+          }
+        }
+        // 通知全部确认按钮
+        .ui.ui.ui.ui.mini.button {
+          height: 32px;
+        }
+      }
+      // 通知列表
+      #notification_table {
+        border-top-left-radius: 0;
+        border-top-right-radius: 0;
+        color: ${themeVars.color.text.light.num1};
+        > .notifications-item {
+          border-top: 1px solid ${themeVars.color.light.border};
+          padding: 8px !important;
+          &:first-child {
+            border-top: 0;
+          }
+          &:last-child {
+            border-bottom-left-radius: ${otherThemeVars.border.radius};
+            border-bottom-right-radius: ${otherThemeVars.border.radius};
+            &:hover {
+              border-bottom-left-radius: 0;
+            }
+          }
+          &:hover {
+            background: ${themeVars.github.bgColor.accent.muted};
+            box-shadow: 2px 0 0 ${themeVars.github.borderColor.accent.emphasis} inset;
+            color: ${themeVars.color.text.self};
+          }
+          > .notifications-link {
+            > .notifications-top-row {
+              font-size: 12px !important;
+            }
+            > .notifications-bottom-row {
+              font-size: 14px !important;
+            }
+          }
+          > .notifications-updated {
+            font-size: 12px;
+          }
+          > .notifications-buttons {
+            .interact-bg {
+              background: ${themeVars.github.bgColor.accent.muted} !important;
+              color: ${themeVars.color.text.light.num1};
+              padding: 8px !important;
+              &:hover {
+                background: ${themeVars.github.control.transparent.bgColor.hover} !important;
+                color: ${themeVars.color.text.self};
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;

styles/components/packages.ts

@@ -0,0 +1,124 @@
+import { css, otherThemeVars, themeVars } from "src/types/vars";
+
+// 组织/仓库的软件包列表(包含用户但未测试)
+export const packagesList = css`
+  .page-content.packages {
+    // 这里必须要用 >, 否则会影响到软件包详细信息页的样式
+    > .ui.container > div:not([class]) {
+      border: 1px solid ${themeVars.color.light.border};
+      border-radius: ${otherThemeVars.border.radius};
+      margin-top: 16px;
+      .flex-list {
+        border-top: 1px solid ${themeVars.color.light.border};
+        &:first-child {
+          border-top: 0;
+        }
+        .flex-item {
+          padding: 16px;
+          .flex-item-main {
+            .flex-item-title {
+              gap: 8px;
+              > a {
+                min-height: 25px;
+              }
+              // 软件包类型的标签
+              .ui.label {
+                gap: 4px;
+                padding: 3px 6px;
+                min-height: 24.5px;
+                background-color: unset;
+                border: 1px solid ${themeVars.color.light.border};
+                color: ${themeVars.color.primary.self};
+              }
+            }
+            .flex-item-body {
+              font-size: 12px;
+              a {
+                text-decoration: underline;
+                text-underline-offset: 3px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+// 软件包详细信息页
+export const packagesDetail = css`
+  .page-content.packages {
+    .issue-title-header > div {
+      color: ${themeVars.color.text.light.num1};
+    }
+    .issue-content {
+      .issue-content-left {
+        .ui.top.attached.header {
+          font-size: 14px;
+          padding: 16px;
+        }
+        .ui.attached.segment {
+          color: ${themeVars.color.text.light.num1};
+          padding: 16px;
+          .ui.table,
+          .ui.form .field > label {
+            color: ${themeVars.color.text.light.num1};
+          }
+          .ui.form .field > label {
+            margin-bottom: 8px;
+          }
+          .markup {
+            color: ${themeVars.color.text.self};
+            pre {
+              font-size: 12px;
+              font-weight: 400;
+              padding: 12px 16px;
+            }
+          }
+          + .ui.top.attached.header {
+            margin-top: 24px;
+          }
+        }
+      }
+      .issue-content-right {
+        border: 0;
+        padding: 0px 16px;
+        > strong {
+          font-size: 16px;
+        }
+        > .divider {
+          margin: 16px 0px;
+        }
+        // 详情
+        > .ui.relaxed.list {
+          margin: 16px 0px;
+          .item {
+            color: ${themeVars.color.text.light.num1};
+            svg {
+              color: ${themeVars.color.text.self};
+            }
+            // 应该只选中版本中的 a 标签
+            &.tw-flex {
+              justify-content: space-between;
+              > a {
+                border: 1px solid ${themeVars.color.light.border};
+                border-radius: 25px;
+                font-size: 12px;
+                padding: 0px 6px;
+                min-height: 20px;
+                flex: none !important;
+                &:hover {
+                  text-decoration: none;
+                }
+              }
+              // 不知道什么东西
+              &::after {
+                display: none;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;

styles/components/release.ts

@@ -19,6 +19,27 @@ export const releaseTagMenu = css`
   }
 `;
 
+// 顶部右侧按钮组
+export const rightButton = css`
+  .page-content.repository {
+    &.releases,
+    &.tags {
+      .ui.small.button {
+        background-color: ${themeVars.color.button};
+        border-color: ${themeVars.color.light.border};
+        box-shadow: none;
+        color: ${themeVars.color.text.light.self};
+        padding: 5px 16px;
+        min-height: auto;
+        line-height: 20px;
+        &:hover {
+          background-color: ${themeVars.color.hover.self};
+        }
+      }
+    }
+  }
+`;
+
 // 标签页样式
 export const tags = css`
   .page-content.repository.tags {
@@ -41,76 +62,114 @@ export const tags = css`
 // 发布页样式
 export const releases = css`
   .page-content.repository.releases {
-    #release-list .release-entry {
+    > .ui.container > .divider {
-      // 左侧发布元信息
+      margin: 16px 0;
-      .meta {
+    }
-        gap: 0.5rem;
+    ul#release-list {
-        padding-top: 24px;
+      gap: 32px;
-        padding-right: 40px;
+      margin: 32px 0 16px 0;
-        text-align: left;
+      .release-entry {
-        min-width: 0;
+        // 左侧发布元信息
-        flex: 0.125;
+        .meta {
-        a.muted {
+          gap: 0.5rem;
-          color: ${themeVars.color.text.light.num1};
+          padding-top: 24px;
-          overflow: hidden;
+          padding-right: 40px;
-          text-overflow: ellipsis;
+          text-align: left;
-          white-space: nowrap;
+          min-width: 0;
-          word-break: break-all;
+          flex: 0.125;
-          svg {
+          a.muted {
-            margin-right: 8px !important;
+            color: ${themeVars.color.text.light.num1};
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            word-break: break-all;
+            svg {
+              margin-right: 8px !important;
+            }
+            svg.tw-mr-1.svg.octicon-tag {
+              margin-top: 1px;
+            }
           }
-          svg.tw-mr-1.svg.octicon-tag {
+          // 分支选择按钮
-            margin-top: 1px;
+          .ui.button.branch-dropdown-button {
+            min-height: 20px;
+            line-height: 20px;
+            padding: 3px 12px;
+            font-size: 12px;
           }
         }
-        // 分支选择按钮
+        // 右侧发布详细信息
-        .ui.button.branch-dropdown-button {
+        .segment.detail {
-          min-height: 20px;
+          padding: 16px;
-          line-height: 20px;
+          .svg {
-          padding: 3px 12px;
+            color: ${themeVars.color.text.light.num1};
-          font-size: 12px;
-        }
-      }
-      // 右侧发布详细信息
-      .segment.detail {
-        .svg {
-          color: ${themeVars.color.text.light.num1};
-        }
-        p.text.grey {
-          margin: 16px 0;
-          .time {
-            color: ${themeVars.color.text.self};
           }
-        }
+          // 标题
-        .markup {
+          .release-list-title {
-          > *:first-child {
+            font-size: 32px;
-            margin-top: 16px !important;
+            gap: 16px;
           }
-          > *:last-child {
+          // 提交信息
-            margin-bottom: 16px !important;
+          p.text.grey {
+            display: flex;
+            gap: 6px;
+            flex-wrap: wrap;
+            margin: 24px 0 0 0;
+            span {
+              word-break: break-word;
+            }
+            .time {
+              color: ${themeVars.color.text.self};
+            }
+          }
+          // 发布内容
+          .markup {
+            > *:first-child {
+              margin-top: 24px !important;
+            }
+          }
+          // 分割线
+          .divider {
+            position: relative;
+            left: -16px;
+            width: calc(100% + 32px);
+            border-top-width: 1.5px;
+            margin: 24px 0 16px 0;
+          }
+          // 下载列表
+          .download {
+            summary {
+              font-size: 18px;
+              font-weight: 600;
+              margin-top: 16px;
+              &::marker {
+                font-size: 14px;
+              }
+            }
+            .attachment-list {
+              margin-top: 16px;
+              .item {
+                align-items: center;
+                line-height: 17px;
+                padding: 8px 16px;
+                .flex-text-inline {
+                  gap: 8px;
+                }
+                // 只选中左侧文件名称
+                strong.flex-text-inline:hover {
+                  text-decoration: underline !important;
+                }
+                .attachment-right-info {
+                  color: ${themeVars.color.text.light.num1};
+                  .svg {
+                    height: 28px;
+                  }
+                }
+              }
+            }
           }
         }
       }
     }
   }
 `;
-
-// 顶部右侧按钮组
-export const rightButton = css`
-  .page-content.repository {
-    &.releases,
-    &.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;
-        &:hover {
-          background-color: ${themeVars.color.hover.self};
-        }
-      }
-    }
-  }
-`;

styles/components/repo.ts

@@ -7,14 +7,7 @@ export const repoHeader = css`
     .ui.compact.button {
       padding: 3px 12px;
     }
-    // 仓库图标
+    // 仓库名称
-    img.ui.avatar {
-      height: 32px;
-      width: 32px;
-      margin-block-start: 0.5rem;
-      margin-block-end: 0.5rem;
-    }
-
     .flex-item {
       .flex-item-title {
         // 间隔线颜色

styles/components/setting.ts

@@ -25,7 +25,7 @@ export const button = css`
       color: ${themeVars.color.text.light.self};
       background-color: ${themeVars.color.button};
       border-color: ${themeVars.color.light.border};
-
+      box-shadow: none;
       &:hover {
         background-color: ${themeVars.color.hover.self};
       }
@@ -57,12 +57,19 @@ export const button = css`
     }
   }
   // 管理员设置界面下的自定义主色调按钮
-  .admin-setting-content .ui.primary.button {
+  .admin-setting-content {
-    ${tinyStyle}
+    .ui.primary.button {
-    padding: 5px 16px;
+      ${tinyStyle}
-    line-height: 22px;
+      padding: 5px 16px;
-    &:hover {
+      line-height: 22px;
-      ${tinyHoverStyle}
+      &:hover {
+        ${tinyHoverStyle}
+      }
+    }
+    .ui.red.button {
+      box-shadow: ${themeVars.github.shadow.resting.small};
+      padding: 5px 16px;
+      line-height: 22px;
     }
   }
 `;

styles/components/signin.ts

@@ -3,11 +3,14 @@ import { css } from "src/types/vars";
 // 注册/登录界面
 export const signIn = css`
   .page-content.user.signin {
-    .ui.grid > .column {
+    .ui.grid {
-      width: 384px;
+      justify-content: center;
-      padding: 16px;
+      > .column {
-      > .ui.container {
+        width: 384px;
-        max-width: unset;
+        padding: 16px;
+        > .ui.container {
+          max-width: unset;
+        }
       }
     }
     .ui.top.attached.header {
@@ -15,6 +18,7 @@ export const signIn = css`
       font-size: 20px;
       font-weight: 600;
       background-color: unset !important;
+      text-align: center;
       padding: 16px;
     }
 
@@ -36,6 +40,15 @@ export const signIn = css`
       .button {
         height: 40px;
       }
+      .divider.divider-text {
+        margin: 20px 0px;
+      }
+      #oauth2-login-navigator-inner {
+        gap: 8px;
+        .ui.button svg {
+          width: 18px;
+        }
+      }
     }
     .ui.top.attached.header.segment {
       font-size: 14px;

styles/public/animation.ts

@@ -0,0 +1,27 @@
+import { overlayAppearDown, overlayAppearUp } from "src/core/theme";
+import { css } from "src/types/vars";
+
+export const keyframe = css`
+  // 向下出现动画
+  @keyframes ${overlayAppearDown} {
+    0% {
+      opacity: 0;
+      transform: translateY(-8px);
+    }
+    100% {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  }
+  // 向上出现动画
+  @keyframes ${overlayAppearUp} {
+    0% {
+      opacity: 0;
+      transform: translateY(8px);
+    }
+    100% {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  }
+`;

styles/public/attached.ts

@@ -1,4 +1,4 @@
-import { css, themeVars, otherThemeVars } from "src/types/vars";
+import { css, otherThemeVars, themeVars } from "src/types/vars";
 
 export const attached = css`
   // 设置右面板的内容

styles/public/button.ts

@@ -4,6 +4,7 @@ export const primaryStyle = {
   color: themeVars.github.button.primary.fgColor.rest,
   backgroundColor: themeVars.github.button.primary.bgColor.rest,
   borderColor: themeVars.github.button.primary.borderColor.rest,
+  boxShadow: themeVars.github.shadow.resting.small,
 };
 
 export const primaryHoverStyle = {
@@ -27,7 +28,7 @@ export const baseButton = css`
   }
   // 主色调按钮保持白色
   .ui.primary.buttons .button svg {
-    color: ${themeVars.color.text.self};
+    color: ${themeVars.color.white};
   }
   .ui.primary {
     &.button,
@@ -38,6 +39,14 @@ export const baseButton = css`
         ${primaryHoverStyle}
       }
     }
+    // 按钮组整体有阴影
+    &.buttons {
+      box-shadow: ${themeVars.github.shadow.resting.small};
+      .button {
+        // 按钮组里的按钮无阴影
+        box-shadow: none;
+      }
+    }
   }
   // 主色调基本按钮和普通按钮一样
   // 作者的关注按钮
@@ -45,6 +54,7 @@ export const baseButton = css`
     background-color: ${themeVars.color.button};
     color: ${themeVars.color.text.self};
     border-color: ${themeVars.color.light.border};
+    box-shadow: none;
     &:hover {
       background-color: ${themeVars.color.hover.self};
       color: ${themeVars.color.text.self};
@@ -85,17 +95,32 @@ export const redButton = css`
       color: ${themeVars.github.button.danger.fgColor.hover};
       background-color: ${themeVars.github.button.danger.bgColor.hover};
       border-color: ${themeVars.github.button.danger.borderColor.hover};
+      box-shadow: ${themeVars.github.shadow.resting.small};
     }
   }
 `;
 
 // 修复按钮高度
 export const fixButtonHeight = css`
+  // 修复一些主色调或者其他小按钮的高度避免过高
   .ui.small.buttons .button,
   .ui.ui.ui.ui.small.button {
     min-height: 26px;
+    height: 32px;
   }
-  .ui.tiny.buttons .button,
+  // 修复仓库页仓库操作按钮高度对齐和修正
+  .repo-button-row .ui.button {
+    min-height: 32px;
+  }
+  // 修复因上面小按钮高度导致仓库星标克隆等按钮高度过高
+  .repo-header {
+    .ui.ui.ui.ui.small.compact.button,
+    .ui.labeled.button > .label {
+      height: 28px;
+      min-height: 28px;
+    }
+  }
+  .ui.ui.ui.ui.small.button.compact .ui.tiny.buttons .button,
   .ui.ui.ui.ui.tiny.button {
     min-height: 20px;
   }
@@ -106,4 +131,9 @@ export const fixButton = css`
   .ui.ui.ui.ui.small.button {
     z-index: 0;
   }
+  // 代码复制按钮
+  .ui.button.code-copy {
+    padding: 4px 6px;
+    min-height: 28px;
+  }
 `;

styles/public/dropdown.ts

@@ -1,5 +1,6 @@
 import { animationDown, animationUp } from "src/core/theme";
-import { css, otherThemeVars, themeVars } from "src/types/vars";
+import { fallbackVar } from "src/functions";
+import { css, customThemeVars, otherThemeVars, themeVars } from "src/types/vars";
 import { activeItemAfterStyle } from "styles/public/menu";
 
 export const dropdown = css`
@@ -16,19 +17,27 @@ export const dropdown = css`
       > .item:not(.tw-hidden) {
         display: flex !important;
         align-items: center;
-        gap: 0.5rem;
+        align-content: center;
-        padding: 8px 10px !important;
+        padding: 6px 8px !important;
+        min-height: 32px;
         border-radius: ${otherThemeVars.border.radius} !important;
+        gap: 4px;
         &:not(.emoji) {
-          margin: 0 0.5rem;
+          margin: 0 8px;
         }
         &:not(.emoji):first-of-type {
-          margin-top: 0.5rem;
+          margin-top: 8px;
+          // 工单详细页面的标签菜单中的清除选中标签按钮
+          &.clear-selection {
+            margin-top: 0px;
+          }
         }
         // 不知道为什么提交差异对比页面操作中的 cherrypick 按钮无法被选中
         &.cherry-pick-button,
+        // 下一个 item 是最后一个并且被隐藏时, 目前仅在顶部导航栏工单和 PR 仪表板的菜单中出现
+        &:has(+ .tw-hidden:last-of-type),
         &:not(.emoji):last-of-type {
-          margin-bottom: 0.5rem;
+          margin-bottom: 8px;
         }
         &:hover {
           background-color: ${themeVars.github.control.transparent.bgColor.hover} !important;
@@ -46,9 +55,35 @@ export const dropdown = css`
             ${activeItemAfterStyle};
           }
         }
+        svg {
+          margin-top: 2px;
+          margin-right: 4px;
+        }
+        // 复选框对齐
+        .ui.checkbox input[type="checkbox"] {
+          height: 100%;
+        }
+        // 修复 Wiki 页面下搜索框中搜索时, 显示隐藏的项目
+        &.filtered {
+          display: none !important;
+        }
+      }
+      // 当筛选后, 让菜单提供边距, 因为无法确定保留的是菜单中哪个 item
+      // 不是所有菜单都提供边距方式, 原因为比如会导致分支菜单中的查看所有分支上间隔缺失, 这种方式单独为 Wiki 菜单做处理
+      // 有筛选(.filtered)且有筛选结果(.selected)时提供菜单边距, 没结果时提供会导致多余的菜单边框线
+      &:has(> .item.filtered):has(> .item.selected) {
+        padding: 8px 0px;
+        > .item {
+          &:first-of-type {
+            margin-top: 0;
+          }
+          &:last-of-type {
+            margin-bottom: 0;
+          }
+        }
       }
       > .divider {
-        margin: 0.5rem 0;
+        margin: 8px 0;
       }
       &:after {
         display: none !important;
@@ -58,16 +93,32 @@ export const dropdown = css`
   // 向下弹出的下拉菜单向下偏移
   .ui.dropdown:not(.upward),
   .ui.menu .ui.dropdown:not(.upward) {
-    .menu {
+    > .menu {
-      margin-top: 0.35em !important;
+      margin-top: 4px !important;
     }
   }
   // 向上弹出的下拉菜单向上偏移
   .ui.dropdown.upward,
   .ui.menu .ui.dropdown.upward {
-    .menu {
+    > .menu {
       animation: ${animationUp};
-      margin-bottom: 0.35em !important;
+      margin-bottom: 4px !important;
+    }
+  }
+  // 修复 wiki 的页面下拉菜单圆角
+  .ui.floating.dropdown > .menu {
+    border-radius: 12px !important;
+  }
+  // 修复嵌套菜单的圆角问题, wiki 页面和组织页面的用户下拉菜单
+  .ui.dropdown .menu {
+    .scrolling.menu {
+      border-radius: 0 0 12px 12px !important;
+    }
+    // 修复仪表板切换用户按钮菜单下无创建组织按钮时的菜单圆角
+    &.context-user-switch {
+      .scrolling.menu:last-child {
+        border-radius: 0 0 12px 12px !important;
+      }
     }
   }
   // 修复下拉菜单元素溢出问题
@@ -75,7 +126,7 @@ export const dropdown = css`
   .user-menu>.item,
   // Issue/PR 菜单
   .ui.menu .ui.dropdown.item .menu .item {
-    width: auto;
+    width: calc(100% - 16px); // 减去上方 item 的 margin 左右边距
   }
   // 去掉下拉菜单的边框线
   // 设置里的下拉菜单
@@ -175,6 +226,19 @@ export const selectionDropdown = css`
     border-top-left-radius: ${otherThemeVars.border.radius} !important;
     border-top-right-radius: ${otherThemeVars.border.radius} !important;
   }
+  // 工单标签菜单中的标签换行和颜色
+  // 标签页面的标签选择框
+  .page-content.repository.labels .ui.selection.dropdown.active,
+  // 创建仓库页面的标签选择框
+  .ui.search.selection.dropdown {
+    > .menu > .item {
+      flex-direction: column;
+      align-items: flex-start;
+      > i {
+        color: ${themeVars.color.text.light.num1};
+      }
+    }
+  }
 `;
 
 export const fixSelectionDropdown = css`
@@ -187,8 +251,38 @@ export const fixSelectionDropdown = css`
 
 // 分支菜单
 export const branchDropdown = css`
-  .ui.dropdown.branch-selector-dropdown .menu > .item {
+  .ui.dropdown.branch-selector-dropdown > .menu {
-    animation: ${animationDown};
+    width: ${fallbackVar(customThemeVars.branchMenuWidth, "320px")};
+    max-width: 640px;
+    > .menu > .item {
+      animation: ${animationDown};
+      height: 32px;
+    }
+    // 分支/标签切换
+    > .branch-tag-tab {
+      > .branch-tag-item {
+        font-weight: 500;
+        padding: 8px 12px;
+        height: 32px;
+        line-height: 1.15;
+        svg {
+          display: none;
+        }
+        &.active {
+          background: ${themeVars.color.body};
+        }
+        &:hover {
+          color: inherit;
+          &:not(.active) {
+            background: ${themeVars.color.hover.self};
+            border: 1px solid ${themeVars.color.secondary.self};
+            border-bottom: 0;
+            border-top-left-radius: ${otherThemeVars.border.radius};
+            border-top-right-radius: ${otherThemeVars.border.radius};
+          }
+        }
+      }
+    }
   }
 `;
 

styles/public/index.ts

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

styles/public/input.ts

@@ -35,7 +35,12 @@ export const input = css`
     height: 32px;
   }
   // 由于输入框高度, 需要输入框在表单中垂直居中
-  .ui.form {
+  // 管理员页面仓库搜索表单
+  .ui.form#repo-search-form {
     align-items: center;
   }
+  // 下拉菜单的输入框
+  .ui.dropdown.dropdown .menu>.input {
+    margin: 12px 10px;
+  }
 `;

styles/public/label.ts

@@ -67,6 +67,12 @@ export const label = css`
       }
     }
   }
+  .ui.small.label {
+    font-size: 12px;
+  }
+  .ui.mini.label {
+    font-size: 10px;
+  }
 `;
 
 // 提交中的 SHA 标签
@@ -78,6 +84,8 @@ export const shaLabel = css`
     color: ${themeVars.color.text.light.num1};
     font-size: 12px;
     font-weight: 500;
+    // 仪表盘页的提交 SHA 标签居中对齐
+    margin-top: 2px;
     &:hover {
       background-color: ${themeVars.color.label.hoverBg};
     }
@@ -180,19 +188,3 @@ export const repoLabel = css`
     font-size: 14px;
   }
 `;
-
-// 软件包列表
-export const packagesLabel = css`
-  .page-content {
-    &.packages {
-      > .ui.container > div > .flex-list {
-        // 软件包类型的标签
-        .ui.label {
-          background-color: unset;
-          border: 1px solid ${themeVars.color.light.border};
-          color: ${themeVars.color.primary.self};
-        }
-      }
-    }
-  }
-`;

styles/public/menu.ts

@@ -149,11 +149,14 @@ export const secondaryMenu = css`
       height: 32px;
       font-weight: 500;
     }
+    a.item:hover {
+      background: ${themeVars.github.control.transparent.bgColor.hover};
+    }
   }
   // 二级导航栏, 比如仓库的导航栏, 仓库列表的导航栏, 探索的类型导航栏
   .ui.secondary.pointing.menu {
     .overflow-menu-items {
-      gap: 0.5rem;
+      gap: 4px;
       .item {
         padding: 5px 8px !important;
         margin-block-start: 0.5rem;
@@ -192,6 +195,10 @@ export const secondaryMenu = css`
       }
     }
   }
+  // 修复仓库页面下的二级导航栏的下划线因浏览器 BUG 导致显示的异常问题(导致下划线和分割线重叠变粗)
+  .page-content.repository .ui.secondary.pointing.menu {
+    border-bottom: none !important;
+  }
 `;
 
 // 分页菜单
@@ -201,6 +208,7 @@ export const paginationMenu = css`
     background-color: unset;
     border: 0;
     gap: 4px;
+    min-height: fit-content;
     .item {
       border-radius: ${otherThemeVars.border.radius};
       min-width: 32px;
@@ -236,3 +244,55 @@ export const paginationMenu = css`
     }
   }
 `;
+
+// 单行双选项菜单
+export const smallCompactMenu = css`
+  // 订阅/关注切换菜单(应只选中订阅/关注页面, 不能选中通知页面)
+  .page-content.user.notification > .ui.container:has(.flex-list),
+  // 里程碑/标签切换菜单(里程碑页)
+  .page-content.repository.milestones .list-header,
+  // 里程碑/标签切换菜单(新建里程碑页)
+  .page-content.repository.new.milestone .issue-navbar,
+  // 里程碑/标签切换菜单(标签页)
+  .page-content.repository.labels .issue-navbar {
+    .ui.compact.small.menu.small-menu-items {
+      background: ${themeVars.color.hover.self} !important;
+      border: 0;
+      font-size: 14px;
+      gap: 8px;
+      height: 32px;
+      min-height: 32px !important;
+      > .item {
+        background: unset !important;
+        border: 1px solid ${themeVars.color.hover.self};
+        border-radius: ${otherThemeVars.border.radius};
+        padding: 6px 12px !important;
+        &.active {
+          background: ${themeVars.color.menu} !important;
+          border-color: ${themeVars.color.light.border};
+          font-weight: 600;
+        }
+        &::before {
+          display: none;
+        }
+        &:not(.active) {
+          top: 4px;
+          padding: 4px 12px !important;
+          height: calc(100% - 8px);
+          position: relative;
+          // 该方案只适用于 2 个 item 的情况
+          // left / right 数值为 gap 数值的一半
+          &:first-child {
+            left: 4px;
+          }
+          &:last-child {
+            right: 4px;
+          }
+          &:hover {
+            background: ${themeVars.github.control.transparent.bgColor.hover} !important;
+          }
+        }
+      }
+    }
+  }
+`;

styles/public/other.ts

@@ -0,0 +1,24 @@
+import { css, themeVars } from "src/types/vars";
+
+// 一些列表头, 比如工单的搜索标签里程碑栏
+export const listHeader = css`
+  .list-header {
+    align-items: center;
+    align-content: center;
+  }
+`;
+
+export const svg = css`
+  // 已标星的图标
+  .octicon-star-fill {
+    color: ${themeVars.github.button.star.iconColor} !important;
+  }
+  // VSCode 图标
+  .gitea-vscode {
+    color: #007acc !important;
+  }
+  // VSCodium 图标
+  .gitea-vscodium {
+    color: #429cf0 !important;
+  }
+`;

styles/public/tippy.ts

@@ -5,16 +5,20 @@ import { css, otherThemeVars, themeVars } from "src/types/vars";
 export const tippyBox = css`
   .tippy-box {
     margin-top: -3px;
-    border-radius: 12px;
+    border-radius: ${otherThemeVars.border.radius};
     overflow: hidden;
     animation: ${animationDown};
-    // 边框线同步 github 样式
+    // 克隆菜单和PR提示框为 default
     &[data-theme="default"],
+    // 带标题的提示框 (Runner信息)
     &[data-theme="box-with-header"] {
       border: unset;
       box-shadow: ${themeVars.github.shadow.floating.small};
     }
-    // 带标题的提示框 (Runner信息)
+    &[data-theme="default"],
+    &[data-theme="menu"] {
+      border-radius: 12px;
+    }
     &[data-theme="box-with-header"] {
       .tippy-content {
         background-color: ${themeVars.color.menu};
@@ -26,14 +30,24 @@ export const tippyBox = css`
     // 差异对比中文件路径行右侧的三个点菜单
     &[data-theme="menu"] {
       .tippy-content {
-        padding: 0.5rem;
+        padding: 8px;
         .item {
           border-radius: ${otherThemeVars.border.radius};
+          padding: 6px 8px;
+          height: 32px;
           &:hover {
             background-color: ${themeVars.github.control.transparent.bgColor.hover};
           }
         }
       }
     }
+    // 专门用于提示信息的提示框, 比如提交的具体时间, 任务状态等
+    &[data-theme="tooltip"] {
+      .tippy-content {
+        font-size: 12px;
+        font-weight: 400;
+        padding: 4px 8px;
+      }
+    }
   }
 `;

themes/colorblind-dark.css.ts

@@ -0,0 +1,82 @@
+/**
+ * @author lutinglt
+ */
+
+import { defineTheme, themeVars, type Chroma } 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: { accent: "#58a6ff", rest: "#ffffff" },
+      bgColor: { rest: themeVars.github.bgColor.success.emphasis, hover: "#2a7aef" },
+    },
+    danger: { fgColor: { rest: "#f0883e", hover: "#ffffff" }, bgColor: { hover: "#9b4215" } },
+    star: darkGithubColors.button.star,
+  },
+  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 = github2ThemeColor(colorblindDarkGithubColors);
+export const colorblindDarkChroma: Chroma = prettylights2Chroma(colorblindDarkPrettylights);
+
+export default defineTheme(colorblindDarkColors, colorblindDarkChroma);

themes/colorblind-light.css.ts

@@ -0,0 +1,82 @@
+/**
+ * @author lutinglt
+ */
+
+import { defineTheme, themeVars, type Chroma } 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: { accent: "#0969da", rest: "#ffffff" },
+      bgColor: { rest: themeVars.github.bgColor.success.emphasis, hover: "#0864d1" },
+    },
+    danger: { fgColor: { rest: "#bc4c00", hover: "#ffffff" }, bgColor: { hover: "#bc4c00" } },
+    star: lightGithubColors.button.star,
+  },
+  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 = github2ThemeColor(colorblindLightGithubColors);
+export const colorblindLightChroma: Chroma = prettylights2Chroma(colorblindLightPrettylights);
+
+export default defineTheme(colorblindLightColors, colorblindLightChroma);

themes/dark.css.ts

@@ -1,8 +1,14 @@
-import { defineGithubTheme } from "src/core/github";
+/**
+ * @author lutinglt
+ */
 
-export default defineGithubTheme({
+import { defineTheme, themeVars } from "src";
+import { github2ThemeColor, type GithubColor } from "src/core/github";
+
+export const darkGithubColors: GithubColor = {
   isDarkTheme: true,
   display: {
+    blue: { fgColor: "#4493f8" },
     brown: { fgColor: "#b69a6d" },
     cyan: { fgColor: "#07ace4" },
     indigo: { fgColor: "#9899ec" },
@@ -22,7 +28,7 @@ export default defineGithubTheme({
     attention: "#d29922",
     danger: "#f85149",
     default: "#f0f6fc",
-    disabled: "#656c7699",
+    disabled: "#656c76",
     done: "#ab7df8",
     muted: "#9198a1",
     neutral: "#9198a1",
@@ -31,37 +37,43 @@ export default defineGithubTheme({
     success: "#3fb950",
     black: "#010409",
     white: "#ffffff",
+    onEmphasis: "#ffffff",
   },
   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" },
+    emphasis: "#3d444d",
     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",
   },
   button: {
-    primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#29903b" } },
+    primary: {
+      fgColor: { accent: "#3fb950", rest: "#ffffff" },
+      bgColor: { rest: themeVars.github.bgColor.success.emphasis, hover: "#29903b" },
+    },
     danger: { fgColor: { rest: "#fa5e55", hover: "#ffffff" }, bgColor: { hover: "#b62324" } },
+    star: { iconColor: "#e3b341" },
   },
   control: {
     bgColor: { active: "#2a313c", hover: "#262c36", rest: "#212830" },
     transparent: { bgColor: { active: "#656c7640", hover: "#656c7633", selected: "#656c761a" } },
   },
-  shadow: { floating: { small: "#01040966" } },
+  shadow: { floating: { small: "#01040966" }, resting: { small: "#01040999" } },
-  overlay: { backdrop: { bgColor: "#21283066" } },
+  overlay: { backdrop: { bgColor: "#21283066" }, bgColor: "#010409" },
   underlineNav: { borderColor: { active: "#f78166" } },
   contribution: {
     default: {
@@ -69,4 +81,8 @@ export default defineGithubTheme({
       borderColor: { num0: "#0104090d" },
     },
   },
-});
+};
+
+export const darkColors = github2ThemeColor(darkGithubColors);
+
+export default defineTheme(darkColors);

themes/light.css.ts

@@ -1,8 +1,14 @@
-import { defineGithubTheme } from "src/core/github";
+/**
+ * @author lutinglt
+ */
 
-export default defineGithubTheme({
+import { defineTheme, themeVars } from "src";
+import { github2ThemeColor, type GithubColor } from "src/core/github";
+
+export const lightGithubColors: GithubColor = {
   isDarkTheme: false,
   display: {
+    blue: { fgColor: "#0969da" },
     brown: { fgColor: "#755f43" },
     cyan: { fgColor: "#006a80" },
     indigo: { fgColor: "#494edf" },
@@ -31,37 +37,43 @@ export default defineGithubTheme({
     success: "#1a7f37",
     black: "#1f2328",
     white: "#ffffff",
+    onEmphasis: "#ffffff",
   },
   bgColor: {
     accent: { emphasis: "#0969da", muted: "#ddf4ff" },
     attention: { muted: "#fff8c5" },
-    success: { emphasis: "#1f883d", muted: "#dafbe1" },
     danger: { muted: "#ffebe9" },
-    done: { emphasis: "#8250df" },
     default: "#ffffff",
-    inset: "#f6f8fa",
+    done: { emphasis: "#8250df" },
+    emphasis: "#25292e",
     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",
   },
   button: {
-    primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#1c8139" } },
+    primary: {
+      fgColor: { accent: "#1a7f37", rest: "#ffffff" },
+      bgColor: { rest: themeVars.github.bgColor.success.emphasis, hover: "#1c8139" },
+    },
     danger: { fgColor: { rest: "#d1242f", hover: "#ffffff" }, bgColor: { hover: "#cf222e" } },
+    star: { iconColor: "#eac54f" },
   },
   control: {
     bgColor: { active: "#e6eaef", hover: "#eff2f5", rest: "#f6f8fa" },
     transparent: { bgColor: { active: "#818b9826", hover: "#818b981a", selected: "#818b9826" } },
   },
-  shadow: { floating: { small: "#25292e0a" } },
+  shadow: { floating: { small: "#25292e0a" }, resting: { small: "#1f23280f" } },
-  overlay: { backdrop: { bgColor: "#c8d1da66" } },
+  overlay: { backdrop: { bgColor: "#c8d1da66" }, bgColor: "#ffffff" },
   underlineNav: { borderColor: { active: "#fd8c73" } },
   contribution: {
     default: {
@@ -69,4 +81,8 @@ export default defineGithubTheme({
       borderColor: { num0: "#1f23280d" },
     },
   },
-});
+};
+
+export const lightColors = github2ThemeColor(lightGithubColors);
+
+export default defineTheme(lightColors);

themes/pink-dark.css.ts

@@ -0,0 +1,26 @@
+/**
+ * @author lutinglt
+ */
+
+import { defineTheme } from "src";
+import { display2GithubColor, type DisplayColor } from "src/core/display";
+import { github2ThemeColor } from "src/core/github";
+import { darkGithubColors } from "themes/dark";
+
+export const pinkDarkDisplayColors: DisplayColor = {
+  num0: "#2d1524",
+  num1: "#451c35",
+  num2: "#65244a",
+  num3: "#842a5d",
+  num4: "#ac2f74",
+  num5: "#d34591",
+  num6: "#e57bb2",
+  num7: "#ec8dbd",
+  num8: "#f4a9cd",
+  num9: "#f9bed9",
+};
+
+export const pinkDarkGithubColors = display2GithubColor(pinkDarkDisplayColors, darkGithubColors);
+export const pinkDarkColors = github2ThemeColor(pinkDarkGithubColors);
+
+export default defineTheme(pinkDarkColors);

themes/pink-light.css.ts

@@ -0,0 +1,26 @@
+/**
+ * @author lutinglt
+ */
+
+import { defineTheme } from "src";
+import { display2GithubColor, type DisplayColor } from "src/core/display";
+import { github2ThemeColor } from "src/core/github";
+import { lightGithubColors } from "themes/light";
+
+export const pinkLightDisplayColors: DisplayColor = {
+  num0: "#ffe5f1",
+  num1: "#fdc9e2",
+  num2: "#f8a5cf",
+  num3: "#f184bc",
+  num4: "#e55da5",
+  num5: "#ce2c85",
+  num6: "#b12f79",
+  num7: "#8e2e66",
+  num8: "#6e2b53",
+  num9: "#4d233d",
+};
+
+export const pinkLightGithubColors = display2GithubColor(pinkLightDisplayColors, lightGithubColors);
+export const pinkLightColors = github2ThemeColor(pinkLightGithubColors);
+
+export default defineTheme(pinkLightColors);

themes/pink-soft-dark.css.ts

@@ -0,0 +1,14 @@
+/**
+ * @author lutinglt
+ */
+
+import { defineTheme } from "src";
+import { display2GithubColor } from "src/core/display";
+import { github2ThemeColor } from "src/core/github";
+import { softDarkGithubColors } from "themes/soft-dark";
+import { pinkDarkDisplayColors } from "./pink-dark.css";
+
+export const pinkSoftDarkGithubColors = display2GithubColor(pinkDarkDisplayColors, softDarkGithubColors, true);
+export const pinkSoftDarkColors = github2ThemeColor(pinkSoftDarkGithubColors);
+
+export default defineTheme(pinkSoftDarkColors);

themes/soft-dark.css.ts

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

themes/tritanopia-dark.css.ts

@@ -0,0 +1,49 @@
+/**
+ * @author lutinglt
+ */
+
+import { defineTheme, type Chroma } 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 = github2ThemeColor(tritanopiaDarkGithubColors);
+export const tritanopiaDarkChroma: Chroma = prettylights2Chroma(tritanopiaDarkPrettylights);
+
+export default defineTheme(tritanopiaDarkColors, tritanopiaDarkChroma);

themes/tritanopia-light.css.ts

@@ -0,0 +1,49 @@
+/**
+ * @author lutinglt
+ */
+
+import { defineTheme, type Chroma } 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 = github2ThemeColor(tritanopiaLightGithubColors);
+export const tritanopiaLightChroma: Chroma = prettylights2Chroma(tritanopiaLightPrettylights);
+
+export default defineTheme(tritanopiaLightColors, tritanopiaLightChroma);