fix ci

.gitattributes

@@ -1,5 +1 @@
-.github/* linguist-vendored
-.vscode/* linguist-vendored
-screenshots/* linguist-vendored
-scripts/* linguist-vendored
-eslint.config.js linguist-vendored
+*.tmpl linguist-language=Handlebars

.github/workflows/build.yml

@@ -0,0 +1,56 @@
+name: build
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dorny/paths-filter@v3
+        id: changes
+        with:
+          filters: |
+            src:
+              - "scripts/*"
+              - "src/**/*.ts"
+              - "styles/**/*.ts"
+              - "themes/*.css.ts"
+              - "vite.config.ts"
+              - "package.json"
+
+      - name: Build theme
+        id: build
+        if: steps.changes.outputs.src == 'true'
+        run: |
+          npm install
+          npm run build
+
+      - name: Upload css assets
+        if: steps.build.outcome == 'success'
+        uses: actions/upload-artifact@v4
+        with:
+          name: themes
+          path: dist/*.css
+
+      - name: Upload templates assets
+        if: steps.build.outcome == 'success'
+        uses: actions/upload-artifact@v4
+        with:
+          name: templates
+          path: templates
+
+      - name: Build locales
+        id: locales
+        if: steps.build.outcome =='success'
+        run: npm run tr
+
+      - name: Upload locales assets
+        if: steps.locales.outcome =='success'
+        uses: actions/upload-artifact@v4
+        with:
+          name: locales
+          path: dist/options/locale

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Build theme
         run: |
           npm install
-          npm run build
+          npm run release
       - name: Create release
         run: |
           tar -zcf dist/theme-github-base.tar.gz --remove-files \
@@ -30,7 +30,8 @@ jobs:
           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
 
           tar -zcf dist/theme-github-templates.tar.gz templates
+          tar -zcf dist/theme-github-translations.tar.gz --remove-files dist/options
           TAG="v$(npm run -s version)"
-          gh release create "$TAG" dist/* --notes-file CHANGELOG.md --draft -t $TAG
+          gh release create "$TAG" dist/*.tar.gz --notes-file CHANGELOG.md --draft -t $TAG
         env:
           GH_TOKEN: ${{ github.token }}

CHANGELOG.md

@@ -2,14 +2,19 @@
 
 #### More aligned with GitHub style
 
-- Optimize the selection style of items in the menu
-- Optimize code block styles
+- Optimize the selection style of items in the menu.
+- Optimize code block styles.
+- Optimize some element styles on Issue/PR page
 
 ##### Template File
 
-- Synchronized repository code list page layout and styles
-- Synchronized repository add file button menu styles
+- Synchronized repository commit page layout and styles.
+- Synchronized repository code list page layout and styles.
+- Synchronized repository add file button menu styles.
 
 ### 🐞 Fix
 
 - Fixed extra lines under heatmap.
+- Supplement the PR operation panel status style in PR.
+- Fixed avatar size for approving users in PR
+- Fixed bot label styles in Issue/PR

README.md

@@ -46,16 +46,16 @@ accepted.
 
 ## Installation
 
-1. Download the latest CSS theme file from the release page and place it in the `gitea/public/assets/css` directory
+1. Download the latest CSS theme file from the release page and place it in the `data/gitea/public/assets/css` directory
    (This directory may not be available by default and needs to be manually created)
-2. Modify `gitea/conf/app.ini` and append the CSS filename without the `theme-` prefix to the end of `THEMES` under the
-   `[ui]` section
+2. Modify `data/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
 
 Example: If the theme filename is `theme-github-dark.css`, add `github-dark` to the end of `THEMES`
 
-Example `gitea/conf/app.ini`:
+Example `data/gitea/conf/app.ini`:
 
 ```ini
 [ui]
@@ -71,7 +71,7 @@ For details, please refer to the Gitea documentation
 
 ### Template File Installation (Optional)
 
-1. Download the latest template files from the release page and place them in the `gitea/templates` directory (This
+1. Download the latest template files from the release page and place them in the `data/gitea/templates` directory (This
    directory may not be available by default and needs to be manually created)
 2. Restart Gitea
 

README_CN.md

@@ -41,14 +41,14 @@ Gitea 理论上小版本号变更不会修改前端布局, 所以主题的小版
 
 ## 安装
 
-1. 在发布页下载最新的 CSS 主题文件放入 `gitea/public/assets/css` 目录下 (默认可能没有此目录需手动创建)
-2. 修改 `gitea/conf/app.ini`，并将 CSS 文件名去掉 `theme-` 的名称附加到 `[ui]` 下的 `THEMES` 末尾
+1. 在发布页下载最新的 CSS 主题文件放入 `data/gitea/public/assets/css` 目录下 (默认可能没有此目录需手动创建)
+2. 修改 `data/gitea/conf/app.ini`，并将 CSS 文件名去掉 `theme-` 的名称附加到 `[ui]` 下的 `THEMES` 末尾
 3. 重启 Gitea
 4. 在设置中查看主题
 
 例: 主题文件名为 `theme-github-dark.css`，则添加 `github-dark` 到 `THEMES` 末尾
 
-`gitea/conf/app.ini` 例:
+`data/gitea/conf/app.ini` 例:
 
 ```ini
 [ui]
@@ -64,7 +64,7 @@ THEMES = gitea-auto, gitea-light, gitea-dark, github-auto, github-light, github-
 
 ### 模板文件安装 (可选)
 
-1. 在发布页下载最新的模板文件放入 `gitea/templates` 目录下 (默认可能没有此目录需手动创建)
+1. 在发布页下载最新的模板文件放入 `data/gitea/templates` 目录下 (默认可能没有此目录需手动创建)
 2. 重启 Gitea
 
 > [!IMPORTANT]

gitea/templates/repo/commit_sign_badge.tmpl

@@ -0,0 +1,81 @@
+{{/* Template attributes:
+* Commit
+* CommitBaseLink
+* CommitSignVerification
+If you'd like to modify this template, you could test it on the devtest page.
+ATTENTION: this template could be re-rendered many times (on the graph and commit list page),
+so this template should be kept as small as possible, DO NOT put large components like modal/dialog into it.
+*/}}
+{{- $commit := $.Commit -}}
+{{- $commitBaseLink := $.CommitBaseLink -}}
+{{- $verification := $.CommitSignVerification -}}{{- /* asymkey.CommitVerification */ -}}
+
+{{- $extraClass := "" -}}
+{{- $verified := false -}}
+{{- $signingUser := NIL -}}
+{{- $signingEmail := "" -}}
+{{- $msgReasonPrefix := "" -}}
+{{- $msgReason := "" -}}
+{{- $msgSigningKey := "" -}}
+
+{{- if $verification -}}
+	{{- $signingUser = $verification.SigningUser -}}
+	{{- $signingEmail = $verification.SigningEmail -}}
+	{{- $extraClass = print $extraClass " commit-is-signed" -}}
+	{{- if $verification.Verified -}}
+		{{- /* reason is "{name} / {key-id}" */ -}}
+		{{- $msgReason = $verification.Reason -}}
+		{{- $verified = true -}}
+		{{- if eq $verification.TrustStatus "trusted" -}}
+			{{- $extraClass = print $extraClass " sign-trusted" -}}
+		{{- else if eq $verification.TrustStatus "untrusted" -}}
+			{{- $extraClass = print $extraClass " sign-untrusted" -}}
+			{{- $msgReasonPrefix = ctx.Locale.Tr "repo.commits.signed_by_untrusted_user" -}}
+		{{- else -}}
+			{{- $extraClass = print $extraClass " sign-unmatched" -}}
+			{{- $msgReasonPrefix = ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched" -}}
+		{{- end -}}
+	{{- else -}}
+		{{- if $verification.Warning -}}
+			{{- $extraClass = print $extraClass " sign-warning" -}}
+		{{- else -}}
+			{{- $extraClass = "" -}}{{/* the commit is not signed */}}
+		{{- end -}}
+		{{- $msgReason = ctx.Locale.Tr $verification.Reason -}}{{- /* dirty part: it is the translation key ..... */ -}}
+	{{- end -}}
+
+	{{- if $msgReasonPrefix -}}
+		{{- $msgReason = print $msgReasonPrefix ": " $msgReason -}}
+	{{- end -}}
+
+	{{- if $verification.SigningSSHKey -}}
+		{{- $msgSigningKey = print (ctx.Locale.Tr "repo.commits.ssh_key_fingerprint") ": " $verification.SigningSSHKey.Fingerprint -}}
+	{{- else if $verification.SigningKey -}}{{- /* asymkey.GPGKey */ -}}
+		{{- $msgSigningKey = print (ctx.Locale.Tr "repo.commits.gpg_key_id") ": " $verification.SigningKey.PaddedKeyID -}}
+	{{- end -}}
+{{- end -}}
+
+{{- if $commit -}}
+<a {{if $commitBaseLink}}href="{{$commitBaseLink}}/{{$commit.ID}}"{{end}} class="ui label commit-id-short {{$extraClass}}" rel="nofollow">
+	{{- ShortSha $commit.ID.String -}}
+{{- end -}}
+{{- if or (not $commit) $extraClass}}{{/* only show the lock icon if there is no commit info (icon only) or the commit is really signed */}}
+	<span class="ui label commit-sign-badge {{$extraClass}}">
+		{{- if $verified -}}
+			{{- if and $signingUser $signingUser.ID -}}
+				<span data-tooltip-content="{{$msgReason}}">{{svg "gitea-lock"}}</span>
+				<span data-tooltip-content="{{$msgSigningKey}}">{{ctx.AvatarUtils.Avatar $signingUser 16}}</span>
+			{{- else -}}
+				<span data-tooltip-content="{{$msgReason}}">{{svg "gitea-lock-cog"}}</span>
+				<span data-tooltip-content="{{$msgSigningKey}}">{{ctx.AvatarUtils.AvatarByEmail $signingEmail "" 16}}</span>
+			{{- end -}}
+		{{- else -}}
+			<span data-tooltip-content="{{$msgReason}}">{{svg "gitea-unlock"}}</span>
+		{{- end -}}
+	</span>
+{{- end -}}
+{{- if $commit -}}
+</a>
+{{- end -}}
+
+{{- /* This template should be kept as small as possible, DO NOT put large components like modal/dialog into it. */ -}}

gitea/templates/repo/commits_list.tmpl

@@ -0,0 +1,89 @@
+<div class="ui attached table segment commit-table">
+	<table class="ui very basic striped table unstackable" id="commits-table">
+		<thead>
+			<tr>
+				<th class="three wide">{{ctx.Locale.Tr "repo.commits.author"}}</th>
+				<th class="two wide sha">{{StringUtils.ToUpper $.Repository.ObjectFormatName}}</th>
+				<th class="eight wide message">{{ctx.Locale.Tr "repo.commits.message"}}</th>
+				<th class="two wide tw-text-right">{{ctx.Locale.Tr "repo.commits.date"}}</th>
+				<th class="one wide"></th>
+			</tr>
+		</thead>
+		<tbody class="commit-list">
+			{{$commitRepoLink := $.RepoLink}}{{if $.CommitRepoLink}}{{$commitRepoLink = $.CommitRepoLink}}{{end}}
+			{{range .Commits}}
+				<tr>
+					<td class="author">
+						<div class="tw-flex">
+							{{$userName := .Author.Name}}
+							{{if .User}}
+								{{if and .User.FullName DefaultShowFullName}}
+									{{$userName = .User.FullName}}
+								{{end}}
+								{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}<a class="muted author-wrapper" href="{{.User.HomeLink}}">{{$userName}}</a>
+							{{else}}
+								{{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 28 "tw-mr-2"}}
+								<span class="author-wrapper">{{$userName}}</span>
+							{{end}}
+						</div>
+					</td>
+					<td class="sha">
+						{{$commitBaseLink := ""}}
+						{{if $.PageIsWiki}}
+							{{$commitBaseLink = printf "%s/wiki/commit" $commitRepoLink}}
+						{{else if $.PageIsPullCommits}}
+							{{$commitBaseLink = printf "%s/pulls/%d/commits" $commitRepoLink $.Issue.Index}}
+						{{else if $.Reponame}}
+							{{$commitBaseLink = printf "%s/commit" $commitRepoLink}}
+						{{end}}
+						{{template "repo/commit_sign_badge" dict "Commit" . "CommitBaseLink" $commitBaseLink "CommitSignVerification" .Verification}}
+					</td>
+					<td class="message">
+						<span class="message-wrapper">
+						{{if $.PageIsWiki}}
+							<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{.Summary | ctx.RenderUtils.RenderEmoji}}</span>
+						{{else}}
+							{{$commitLink:= printf "%s/commit/%s" $commitRepoLink (PathEscape .ID.String)}}
+							<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink $.Repository}}</span>
+						{{end}}
+						</span>
+						{{if IsMultilineCommitMessage .Message}}
+						<button class="ui button ellipsis-button" aria-expanded="false" data-global-click="onRepoEllipsisButtonClick">...</button>
+						{{end}}
+						{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}}
+						{{if IsMultilineCommitMessage .Message}}
+						<pre class="commit-body tw-hidden">{{ctx.RenderUtils.RenderCommitBody .Message $.Repository}}</pre>
+						{{end}}
+						{{if $.CommitsTagsMap}}
+							{{range (index $.CommitsTagsMap .ID.String)}}
+								{{- template "repo/tag/name" dict "AdditionalClasses" "tw-py-0" "RepoLink" $.Repository.Link "TagName" .TagName "IsRelease" (not .IsTag) -}}
+							{{end}}
+						{{end}}
+					</td>
+					{{if .Committer}}
+						<td class="tw-text-right">{{DateUtils.TimeSince .Committer.When}}</td>
+					{{else}}
+						<td class="tw-text-right">{{DateUtils.TimeSince .Author.When}}</td>
+					{{end}}
+					<td class="tw-text-right tw-py-0">
+						<button class="btn interact-bg tw-p-2 copy-commit-id" data-tooltip-content="{{ctx.Locale.Tr "copy_hash"}}" data-clipboard-text="{{.ID}}">{{svg "octicon-copy"}}</button>
+						{{/* at the moment, wiki doesn't support these "view" links like "view at history point" */}}
+						{{if not $.PageIsWiki}}
+							{{/* view single file diff */}}
+							{{if $.FileTreePath}}
+							<a class="btn interact-bg tw-p-2 view-single-diff" data-tooltip-content="{{ctx.Locale.Tr "repo.commits.view_file_diff"}}"
+								href="{{$commitRepoLink}}/commit/{{.ID.String}}?files={{$.FileTreePath}}"
+							>{{svg "octicon-file-diff"}}</a>
+							{{end}}
+
+							{{/* view at history point */}}
+							{{$viewCommitLink := printf "%s/src/commit/%s" $commitRepoLink (PathEscape .ID.String)}}
+							{{if $.FileTreePath}}{{$viewCommitLink = printf "%s/%s" $viewCommitLink (PathEscapeSegments $.FileTreePath)}}{{end}}
+							<a class="btn interact-bg tw-p-2 view-commit-path" data-tooltip-content="{{ctx.Locale.Tr "repo.commits.view_path"}}" href="{{$viewCommitLink}}">{{svg "octicon-file-code"}}</a>
+						{{end}}
+					</td>
+				</tr>
+			{{end}}
+		</tbody>
+	</table>
+</div>

