diff options
| author | silverwind <me@silverwind.io> | 2023-10-08 01:26:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-07 23:26:27 +0000 |
| commit | 3b139fa3a37b2ab42d82370d6835b2f7d7822b1d (patch) | |
| tree | b71f4112a32030fbb04d03cc165eaa3aa98972da /modules | |
| parent | e51f96829f78d2dbf3633b036c9d9a49afd28fe4 (diff) | |
| download | gitea-3b139fa3a37b2ab42d82370d6835b2f7d7822b1d.tar.gz gitea-3b139fa3a37b2ab42d82370d6835b2f7d7822b1d.zip | |
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
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/templates/util_misc.go | 24 |
1 files changed, 14 insertions, 10 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" |