version

.github/FUNDING.yml

@@ -12,4 +12,4 @@ lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cl
 polar: # Replace with a single Polar username
 buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
 thanks_dev: # Replace with a single thanks.dev username
-custom: ['https://afdian.com/a/luting']
+custom: ["https://afdian.com/a/luting"]

.github/release.md

@@ -1,5 +1,20 @@
+### 🎉 已完成大部分页面的 GitHub 风格 ( GitHub Style Completed for Most Pages )
+
+如果您仍在使用旧版本，强烈建议更新至本版本。此版本已为大部分常用页面实现了 GitHub 风格设计，提供了更强的一致性，并修复了若干已知问题。
+
+由于布局限制，项目和百科页面的 GitHub 风格适配方案尚未确定。
+
+If you are still using an older version, we highly recommend updating to this release. This version has implemented the
+GitHub-style design for most commonly used pages, ensuring stronger consistency, and addresses several known issues.
+
+Due to layout constraints, the approach for adapting the GitHub style to Project and Wiki pages has not yet been
+determined.
+
 ### ✨ Feature
 
+- 新增粉色颜色主题
+- 修改外观设置中显示的主题名称
+
 #### CSS 变量
 
 - 新增 `--custom-branch-menu-width` 变量, 用于设置分支菜单的宽度
@@ -7,29 +22,17 @@
 
 ### 🌈 Style
 
-- 优化小型按钮的高度
+- 优化用户首页仪表板的样式
-- 一些列表栏的元素位置居中
 
 ##### 更符合 GitHub 风格
 
-- 同步查看代码文件内容时的样式
+- 同步查看代码文件内容时的样式 (去掉了一些底部元素, 优化滚动体验)
-- 优化查看代码文件内容时的体验 (去掉了一些底部元素, 优化滚动体验)
+- 整体调整了页面元素的间隔, 样式和字体大小
-- 略微减小导航栏创建仓库菜单按钮内的图标间隔
+- 同步顶部工单/合并请求/里程碑下的仪表板样式
-- 微调一些标签的字体大小
+- 同步里程碑/置顶 Issue 的样式
-- 优化发布页面布局和下载列表样式
+- 同步通知/订阅/关注/软件包/提示框/用户头像菜单的页面样式
-- 同步里程碑页面样式
-- 同步顶部工单等仪表板样式
-- 同步置顶 Issue 样式
-- 同步订阅/关注页面样式
-- 同步用户菜单样式
-- 优化下拉菜单样式
-- 同步差异对比页面文件名标题栏样式
 - 同步分支菜单宽度
-- 同步通知页面样式
-- 优化仪表板的仓库组织切换按钮样式
 - 同步仓库已标星的星星颜色
-- 优化仪表板动态信息间隔
-- 微调仓库相关界面元素间隔
 
 ### 🐞 Fix
 
@@ -38,19 +41,47 @@
 - 修复登录二次验证页面内容位置
 - 修复后台管理的运维管理面板的样式
 - 取消修改编辑器字体大小, 避免光标错位
-- 修复文件预览时文件树右边框过粗
 - 修复提交列表尾行圆角
-- 修复 wiki 页面和组织页面的用户下拉菜单的圆角问题
+- 修复 Wiki 页面和二级导航栏组织下团队菜单的圆角问题
+- 修复创建工单页面样式
+- 修复归档仓库 Issue 时间线过长插入归档信息框
+- 修复亮色主题下的 PR 合并操作评论的头像和按钮图标颜色
 
 ## 📃 English (From AI)
 
+### ✨ Feature
+
+- Added pink color theme
+- Modified theme names displayed in appearance settings
+
+#### CSS Variables
+
+- Added `--custom-branch-menu-width` variable for setting branch menu width
+- Added `--custom-user-menu-width` variable for setting user menu width
+
 ### 🌈 Style
 
+- Optimized dashboard style on user homepage
+
 ##### More GitHub-like style
 
-- Improved code file viewing experience (scrolling to bottom no longer causes file tree content overlap)
+- Synced styles when viewing code file content (removed some bottom elements, optimized scrolling experience)
+- Adjusted spacing, styles, and font sizes of page elements overall
+- Synced dashboard styles under top issues/pull requests/milestones
+- Synced styles of milestones/pinned Issues
+- Synced page styles of notifications/subscriptions/follows/packages/tooltips/user avatar menus
+- Synced branch menu width
+- Synced star color for starred repositories
 
 ### 🐞 Fix
 
 - Fixed code highlight colors for red-green color blindness theme
 - Fixed button underline length for Chinese README in repositories