options/locale/locale_zh-CN.ini

@@ -0,0 +1,4 @@
+[github-theme]
+verifed=已验证
+partially_verifed=部分验证
+unverifed=未验证

package.json

@@ -9,6 +9,8 @@
     "format": "prettier --write .",
     "commit": "npm run lint && npm run format && npm run build",
     "version": "node scripts/version.cjs",
+    "tr": "node scripts/translate.cjs",
+    "release": "npm run build && npm run tr",
     "install:clean": "npm cache clean --force && rm -rf node_modules package-lock.json && npm install"
   },
   "devDependencies": {

scripts/translate.cjs

@@ -0,0 +1,56 @@
+const fs = require("fs");
+const path = require("path");
+const child_process = require("child_process");
+const dotenv = require("dotenv");
+
+dotenv.config({ quiet: true });
+const rootDir = path.join(__dirname, "..");
+
+const pkgPath = path.join(rootDir, "package.json");
+const pkg = JSON.parse(fs.readFileSync(pkgPath));
+
+const githubSite = "https://raw.githubusercontent.com";
+const giteaRepo = "go-gitea/gitea";
+const githubBranchPath = "refs/heads/release";
+const githubTagPath = "refs/tags";
+const localePath = "options/locale";
+
+const [major, minor, patch, tag = ""] = pkg.version.split(".");
+
+console.log("Version: ", pkg.version);
+let versionPath = "";
+if (tag.includes("rc") || patch.includes("latest")) {
+  versionPath = `${githubBranchPath}/v${major}.${minor}`;
+} else {
+  versionPath = `${githubTagPath}/v${major}.${minor}.${patch}`;
+}
+
+const githubUrl = `${githubSite}/${giteaRepo}/${versionPath}/${localePath}`;
+
+const locales = fs.readdirSync(path.join(rootDir, localePath)).filter(file => file.endsWith(".ini"));
+
+// 使用立即执行异步函数
+(async () => {
+  for (const locale of locales) {
+    const localUrl = `${githubUrl}/${locale}`;
+    console.log("LocaleUrl: ", localUrl);
+    const themeLocale = fs.readFileSync(path.join(rootDir, localePath, locale), "utf-8");
+
+    const response = await fetch(localUrl);
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`);
+    }
+    let content = await response.text();
+    if (locale.includes("zh-CN")) {
+      content = content.replaceAll("工单", "议题").replaceAll("合并请求", "拉取请求");
+    }
+    fs.mkdirSync(path.join(rootDir, "dist", localePath), { recursive: true });
+    fs.writeFileSync(path.join(rootDir, "dist", localePath, locale), content + themeLocale);
+  }
+
+  if (process.env.SSH_SERVER && process.env.GITEA_PATH && process.env.SSH_USER) {
+    const cmd = `scp -r dist/options ${process.env.SSH_USER}@${process.env.SSH_SERVER}:${process.env.GITEA_PATH}`;
+    console.log("[translate] exec:", cmd);
+    child_process.execSync(cmd, { stdio: "inherit" });
+  }
+})();

src/core/github.ts

@@ -42,10 +42,10 @@ export type GithubColor = {
   };
   bgColor: {
     accent: { emphasis: string; muted: string };
-    attention: { muted: string };
+    attention: { emphasis: string; muted: string };
     emphasis: string;
     success: { emphasis: string; muted: string };
-    danger: { muted: string };
+    danger: { emphasis: string; muted: string };
     done: { emphasis: string };
     default: string;
     inset: string;
@@ -240,6 +240,12 @@ export function github2ThemeColor(githubColor: GithubColor): ThemeColor {
       success: {
         emphasis: githubColor.bgColor.success.emphasis,
       },
+      attention: {
+        emphasis: githubColor.bgColor.attention.emphasis,
+      },
+      danger: {
+        emphasis: githubColor.bgColor.danger.emphasis,
+      },
       done: {
         emphasis: githubColor.bgColor.done.emphasis,
       },

src/types/color/github.ts

@@ -53,9 +53,22 @@ export const github = {
        */
       emphasis: null,
     },
+    attention: {
+      /** 注意的背景颜色
+       * @issue `prMerge` 头像颜色
+       */
+      emphasis: null,
+    },
+    danger: {
+      /** 危险的背景颜色
+       * @issue `prMerge` 头像颜色
+       */
+      emphasis: null,
+    },
     done: {
       /** 完成的背景颜色
        * @issue `babel` 工单已关闭图标背景颜色
+       * @issue `prMerge` 头像颜色
        */
       emphasis: null,
     },

styles/components/actions.ts

@@ -139,13 +139,21 @@ export const runWorkflow = css`
 export const actionViewHeader = css`
   .action-view-header {
     .action-commit-summary {
+      a:hover {
+        text-decoration: inherit;
+      }
+      // 提前哈希
+      > a.muted:first-of-type {
+        text-decoration: underline;
+      }
       // 分支标签按钮
-      .ui.label {
+      .ui.ui.ui.label {
         background-color: ${themeVars.github.bgColor.accent.muted};
+        border-radius: ${otherThemeVars.border.radius};
         color: ${themeVars.github.fgColor.accent};
-        font-family: var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, monospace);
-        font-weight: 400;
         > a {
+          font-family: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, monospace;
+          font-weight: 400;
           opacity: 1;
         }
       }

styles/components/issue.ts

@@ -275,6 +275,11 @@ export const prBranch = css`
   }
 `;
 
+const botLabelStyle = {
+  height: "20px",
+  padding: "0 6px!important",
+  marginLeft: "4px",
+};
 // 评论
 export const comment = css`
   .comment .comment-container {
@@ -299,6 +304,26 @@ export const comment = css`
     .comment-header {
       padding: 4px 4px 4px 16px;
       min-height: 38px;
+      .comment-header-left {
+        // bot 标签
+        .ui.basic.label {
+          ${botLabelStyle}
+        }
+        a:has(relative-time){
+          text-decoration: underline;
+        }
+        // 已编辑按钮
+        .content-history-menu {
+          color: ${themeVars.color.text.light.num1} !important;
+          .menu .item {
+            font-size: 12px;
+            .ui.avatar {
+              height: 20px;
+              width: 20px;
+            }
+          }
+        }
+      }
     }
     .comment-header-right {
       > .item,
@@ -311,12 +336,6 @@ export const comment = css`
         height: 20px;
         padding: 0 6px;
       }
-      // 隐藏顶部菜单的表情按钮
-      // 无法使用此样式, 评论无表情时底部的表情按钮元素不会渲染, 这是一个先有鸡还是先有蛋的问题
-      // 很蛋疼, 希望 Gitea 早日使用 Github 的样式, 因为 Github 的更合理, 无论是操作的方便程度还是按钮的冗余度
-      // .ui.dropdown.action.select-reaction {
-      //   display: none;
-      // }
       .context-dropdown {
         height: 28px;
         padding: 0 6px;
@@ -412,7 +431,6 @@ export const prMerge = css`
   .repository.view.issue .comment-list .timeline-item.pull-merge-box {
     // 头像
     .timeline-avatar {
-      color: ${themeVars.color.white} !important;
       border-radius: 9999px;
       width: 40px;
       height: 40px;
@@ -423,34 +441,67 @@ export const prMerge = css`
         width: 24px;
         height: 24px;
       }
-      // 可以合并
-      &.green {
-        background-color: ${themeVars.github.bgColor.success.emphasis};
+      // PR 界面的 PR 操作评论
+      &.text {
+        color: ${themeVars.color.white} !important;
         border-radius: ${otherThemeVars.border.radius};
-        // 操作评论边框色
+        // 操作评论边框
         + .content > .ui.attached.segment {
-          border-left-color: ${themeVars.github.bgColor.success.emphasis};
-          border-right-color: ${themeVars.github.bgColor.success.emphasis};
-          &:first-child {
-            border-top-color: ${themeVars.github.bgColor.success.emphasis};
-          }
-          &:last-child {
-            border-bottom-color: ${themeVars.github.bgColor.success.emphasis};
+          border-width: 1.5px;
+        }
+        &.grey {
+          background-color: ${themeVars.color.text.light.num1};
+        }
+        &.green {
+          background-color: ${themeVars.github.bgColor.success.emphasis};
+          + .content > .ui.attached.segment {
+            border-left-color: ${themeVars.github.bgColor.success.emphasis};
+            border-right-color: ${themeVars.github.bgColor.success.emphasis};
+            &:first-child {
+              border-top-color: ${themeVars.github.bgColor.success.emphasis};
+            }
+            &:last-child {
+              border-bottom-color: ${themeVars.github.bgColor.success.emphasis};
+            }
           }
         }
-      }
-      // 已合并
-      &.purple {
-        background-color: ${themeVars.github.bgColor.done.emphasis};
-        border-radius: ${otherThemeVars.border.radius};
-        + .content > .ui.attached.segment {
-          border-left-color: ${themeVars.github.bgColor.done.emphasis};
-          border-right-color: ${themeVars.github.bgColor.done.emphasis};
-          &:first-child {
-            border-top-color: ${themeVars.github.bgColor.done.emphasis};
+        &.purple {
+          background-color: ${themeVars.github.bgColor.done.emphasis};
+          + .content > .ui.attached.segment {
+            border-left-color: ${themeVars.github.bgColor.done.emphasis};
+            border-right-color: ${themeVars.github.bgColor.done.emphasis};
+            &:first-child {
+              border-top-color: ${themeVars.github.bgColor.done.emphasis};
+            }
+            &:last-child {
+              border-bottom-color: ${themeVars.github.bgColor.done.emphasis};
+            }
           }
-          &:last-child {
-            border-bottom-color: ${themeVars.github.bgColor.done.emphasis};
+        }
+        &.yellow {
+          background-color: ${themeVars.github.bgColor.attention.emphasis};
+          + .content > .ui.attached.segment {
+            border-left-color: ${themeVars.github.bgColor.attention.emphasis};
+            border-right-color: ${themeVars.github.bgColor.attention.emphasis};
+            &:first-child {
+              border-top-color: ${themeVars.github.bgColor.attention.emphasis};
+            }
+            &:last-child {
+              border-bottom-color: ${themeVars.github.bgColor.attention.emphasis};
+            }
+          }
+        }
+        &.red {
+          background-color: ${themeVars.github.bgColor.danger.emphasis};
+          + .content > .ui.attached.segment {
+            border-left-color: ${themeVars.github.bgColor.danger.emphasis};
+            border-right-color: ${themeVars.github.bgColor.danger.emphasis};
+            &:first-child {
+              border-top-color: ${themeVars.github.bgColor.danger.emphasis};
+            }
+            &:last-child {
+              border-bottom-color: ${themeVars.github.bgColor.danger.emphasis};
+            }
           }
         }
       }
@@ -494,11 +545,9 @@ export const prMerge = css`
       padding: 16px;
       display: grid;
       gap: 8px;
-      &.no-header {
-        &::before,
-        &::after {
-          display: none;
-        }
+      &::before,
+      &::after {
+        display: none;
       }
     }
   }
@@ -523,10 +572,20 @@ export const timeline = css`
         &.event {
           // 修复覆盖后的位置问题
           padding-left: 15px;
-          .avatar {
+          // 避免锚中批准的头像
+          .avatar-with-link .avatar {
             width: 20px;
             height: 20px;
           }
+          // 批准时间的头像
+          // 头部居中偏移量(头像高度 - 标准行信息高度) / 2: (40px - 32px) / 2 = 4px
+          .timeline-avatar {
+            top: -4px;
+          }
+          // bot 标签
+          .comment-text-line .ui.basic.label {
+            ${botLabelStyle}
+          }
           .badge {
             border: 2px solid ${themeVars.color.body};
           }
@@ -627,6 +686,18 @@ export const issueSidebar = css`
             margin-top: 0 !important;
             margin-bottom: 0 !important;
           }
+          // 评审人
+          .ui.relaxed.list {
+            .item {
+              // 操作图标按钮
+              a.muted.icon {
+                color: ${themeVars.color.text.light.num1};
+                &:hover {
+                  color: ${themeVars.color.primary.self};
+                }
+              }
+            }
+          }
           // 标签菜单项
           .ui.dropdown > .menu > .scrolling.menu > .item:has(.item-secondary-info) {
             // 修复标签菜单中描述文本过长没有换行挤掉标签的问题

styles/index.ts

@@ -7,4 +7,4 @@ import "./public";
 // 组件样式
 import "./components";
 // 模板专属样式
-import "./templates";
+import "./templates";

styles/public/label.ts

@@ -129,6 +129,8 @@ export const shaLabel = css`
   // 验证提交附带的图标
   span.ui.label.commit-is-signed {
     height: 25px;
+    min-width: 35px;
+    justify-content: center;
     // 验证信任
     &.sign-trusted {
       border: 1.5px solid ${themeVars.color.green.badge.self} !important;
@@ -161,11 +163,19 @@ export const shaLabel = css`
         background-color: ${themeVars.color.red.badge.hover.bg} !important;
       }
     }
+    span {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+    }
   }
   span.ui.label.commit-is-signed,
   .ui.label.commit-id-short,
   .ui.label.commit-sign-badge {
     font-size: 12px;
+    .ui.avatar {
+      border-radius: 9999px;
+    }
   }
 `;
 

styles/templates/repo/commit_sign_badge.ts

@@ -0,0 +1,41 @@
+import { css, otherThemeVars, themeVars } from "src/types/vars";
+
+export const commitSignBadge = css`
+  a.ui.label.commit-id-short.github-theme-commit-sha {
+    gap: 8px;
+    padding: unset;
+    margin: unset;
+    height: 26px;
+    margin: 0 4px;
+    &.commit-is-signed {
+      &:hover {
+        background-color: unset !important;
+      }
+      span.ui.label.commit-sign-badge.commit-is-signed {
+        margin: unset;
+      }
+    }
+    .github-theme-sha {
+      border-radius: ${otherThemeVars.border.radius};
+      font-family:
+        -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji",
+        "Segoe UI Emoji";
+      font-weight: 500;
+      padding: 0px 8px;
+      height: 26px;
+      min-width: 85px; // 非等宽字体导致不对齐, 目前看到最大长度为 83px
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      &:hover {
+        background-color: ${themeVars.color.hover.self};
+      }
+    }
+  }
+  .ui.label.commit-sign-badge.github-theme-commit-sign-badge {
+    font-family:
+      -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji",
+      "Segoe UI Emoji";
+    font-weight: 500;
+  }
+`;

styles/templates/repo/commits_list.ts

@@ -0,0 +1,108 @@
+import { css, otherThemeVars, themeVars } from "src/types/vars";
+
+const primary = "primary" as const;
+const secondary = "secondary" as const;
+const metadata = "metadata" as const;
+const actions = "actions" as const;
+
+export const commitsList = css`
+  ul.github-theme-templates-commits-list {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    li.github-theme-commit {
+      border-bottom: 1px solid ${themeVars.color.secondary.self};
+      padding: 8px 16px;
+      display: grid;
+      grid-template-areas: "${primary} ${metadata} ${actions}" "${secondary} ${metadata} ${actions}";
+      grid-template-rows: repeat(2, auto);
+      grid-template-columns: minmax(30%, 1fr) minmax(0, max-content) min-content;
+      &:last-child {
+        border-bottom: none;
+        border-bottom-left-radius: ${otherThemeVars.border.radius};
+        border-bottom-right-radius: ${otherThemeVars.border.radius};
+      }
+      &:hover {
+        background-color: ${themeVars.color.hover.opaque};
+      }
+      .message {
+        grid-area: ${primary};
+        .commit-summary {
+          font-size: 16px;
+          font-weight: 500;
+          white-space: pre-wrap;
+        }
+        .ellipsis-button {
+          padding: unset;
+          height: 1.5rem;
+          min-width: 1.75rem;
+          background: unset;
+          border: unset;
+          vertical-align: bottom;
+          &:hover {
+            background: ${themeVars.color.hover.self};
+          }
+        }
+        .commit-body {
+          font-size: 12px;
+          font-weight: 400;
+          color: ${themeVars.color.text.light.num1};
+          margin: 8px 0;
+        }
+      }
+      .metadata {
+        grid-area: ${secondary};
+        font-size: 12px;
+        color: ${themeVars.color.text.light.num1};
+        display: flex;
+        align-items: center;
+        flex-direction: row;
+        gap: 4px;
+        img.ui.avatar {
+          border-radius: 9999px;
+          margin-right: 4px;
+        }
+        .ui.label svg {
+          min-width: 12px;
+          min-height: 12px;
+          width: 12px;
+          height: 12px;
+        }
+      }
+      .extra {
+        grid-area: ${metadata};
+        display: flex;
+        align-items: center;
+        flex-direction: row;
+        flex-wrap: wrap;
+        column-gap: 8px;
+        .github-theme-tag {
+          border-width: 1.5px;
+          border-radius: 9999px;
+          height: 25px;
+        }
+      }
+      .actions {
+        grid-area: ${actions};
+        display: flex;
+        align-items: center;
+        flex-direction: row;
+        gap: 4px;
+        color: ${themeVars.color.text.light.num1};
+        .github-theme-action {
+          justify-content: center;
+          height: 28px;
+          width: 28px;
+        }
+      }
+    }
+  }
+  @media (max-width: 767.98px) {
+    ul.github-theme-templates-commits-list {
+      li.github-theme-commit {
+        grid-template-areas: "${primary} ${primary}" "${metadata} ${actions}" "${secondary} ${actions}";
+        grid-template-rows: repeat(3, auto);
+      }
+    }
+  }
+`;

styles/templates/repo/index.ts

@@ -1,2 +1,4 @@
+import "./commit_sign_badge";
+import "./commits_list";
 import "./view_content";
 import "./view_list";

templates/repo/commit_sign_badge.tmpl

@@ -0,0 +1,97 @@
+{{/* Template attributes:
+* Commit
+* CommitBaseLink
+* CommitSignVerification
+If you'd like to modify this template, you could test it on the devtest page.
+ATTENTION: this template could be re-rendered many times (on the graph and commit list page),
+so this template should be kept as small as possible, DO NOT put large components like modal/dialog into it.
+*/}}
+{{- $commit := $.Commit -}}
+{{- $commitBaseLink := $.CommitBaseLink -}}
+{{- $verification := $.CommitSignVerification -}}{{- /* asymkey.CommitVerification */ -}}
+
+{{- $extraClass := "" -}}
+{{- $verified := false -}}
+{{- $signingUser := NIL -}}
+{{- $signingEmail := "" -}}
+{{- $msgReasonPrefix := "" -}}
+{{- $msgReason := "" -}}
+{{- $msgSigningKey := "" -}}
+
+{{- if $verification -}}
+	{{- $signingUser = $verification.SigningUser -}}
+	{{- $signingEmail = $verification.SigningEmail -}}
+	{{- $extraClass = print $extraClass " commit-is-signed" -}}
+	{{- if $verification.Verified -}}
+		{{- /* reason is "{name} / {key-id}" */ -}}
+		{{- $msgReason = $verification.Reason -}}
+		{{- $verified = true -}}
+		{{- if eq $verification.TrustStatus "trusted" -}}
+			{{- $extraClass = print $extraClass " sign-trusted" -}}
+		{{- else if eq $verification.TrustStatus "untrusted" -}}
+			{{- $extraClass = print $extraClass " sign-untrusted" -}}
+			{{- $msgReasonPrefix = ctx.Locale.Tr "repo.commits.signed_by_untrusted_user" -}}
+		{{- else -}}
+			{{- $extraClass = print $extraClass " sign-unmatched" -}}
+			{{- $msgReasonPrefix = ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched" -}}
+		{{- end -}}
+	{{- else -}}
+		{{- if $verification.Warning -}}
+			{{- $extraClass = print $extraClass " sign-warning" -}}
+		{{- else -}}
+			{{- $extraClass = "" -}}{{/* the commit is not signed */}}
+		{{- end -}}
+		{{- $msgReason = ctx.Locale.Tr $verification.Reason -}}{{- /* dirty part: it is the translation key ..... */ -}}
+	{{- end -}}
+
+	{{- if $msgReasonPrefix -}}
+		{{- $msgReason = print $msgReasonPrefix ": " $msgReason -}}
+	{{- end -}}
+
+	{{- if $verification.SigningSSHKey -}}
+		{{- $msgSigningKey = print (ctx.Locale.Tr "repo.commits.ssh_key_fingerprint") ": " $verification.SigningSSHKey.Fingerprint -}}
+	{{- else if $verification.SigningKey -}}{{- /* asymkey.GPGKey */ -}}
+		{{- $msgSigningKey = print (ctx.Locale.Tr "repo.commits.gpg_key_id") ": " $verification.SigningKey.PaddedKeyID -}}
+	{{- end -}}
+{{- end -}}
+
+{{- $github_verifed := "github-theme.verifed" -}}
+{{- $ctx_github_verifed := ctx.Locale.Tr $github_verifed -}}
+{{- $github_partially_verifed := "github-theme.partially_verifed" -}}
+{{- $ctx_github_partially_verifed := ctx.Locale.Tr $github_partially_verifed -}}
+{{- $github_unverifed := "github-theme.unverifed" -}}
+{{- $ctx_github_unverifed := ctx.Locale.Tr $github_unverifed -}}
+
+{{- if $commit -}}
+<a {{if $commitBaseLink}}href="{{$commitBaseLink}}/{{$commit.ID}}"{{end}} class="ui label commit-id-short {{$extraClass}} github-theme-commit-sha" rel="nofollow">
+{{- end -}}
+{{- if or (not $commit) $extraClass}}{{/* only show the lock icon if there is no commit info (icon only) or the commit is really signed */}}
+	<span class="ui label commit-sign-badge github-theme-commit-sign-badge {{$extraClass}}">
+		{{- if $verified -}}
+			{{- if and $signingUser $signingUser.ID -}}
+				<span data-tooltip-content="{{$msgReason}}">
+					{{if eq $ctx_github_verifed $github_verifed }}Verified
+					{{else}}{{$ctx_github_verifed}}{{end}}
+				</span>
+				<span data-tooltip-content="{{$msgSigningKey}}">{{ctx.AvatarUtils.Avatar $signingUser 16}}</span>
+			{{- else -}}
+				<span data-tooltip-content="{{$msgReason}}">
+					{{if eq $ctx_github_partially_verifed $github_partially_verifed }}Partially verified
+					{{else}}{{$ctx_github_partially_verifed}}{{end}}
+				</span>
+				<span data-tooltip-content="{{$msgSigningKey}}">{{ctx.AvatarUtils.AvatarByEmail $signingEmail "" 16}}</span>
+			{{- end -}}
+		{{- else -}}
+			<span data-tooltip-content="{{$msgReason}}">
+				{{if eq $ctx_github_unverifed $github_unverifed }}Unverified
+				{{else}}{{$ctx_github_unverifed}}{{end}}
+			</span>
+		{{- end -}}
+	</span>
+{{- end -}}
+{{- if $commit -}}
+	<span class="github-theme-sha">{{- ShortSha $commit.ID.String -}}</span>
+</a>
+{{- end -}}
+
+{{- /* This template should be kept as small as possible, DO NOT put large components like modal/dialog into it. */ -}}

templates/repo/commits_list.tmpl

@@ -0,0 +1,82 @@
+<div class="ui attached table segment commit-table">
+	<ul class="github-theme-templates-commits-list">
+		{{$commitRepoLink := $.RepoLink}}{{if $.CommitRepoLink}}{{$commitRepoLink = $.CommitRepoLink}}{{end}}
+		{{range.Commits}}
+			<li class="github-theme-commit">
+				{{/* 提交信息 */}}
+				<div class="message">
+					{{if $.PageIsWiki}}
+						<span class="commit-summary" title="{{.Summary}}">{{.Summary | ctx.RenderUtils.RenderEmoji}}</span>
+					{{else}}
+						{{$commitLink:= printf "%s/commit/%s" $commitRepoLink (PathEscape .ID.String)}}
+						<span class="commit-summary" title="{{.Summary}}">{{ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink $.Repository}}</span>
+					{{end}}
+					{{if IsMultilineCommitMessage .Message}}
+					<button class="ui button ellipsis-button" aria-expanded="false" data-global-click="onRepoEllipsisButtonClick">{{svg "octicon-ellipsis" 16}}</button>
+					{{end}}
+					{{if IsMultilineCommitMessage .Message}}
+					<pre class="commit-body tw-hidden">{{ctx.RenderUtils.RenderCommitBody .Message $.Repository}}</pre>
+					{{end}}
+				</div>
+				{{/* 提交者信息 */}}
+				<div class="metadata">
+					{{/* 头像 */}}
+					{{$userName := .Author.Name}}
+					{{if .User}}
+						{{if and .User.FullName DefaultShowFullName}}
+							{{$userName = .User.FullName}}
+						{{end}}
+						{{ctx.AvatarUtils.Avatar .User 16}}<a class="muted author-wrapper" href="{{.User.HomeLink}}">{{$userName}}</a>
+					{{else}}
+						{{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 16}}
+						<span class="author-wrapper">{{$userName}}</span>
+					{{end}}
+					{{/* 时间 */}}
+					·
+					{{if .Committer}}
+						{{DateUtils.TimeSince .Committer.When}}
+					{{else}}
+						{{DateUtils.TimeSince .Author.When}}
+					{{end}}
+					{{/* 状态 */}}
+					{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}}
+				</div>
+				{{/* 提交哈希 */}}
+				<div class="extra">
+					{{/* 标签 */}}
+					{{if $.CommitsTagsMap}}
+						{{range (index $.CommitsTagsMap .ID.String)}}
+							{{- template "repo/tag/name" dict "AdditionalClasses" "github-theme-tag" "RepoLink" $.Repository.Link "TagName" .TagName "IsRelease" (not .IsTag) -}}
+						{{end}}
+					{{end}}
+					{{$commitBaseLink := ""}}
+					{{if $.PageIsWiki}}
+						{{$commitBaseLink = printf "%s/wiki/commit" $commitRepoLink}}
+					{{else if $.PageIsPullCommits}}
+						{{$commitBaseLink = printf "%s/pulls/%d/commits" $commitRepoLink $.Issue.Index}}
+					{{else if $.Reponame}}
+						{{$commitBaseLink = printf "%s/commit" $commitRepoLink}}
+					{{end}}
+					{{template "repo/commit_sign_badge" dict "Commit" . "CommitBaseLink" $commitBaseLink "CommitSignVerification" .Verification}}
+				</div>
+				{{/* 操作 */}}
+				<div class="actions">
+					<button class="btn interact-bg copy-commit-id github-theme-action" data-tooltip-content="{{ctx.Locale.Tr "copy_hash"}}" data-clipboard-text="{{.ID}}">{{svg "octicon-copy"}}</button>
+					{{/* at the moment, wiki doesn't support these "view" links like "view at history point" */}}
+					{{if not $.PageIsWiki}}
+						{{/* view single file diff */}}
+						{{if $.FileTreePath}}
+						<a class="btn interact-bg view-single-diff github-theme-action" data-tooltip-content="{{ctx.Locale.Tr "repo.commits.view_file_diff"}}"
+							href="{{$commitRepoLink}}/commit/{{.ID.String}}?files={{$.FileTreePath}}"
+						>{{svg "octicon-file-diff"}}</a>
+						{{end}}
+						{{/* view at history point */}}
+						{{$viewCommitLink := printf "%s/src/commit/%s" $commitRepoLink (PathEscape .ID.String)}}
+						{{if $.FileTreePath}}{{$viewCommitLink = printf "%s/%s" $viewCommitLink (PathEscapeSegments $.FileTreePath)}}{{end}}
+						<a class="btn interact-bg view-commit-path github-theme-action" data-tooltip-content="{{ctx.Locale.Tr "repo.commits.view_path"}}" href="{{$viewCommitLink}}">{{svg "octicon-code"}}</a>
+					{{end}}
+				</div>
+			</li>
+		{{end}}
+	</ul>
+</div>

themes/colorblind-dark.css.ts

@@ -25,7 +25,7 @@ export const colorblindDarkGithubColors: GithubColor = {
   },
   bgColor: {
     ...darkGithubColors.bgColor,
-    danger: { muted: "#db6d281a" },
+    danger: { emphasis: "#bd561d", muted: "#db6d281a" },
     success: { emphasis: "#1f6feb", muted: "#388bfd33" },
   },
   borderColor: {

themes/colorblind-light.css.ts

@@ -25,7 +25,7 @@ export const colorblindLightGithubColors: GithubColor = {
   },
   bgColor: {
     ...lightGithubColors.bgColor,
-    danger: { muted: "#fff1e5" },
+    danger: { emphasis: "#bc4c00", muted: "#fff1e5" },
     success: { emphasis: "#0969da", muted: "#ddf4ff" },
   },
   borderColor: {

themes/dark.css.ts

@@ -45,8 +45,8 @@ export const darkGithubColors: GithubColor = {
   },
   bgColor: {
     accent: { emphasis: "#1f6feb", muted: "#388bfd1a" },
-    attention: { muted: "#bb800926" },
-    danger: { muted: "#f851491a" },
+    attention: { emphasis: "#9e6a03", muted: "#bb800926" },
+    danger: { emphasis: "#da3633", muted: "#f851491a" },
     default: "#0d1117",
     done: { emphasis: "#8957e5" },
     emphasis: "#3d444d",

themes/light.css.ts

@@ -45,8 +45,8 @@ export const lightGithubColors: GithubColor = {
   },
   bgColor: {
     accent: { emphasis: "#0969da", muted: "#ddf4ff" },
-    attention: { muted: "#fff8c5" },
-    danger: { muted: "#ffebe9" },
+    attention: { emphasis: "#9a6700", muted: "#fff8c5" },
+    danger: { emphasis: "#cf222e", muted: "#ffebe9" },
     default: "#ffffff",
     done: { emphasis: "#8250df" },
     emphasis: "#25292e",

themes/soft-dark.css.ts

@@ -39,8 +39,8 @@ export const softDarkGithubColors: GithubColor = {
   },
   bgColor: {
     accent: { emphasis: "#316dca", muted: "#4184e41a" },
-    attention: { muted: "#ae7c1426" },
-    danger: { muted: "#e5534b1a" },
+    attention: { emphasis: "#966600", muted: "#ae7c1426" },
+    danger: { emphasis: "#c93c37", muted: "#e5534b1a" },
     default: "#212830",
     done: { emphasis: "#8256d0" },
     emphasis: "#3d444d",