mirror of
https://github.com/go-gitea/gitea
synced 2024-12-25 01:54:26 +00:00
Backport #27498 by @silverwind 1. Improve various feed icons 2. Fix merge message color <img width="763" alt="image" src="https://github.com/go-gitea/gitea/assets/115237/3f5bcb23-6d90-4c63-85f2-46bd7e1c96d6"> <img width="769" alt="image" src="https://github.com/go-gitea/gitea/assets/115237/466c37b4-e2f4-42bb-922d-b86596cdc6d0"> Fixes: https://github.com/go-gitea/gitea/issues/27495 Continues: https://github.com/go-gitea/gitea/pull/27356 Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
parent
993178b45f
commit
8885108c42
@ -74,27 +74,31 @@ func ActionIcon(opType activities_model.ActionType) string {
|
|||||||
switch opType {
|
switch opType {
|
||||||
case activities_model.ActionCreateRepo, activities_model.ActionTransferRepo, activities_model.ActionRenameRepo:
|
case activities_model.ActionCreateRepo, activities_model.ActionTransferRepo, activities_model.ActionRenameRepo:
|
||||||
return "repo"
|
return "repo"
|
||||||
case activities_model.ActionCommitRepo, activities_model.ActionPushTag, activities_model.ActionDeleteTag, activities_model.ActionDeleteBranch:
|
case activities_model.ActionCommitRepo:
|
||||||
return "git-commit"
|
return "git-commit"
|
||||||
case activities_model.ActionCreateIssue:
|
case activities_model.ActionDeleteBranch:
|
||||||
return "issue-opened"
|
return "git-branch"
|
||||||
case activities_model.ActionCreatePullRequest:
|
|
||||||
return "git-pull-request"
|
|
||||||
case activities_model.ActionCommentIssue, activities_model.ActionCommentPull:
|
|
||||||
return "comment-discussion"
|
|
||||||
case activities_model.ActionMergePullRequest, activities_model.ActionAutoMergePullRequest:
|
case activities_model.ActionMergePullRequest, activities_model.ActionAutoMergePullRequest:
|
||||||
return "git-merge"
|
return "git-merge"
|
||||||
case activities_model.ActionCloseIssue, activities_model.ActionClosePullRequest:
|
case activities_model.ActionCreatePullRequest:
|
||||||
|
return "git-pull-request"
|
||||||
|
case activities_model.ActionClosePullRequest:
|
||||||
|
return "git-pull-request-closed"
|
||||||
|
case activities_model.ActionCreateIssue:
|
||||||
|
return "issue-opened"
|
||||||
|
case activities_model.ActionCloseIssue:
|
||||||
return "issue-closed"
|
return "issue-closed"
|
||||||
case activities_model.ActionReopenIssue, activities_model.ActionReopenPullRequest:
|
case activities_model.ActionReopenIssue, activities_model.ActionReopenPullRequest:
|
||||||
return "issue-reopened"
|
return "issue-reopened"
|
||||||
|
case activities_model.ActionCommentIssue, activities_model.ActionCommentPull:
|
||||||
|
return "comment-discussion"
|
||||||
case activities_model.ActionMirrorSyncPush, activities_model.ActionMirrorSyncCreate, activities_model.ActionMirrorSyncDelete:
|
case activities_model.ActionMirrorSyncPush, activities_model.ActionMirrorSyncCreate, activities_model.ActionMirrorSyncDelete:
|
||||||
return "mirror"
|
return "mirror"
|
||||||
case activities_model.ActionApprovePullRequest:
|
case activities_model.ActionApprovePullRequest:
|
||||||
return "check"
|
return "check"
|
||||||
case activities_model.ActionRejectPullRequest:
|
case activities_model.ActionRejectPullRequest:
|
||||||
return "diff"
|
return "file-diff"
|
||||||
case activities_model.ActionPublishRelease:
|
case activities_model.ActionPublishRelease, activities_model.ActionPushTag, activities_model.ActionDeleteTag:
|
||||||
return "tag"
|
return "tag"
|
||||||
case activities_model.ActionPullReviewDismissed:
|
case activities_model.ActionPullReviewDismissed:
|
||||||
return "x"
|
return "x"
|
||||||
|
@ -106,12 +106,12 @@
|
|||||||
<div class="flex-item-body">{{$comment | RenderEmoji $.Context | RenderCodeBlock}}</div>
|
<div class="flex-item-body">{{$comment | RenderEmoji $.Context | RenderCodeBlock}}</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{else if .GetOpType.InActions "merge_pull_request"}}
|
{{else if .GetOpType.InActions "merge_pull_request"}}
|
||||||
<div class="flex-item-body">{{index .GetIssueInfos 1}}</div>
|
<div class="flex-item-body text black">{{index .GetIssueInfos 1}}</div>
|
||||||
{{else if .GetOpType.InActions "close_issue" "reopen_issue" "close_pull_request" "reopen_pull_request"}}
|
{{else if .GetOpType.InActions "close_issue" "reopen_issue" "close_pull_request" "reopen_pull_request"}}
|
||||||
<span class="text truncate issue title">{{(.GetIssueTitle ctx) | RenderEmoji $.Context | RenderCodeBlock}}</span>
|
<span class="text truncate issue title">{{(.GetIssueTitle ctx) | RenderEmoji $.Context | RenderCodeBlock}}</span>
|
||||||
{{else if .GetOpType.InActions "pull_review_dismissed"}}
|
{{else if .GetOpType.InActions "pull_review_dismissed"}}
|
||||||
<div class="flex-item-body">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</div>
|
<div class="flex-item-body text black">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</div>
|
||||||
<div class="flex-item-body">{{index .GetIssueInfos 2 | RenderEmoji $.Context}}</div>
|
<div class="flex-item-body text black">{{index .GetIssueInfos 2 | RenderEmoji $.Context}}</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
<div class="flex-item-body">{{TimeSince .GetCreate ctx.Locale}}</div>
|
<div class="flex-item-body">{{TimeSince .GetCreate ctx.Locale}}</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user