+- Fixed content position on login two-factor authentication page
+- Fixed style of operation and maintenance management panel in admin backend
+- Reverted editor font size changes to avoid cursor misalignment
+- Fixed rounded corners of last row in commit list
+- Fixed rounded corners issue in Wiki pages and team menus under secondary navigation bar organization
+- Fixed style of issue creation page
+- Fixed issue where archive information box is inserted when issue timeline is too long in archived repositories
+- Fixed avatar and button icon colors in PR merge operation comments under light theme

.github/workflows/release.yml

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

README.md

@@ -30,6 +30,11 @@ Gitea 理论上小版本号变更不会修改前端布局, 所以主题的小版
 >
 > 自动颜色主题需要亮色和暗色的主题文件
 
+> [!TIP]
+>
+> 推荐搭配 Catppuccin 文件图标浏览器插件一起使用更佳
+> [github-file-explorer-icons](https://github.com/catppuccin/github-file-explorer-icons)
+
 例: 主题文件名为 `theme-github-dark.css`，则添加 `github-dark` 到 `THEMES` 末尾
 
 `gitea/conf/app.ini` 例:
@@ -44,13 +49,15 @@ THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-
 
 ## 截图
 
+![Dashboard](screenshots/dashboard.png)
+
 ### 基本主题
 
 ```ini
 THEMES = github-auto, github-light, github-dark, github-soft-dark
 ```
 
-<details open>
+<details>
 <summary>Base</summary>
 <h4>theme-github-light.css</h4>
 <img src="screenshots/light.png"/>
@@ -75,6 +82,22 @@ THEMES = github-tritanopia-auto, github-tritanopia-light, github-tritanopia-dark
 <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 变量
 
 可以根据自己的偏好自定义主题的一部分样式

README_EN.md

@@ -31,7 +31,12 @@ accepted.
 
 > [!IMPORTANT]
 >
-> Automatic color theme requires both light and dark theme files
+> Automatic color theme requires both light and dark theme files.
+
+> [!TIP]
+>
+> Recommend using Catppuccin file icon browser plugin together for better performance.
+> [github-file-explorer-icons](https://github.com/catppuccin/github-file-explorer-icons)
 
 Example: If the theme filename is `theme-github-dark.css`, add `github-dark` to the end of `THEMES`
 
@@ -47,13 +52,15 @@ For details, please refer to the Gitea documentation
 
 ## Screenshots
 
+![Dashboard](screenshots/en/dashboard-en.png)
+
 ### Basic Themes
 
 ```ini
 THEMES = github-auto, github-light, github-dark, github-soft-dark
 ```
 
-<details open>
+<details>
 <summary>Base</summary>
 <h4>theme-github-light.css</h4>
 <img src="screenshots/en/light.png"/>
@@ -78,6 +85,22 @@ THEMES = github-tritanopia-auto, github-tritanopia-light, github-tritanopia-dark
 <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

package.json

@@ -1,7 +1,6 @@
 {
   "name": "gitea-github-theme",
   "version": "1.24.6",
-  "description": "A sophisticated theme to make Gitea look and feel like GitHub",
   "type": "module",
   "scripts": {
     "dev": "vite build --mode dev",

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, -7)) : 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

@@ -8,6 +8,7 @@ import { type ThemeColor } from "./color";
 export type GithubColor = {
   isDarkTheme: boolean;
   display: {
+    blue: { fgColor: string };
     brown: { fgColor: string };
     cyan: { fgColor: string };
     indigo: { fgColor: string };
@@ -36,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 };
@@ -58,7 +61,7 @@ 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 };
   };
@@ -66,7 +69,7 @@ export type GithubColor = {
     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 } };
   underlineNav: { borderColor: { active: string } };
   contribution: {
@@ -193,8 +196,8 @@ export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
       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,
@@ -257,11 +260,14 @@ export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
       },
       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: {
@@ -300,6 +306,9 @@ export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
       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: {
@@ -343,7 +352,7 @@ export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
       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,

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/types/color/github.ts

@@ -25,7 +25,6 @@ export const github = {
     accent: {
       /** 强调色
        * @diff 折叠/展开按钮的悬停颜色
-       * @actions `actionViewLeft` 左侧子作业激活伪元素颜色
        * @release `releaseTagMenu` 顶部栏左侧按钮激活背景色
        * @navbar `navbarRight` 头像管理员标识背景颜色
        * @dropdown `dropdown` emoji 的悬停背景色
@@ -61,6 +60,7 @@ export const github = {
        * @input `input` 输入框被选中时的边框颜色
        * @clone `clone` 克隆地址框被选中时的边框颜色
        * @issue `comment` 评论框被选中时的边框颜色
+       * @actions `actionViewLeft` 左侧子作业激活伪元素颜色
        * @menu `verticalMenu` 垂直菜单项激活时左侧的伪元素颜色
        * @dropdown `selectionDropdown` 选择输入框的内部边框颜色
        * @notification `notification` 通知列表悬停时的左边框颜色
@@ -197,6 +197,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

@@ -41,8 +41,13 @@ const customVars = {
   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

@@ -180,7 +180,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;

styles/components/dashboard.ts

@@ -57,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;
             }

styles/components/filelist.ts

@@ -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;
       }

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,13 +69,12 @@ 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]) {
@@ -89,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

@@ -13,6 +13,7 @@ import "./milestones";
 import "./newrepo";
 import "./notification";
 import "./org";
+import "./packages";
 import "./release";
 import "./repo";
 import "./setting";

styles/components/issue.ts

@@ -48,9 +48,6 @@ export const issueList = css`
       }
       .issue-list-toolbar-right > .ui.menu {
         align-items: center;
-        > .item {
-          color: ${themeVars.color.text.light.num1};
-        }
         > .ui.button {
           padding: 0 12px;
           height: 32px;
@@ -363,6 +360,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 列表下的所有筛选菜单
@@ -382,7 +389,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;
@@ -462,6 +469,12 @@ export const prMerge = css`
       padding: 16px;
       display: grid;
       gap: 8px;
+      &.no-header {
+        &::before,
+        &::after {
+          display: none;
+        }
+      }
     }
   }
 `;
@@ -470,6 +483,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;
@@ -522,37 +540,62 @@ 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;
+      .issue-content-right {
-      padding: 0;
+        border: 0;
-      .ui.button {
         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;
+          }
+        }
+        // 时间追踪
+        > div:not([class]):not([id]) > .ui.dropdown.jump > a.fixed-text.muted {
           align-items: center;
           border-radius: ${otherThemeVars.border.radius};
           text-decoration-line: none;
@@ -561,62 +604,48 @@ 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 {
-      // 时间追踪
+          margin: 12px 0 12px 8px;
-      > div:not([class]):not([id]) > .ui.dropdown.jump > a.fixed-text.muted {
+          width: calc(100% - 16px);
-        align-items: center;
-        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/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 {
@@ -152,23 +173,3 @@ export const releases = css`
     }
   }
 `;
-
-// 顶部右侧按钮组
-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/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

@@ -40,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/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,
@@ -45,6 +46,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,6 +87,7 @@ 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};
     }
   }
 `;
@@ -120,4 +123,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/index.ts

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

styles/public/input.ts

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

styles/public/label.ts

@@ -84,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};
     }
@@ -186,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

@@ -148,6 +148,7 @@ export const secondaryMenu = css`
       padding: 0px 12px;
       height: 32px;
       font-weight: 500;
+      color: ${themeVars.color.text.light.num1};
     }
   }
   // 二级导航栏, 比如仓库的导航栏, 仓库列表的导航栏, 探索的类型导航栏
@@ -201,6 +202,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;
@@ -243,6 +245,8 @@ 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 {

styles/public/tippy.ts

@@ -5,16 +5,19 @@ 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"] {
+      border-radius: 12px;
+    }
     &[data-theme="box-with-header"] {
       .tippy-content {
         background-color: ${themeVars.color.menu};
@@ -26,7 +29,7 @@ export const tippyBox = css`
     // 差异对比中文件路径行右侧的三个点菜单
     &[data-theme="menu"] {
       .tippy-content {
-        padding: 0.5rem;
+        padding: 8px;
         .item {
           border-radius: ${otherThemeVars.border.radius};
           &:hover {
@@ -35,5 +38,13 @@ export const tippyBox = css`
         }
       }
     }
+    // 专门用于提示信息的提示框, 比如提交的具体时间, 任务状态等
+    &[data-theme="tooltip"] {
+      .tippy-content {
+        font-size: 12px;
+        font-weight: 400;
+        padding: 4px 8px;
+      }
+    }
   }
 `;

themes/colorblind-dark.css.ts

@@ -1,4 +1,8 @@
-import { defineTheme, type Chroma, type ThemeColor } from "src";
+/**
+ * @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";
@@ -28,7 +32,10 @@ export const colorblindDarkGithubColors: GithubColor = {
     success: { emphasis: "#1f6feb" },
   },
   button: {
-    primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#2a7aef" } },
+    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,
   },
@@ -69,7 +76,7 @@ export const colorblindDarkPrettylights: prettylightsColor = {
   },
 };
 
-export const colorblindDarkColors: ThemeColor = github2ThemeColor(colorblindDarkGithubColors);
+export const colorblindDarkColors = github2ThemeColor(colorblindDarkGithubColors);
 export const colorblindDarkChroma: Chroma = prettylights2Chroma(colorblindDarkPrettylights);
 
 export default defineTheme(colorblindDarkColors, colorblindDarkChroma);

themes/colorblind-light.css.ts

@@ -1,4 +1,8 @@
-import { defineTheme, type Chroma, type ThemeColor } from "src";
+/**
+ * @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";
@@ -28,7 +32,10 @@ export const colorblindLightGithubColors: GithubColor = {
     success: { emphasis: "#0969da" },
   },
   button: {
-    primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#0864d1" } },
+    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,
   },
@@ -69,7 +76,7 @@ export const colorblindLightPrettylights: prettylightsColor = {
   },
 };
 
-export const colorblindLightColors: ThemeColor = github2ThemeColor(colorblindLightGithubColors);
+export const colorblindLightColors = github2ThemeColor(colorblindLightGithubColors);
 export const colorblindLightChroma: Chroma = prettylights2Chroma(colorblindLightPrettylights);
 
 export default defineTheme(colorblindLightColors, colorblindLightChroma);

themes/dark.css.ts

@@ -1,9 +1,14 @@
-import { defineTheme, type ThemeColor } from "src";
+/**
+ * @author lutinglt
+ */
+
+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" },
@@ -32,6 +37,7 @@ export const darkGithubColors: GithubColor = {
     success: "#3fb950",
     black: "#010409",
     white: "#ffffff",
+    onEmphasis: "#ffffff",
   },
   bgColor: {
     accent: { emphasis: "#1f6feb", muted: "#388bfd1a" },
@@ -39,6 +45,7 @@ export const darkGithubColors: GithubColor = {
     danger: { muted: "#f851491a" },
     default: "#0d1117",
     done: { emphasis: "#8957e5" },
+    emphasis: "#3d444d",
     muted: "#151b23",
     neutral: { muted: "#656c7633" },
     success: { emphasis: "#238636", muted: "#2ea04326" },
@@ -54,7 +61,10 @@ export const darkGithubColors: GithubColor = {
     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" },
   },
@@ -62,7 +72,7 @@ export const darkGithubColors: GithubColor = {
     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" } },
   underlineNav: { borderColor: { active: "#f78166" } },
   contribution: {
@@ -73,6 +83,6 @@ export const darkGithubColors: GithubColor = {
   },
 };
 
-export const darkColors: ThemeColor = github2ThemeColor(darkGithubColors);
+export const darkColors = github2ThemeColor(darkGithubColors);
 
 export default defineTheme(darkColors);

themes/light.css.ts

@@ -1,9 +1,14 @@
-import { defineTheme, type ThemeColor } from "src";
+/**
+ * @author lutinglt
+ */
+
+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" },
@@ -32,6 +37,7 @@ export const lightGithubColors: GithubColor = {
     success: "#1a7f37",
     black: "#1f2328",
     white: "#ffffff",
+    onEmphasis: "#ffffff",
   },
   bgColor: {
     accent: { emphasis: "#0969da", muted: "#ddf4ff" },
@@ -39,6 +45,7 @@ export const lightGithubColors: GithubColor = {
     danger: { muted: "#ffebe9" },
     default: "#ffffff",
     done: { emphasis: "#8250df" },
+    emphasis: "#25292e",
     muted: "#f6f8fa",
     neutral: { muted: "#818b981f" },
     success: { emphasis: "#1f883d", muted: "#dafbe1" },
@@ -54,7 +61,10 @@ export const lightGithubColors: GithubColor = {
     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" },
   },
@@ -62,7 +72,7 @@ export const lightGithubColors: GithubColor = {
     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" } },
   underlineNav: { borderColor: { active: "#fd8c73" } },
   contribution: {
@@ -73,6 +83,6 @@ export const lightGithubColors: GithubColor = {
   },
 };
 
-export const lightColors: ThemeColor = github2ThemeColor(lightGithubColors);
+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,4 +1,8 @@
-import { defineTheme, type Chroma, type ThemeColor } from "src";
+/**
+ * @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";
@@ -27,6 +31,7 @@ export const softDarkGithubColors: GithubColor = {
     success: "#57ab5a",
     black: "#010409",
     white: "#cdd9e5",
+    onEmphasis: "#ffffff",
   },
   bgColor: {
     accent: { emphasis: "#316dca", muted: "#4184e41a" },
@@ -34,6 +39,7 @@ export const softDarkGithubColors: GithubColor = {
     danger: { muted: "#e5534b1a" },
     default: "#212830",
     done: { emphasis: "#8256d0" },
+    emphasis: "#3d444d",
     muted: "#262c36",
     neutral: { muted: "#656c7633" },
     success: { emphasis: "#347d39", muted: "#46954a26" },
@@ -49,7 +55,10 @@ export const softDarkGithubColors: GithubColor = {
     translucent: "#cdd9e526",
   },
   button: {
-    primary: { fgColor: { rest: "#ffffff" }, bgColor: { hover: "#3b8640" } },
+    primary: {
+      fgColor: { accent: "#57ab5a", rest: "#ffffff" },
+      bgColor: { rest: themeVars.github.bgColor.success.emphasis, hover: "#3b8640" },
+    },
     danger: { fgColor: { rest: "#ea5c53", hover: "#ffffff" }, bgColor: { hover: "#ad2e2c" } },
     star: { iconColor: "#daaa3f" },
   },
@@ -57,7 +66,7 @@ export const softDarkGithubColors: GithubColor = {
     bgColor: { active: "#3d444d", hover: "#2f3742", rest: "#2a313c" },
     transparent: { bgColor: { active: "#656c7633", hover: "#656c7626", selected: "#656c761a" } },
   },
-  shadow: { floating: { small: "#01040966" } },
+  shadow: { floating: { small: "#01040966" }, resting: { small: "#01040999" } },
   overlay: { backdrop: { bgColor: "#262c3666" } },
   underlineNav: { borderColor: { active: "#ec775c" } },
   contribution: {
@@ -98,7 +107,7 @@ export const softDarkPrettylights: prettylightsColor = {
   },
 };
 
-export const softDarkColors: ThemeColor = github2ThemeColor(softDarkGithubColors);
+export const softDarkColors = github2ThemeColor(softDarkGithubColors);
 export const softDarkChroma: Chroma = prettylights2Chroma(softDarkPrettylights);
 
 export default defineTheme(softDarkColors, softDarkChroma);

themes/tritanopia-dark.css.ts

@@ -1,4 +1,8 @@
-import { defineTheme, type Chroma, type ThemeColor } from "src";
+/**
+ * @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";
@@ -39,7 +43,7 @@ export const tritanopiaDarkPrettylights: prettylightsColor = {
   },
 };
 
-export const tritanopiaDarkColors: ThemeColor = github2ThemeColor(tritanopiaDarkGithubColors);
+export const tritanopiaDarkColors = github2ThemeColor(tritanopiaDarkGithubColors);
 export const tritanopiaDarkChroma: Chroma = prettylights2Chroma(tritanopiaDarkPrettylights);
 
 export default defineTheme(tritanopiaDarkColors, tritanopiaDarkChroma);

themes/tritanopia-light.css.ts

@@ -1,4 +1,8 @@
-import { defineTheme, type Chroma, type ThemeColor } from "src";
+/**
+ * @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";
@@ -39,7 +43,7 @@ export const tritanopiaLightPrettylights: prettylightsColor = {
   },
 };
 
-export const tritanopiaLightColors: ThemeColor = github2ThemeColor(tritanopiaLightGithubColors);
+export const tritanopiaLightColors = github2ThemeColor(tritanopiaLightGithubColors);
 export const tritanopiaLightChroma: Chroma = prettylights2Chroma(tritanopiaLightPrettylights);
 
 export default defineTheme(tritanopiaLightColors, tritanopiaLightChroma);