mirror of
https://github.com/lutinglt/gitea-github-theme.git
synced 2026-04-13 23:11:37 +08:00
Compare commits
5 Commits
ca7207db06
...
2b2f2e8a1e
| Author | SHA1 | Date | |
|---|---|---|---|
|
2b2f2e8a1e | ||
|
|
2a95d85fb6 | ||
|
|
e2838df051 | ||
|
|
c1a0f96b6c | ||
|
|
3084a5f54e |
10
CHANGELOG.md
10
CHANGELOG.md
@@ -2,14 +2,16 @@
|
||||
|
||||
#### 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.
|
||||
|
||||
##### 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.
|
||||
|
||||
@@ -48,8 +48,8 @@ accepted.
|
||||
|
||||
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 `data/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
|
||||
|
||||
|
||||
81
gitea/templates/repo/commit_sign_badge.tmpl
Normal file
81
gitea/templates/repo/commit_sign_badge.tmpl
Normal file
@@ -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. */ -}}
|
||||
89
gitea/templates/repo/commits_list.tmpl
Normal file
89
gitea/templates/repo/commits_list.tmpl
Normal file
@@ -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>
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "gitea-github-theme",
|
||||
"version": "1.25.3.rc",
|
||||
"version": "1.25.3",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite build --mode dev",
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
|
||||
@@ -412,7 +412,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 +422,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};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
35
styles/templates/repo/commit_sign_badge.ts
Normal file
35
styles/templates/repo/commit_sign_badge.ts
Normal file
@@ -0,0 +1,35 @@
|
||||
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};
|
||||
}
|
||||
}
|
||||
}
|
||||
`;
|
||||
108
styles/templates/repo/commits_list.ts
Normal file
108
styles/templates/repo/commits_list.ts
Normal file
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
`;
|
||||
@@ -1,2 +1,4 @@
|
||||
import "./commit_sign_badge";
|
||||
import "./commits_list";
|
||||
import "./view_content";
|
||||
import "./view_list";
|
||||
|
||||
81
templates/repo/commit_sign_badge.tmpl
Normal file
81
templates/repo/commit_sign_badge.tmpl
Normal file
@@ -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}} 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 {{$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 -}}
|
||||
<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. */ -}}
|
||||
82
templates/repo/commits_list.tmpl
Normal file
82
templates/repo/commits_list.tmpl
Normal file
@@ -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>
|
||||
@@ -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: {
|
||||
|
||||
@@ -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: {
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user