From 3b139fa3a37b2ab42d82370d6835b2f7d7822b1d Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sun, 8 Oct 2023 01:26:27 +0200
Subject: [PATCH] Improve feed icons and feed merge text color (#27498)
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
---
modules/templates/util_misc.go | 24 ++++++++++++++----------
templates/user/dashboard/feeds.tmpl | 6 +++---
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/modules/templates/util_misc.go b/modules/templates/util_misc.go
index fe02e4b0c3..6c1b4ab240 100644
--- a/modules/templates/util_misc.go
+++ b/modules/templates/util_misc.go
@@ -74,27 +74,31 @@ func ActionIcon(opType activities_model.ActionType) string {
switch opType {
case activities_model.ActionCreateRepo, activities_model.ActionTransferRepo, activities_model.ActionRenameRepo:
return "repo"
- case activities_model.ActionCommitRepo, activities_model.ActionPushTag, activities_model.ActionDeleteTag, activities_model.ActionDeleteBranch:
+ case activities_model.ActionCommitRepo:
return "git-commit"
- case activities_model.ActionCreateIssue:
- return "issue-opened"
- case activities_model.ActionCreatePullRequest:
- return "git-pull-request"
- case activities_model.ActionCommentIssue, activities_model.ActionCommentPull:
- return "comment-discussion"
+ case activities_model.ActionDeleteBranch:
+ return "git-branch"
case activities_model.ActionMergePullRequest, activities_model.ActionAutoMergePullRequest:
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"
case activities_model.ActionReopenIssue, activities_model.ActionReopenPullRequest:
return "issue-reopened"
+ case activities_model.ActionCommentIssue, activities_model.ActionCommentPull:
+ return "comment-discussion"
case activities_model.ActionMirrorSyncPush, activities_model.ActionMirrorSyncCreate, activities_model.ActionMirrorSyncDelete:
return "mirror"
case activities_model.ActionApprovePullRequest:
return "check"
case activities_model.ActionRejectPullRequest:
- return "diff"
- case activities_model.ActionPublishRelease:
+ return "file-diff"
+ case activities_model.ActionPublishRelease, activities_model.ActionPushTag, activities_model.ActionDeleteTag:
return "tag"
case activities_model.ActionPullReviewDismissed:
return "x"
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index 08b3377aab..c986dcfb44 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -109,12 +109,12 @@
<div class="markup gt-font-14">{{RenderMarkdownToHtml ctx $comment}}</div>
{{end}}
{{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"}}
<span class="text truncate issue title">{{(.GetIssueTitle ctx) | RenderEmoji $.Context | RenderCodeBlock}}</span>
{{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">{{index .GetIssueInfos 2 | RenderEmoji $.Context}}</div>
+ <div class="flex-item-body text black">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</div>
+ <div class="flex-item-body text black">{{index .GetIssueInfos 2 | RenderEmoji $.Context}}</div>
{{end}}
</div>
<div class="flex-item-trailing">