realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Improve commit record's ui in comment list (#26619)

Browse source 
Before:

![image](https://github.com/go-gitea/gitea/assets/18380374/795f9941-9989-4045-b0fc-d6dd0262269b)

![image](https://github.com/go-gitea/gitea/assets/18380374/f6505f5e-4248-456e-a98d-e714c6484b2f)

After:

![image](https://github.com/go-gitea/gitea/assets/18380374/321dda1e-6999-4851-afff-2e6c8d20367b)

![image](https://github.com/go-gitea/gitea/assets/18380374/182f18d1-2295-4004-852b-c0ebb498b411)

---------

Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit ce085b26fc5076b36c55e6a0a30ba8f11105c0bf)
This commit is contained in:
yp05327 2024-03-15 04:01:16 +09:00 committed by Earl Warren
parent 989dc10cf2
commit ed1798f66d
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 0579CB2928A78A00
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
templates/repo/issue/view_content/comments.tmpl
View file

@ -148,7 +148,7 @@
</span> </span>
{{if eq .RefAction 3}}</del>{{end}} {{if eq .RefAction 3}}</del>{{end}}
<div class="detail"> <div class="detail flex-text-block">
<span class="text grey muted-links"><a href="{{.RefIssueLink ctx}}"><b>{{.RefIssueTitle ctx}}</b> {{.RefIssueIdent ctx}}</a></span> <span class="text grey muted-links"><a href="{{.RefIssueLink ctx}}"><b>{{.RefIssueTitle ctx}}</b> {{.RefIssueIdent ctx}}</a></span>
</div> </div>
</div> </div>
@ -164,7 +164,7 @@
{{ctx.Locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr}} {{ctx.Locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr}}
{{end}} {{end}}
</span> </span>
<div class="detail"> <div class="detail flex-text-block">
{{svg "octicon-git-commit"}} {{svg "octicon-git-commit"}}
<span class="text grey muted-links">{{.Content | SanitizeHTML}}</span> <span class="text grey muted-links">{{.Content | SanitizeHTML}}</span>
</div> </div>
@ -256,7 +256,7 @@
{{ctx.Locale.Tr "repo.issues.stop_tracking_history" $createdStr}} {{ctx.Locale.Tr "repo.issues.stop_tracking_history" $createdStr}}
</span> </span>
{{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}} {{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}}
<div class="detail"> <div class="detail flex-text-block">
{{svg "octicon-clock"}} {{svg "octicon-clock"}}
{{if .RenderedContent}} {{if .RenderedContent}}
{{/* compatibility with time comments made before v1.21 */}} {{/* compatibility with time comments made before v1.21 */}}
@ -275,7 +275,7 @@
{{ctx.Locale.Tr "repo.issues.add_time_history" $createdStr}} {{ctx.Locale.Tr "repo.issues.add_time_history" $createdStr}}
</span> </span>
{{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}} {{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}}
<div class="detail"> <div class="detail flex-text-block">
{{svg "octicon-clock"}} {{svg "octicon-clock"}}
{{if .RenderedContent}} {{if .RenderedContent}}
{{/* compatibility with time comments made before v1.21 */}} {{/* compatibility with time comments made before v1.21 */}}
@ -335,7 +335,7 @@
{{ctx.Locale.Tr "repo.issues.dependency.added_dependency" $createdStr}} {{ctx.Locale.Tr "repo.issues.dependency.added_dependency" $createdStr}}
</span> </span>
{{if .DependentIssue}} {{if .DependentIssue}}
<div class="detail"> <div class="detail flex-text-block">
{{svg "octicon-plus"}} {{svg "octicon-plus"}}
<span class="text grey muted-links"> <span class="text grey muted-links">
<a href="{{.DependentIssue.Link}}"> <a href="{{.DependentIssue.Link}}">
@ -358,8 +358,8 @@
{{ctx.Locale.Tr "repo.issues.dependency.removed_dependency" $createdStr}} {{ctx.Locale.Tr "repo.issues.dependency.removed_dependency" $createdStr}}
</span> </span>
{{if .DependentIssue}} {{if .DependentIssue}}
<div class="detail"> <div class="detail flex-text-block">
<span class="text grey muted-links">{{svg "octicon-trash"}}</span> {{svg "octicon-trash"}}
<span class="text grey muted-links"> <span class="text grey muted-links">
<a href="{{.DependentIssue.Link}}"> <a href="{{.DependentIssue.Link}}">
{{if eq .DependentIssue.RepoID .Issue.RepoID}} {{if eq .DependentIssue.RepoID .Issue.RepoID}}
@ -510,7 +510,7 @@
{{ctx.Locale.Tr "repo.issues.del_time_history" $createdStr}} {{ctx.Locale.Tr "repo.issues.del_time_history" $createdStr}}
</span> </span>
<div class="detail"> <div class="detail flex-text-block">
{{svg "octicon-clock"}} {{svg "octicon-clock"}}
{{if .RenderedContent}} {{if .RenderedContent}}
{{/* compatibility with time comments made before v1.21 */}} {{/* compatibility with time comments made before v1.21 */}}

6
web_src/css/repo.css
View file

@ -1065,11 +1065,7 @@
.repository.view.issue .comment-list .event .detail { .repository.view.issue .comment-list .event .detail {
margin-top: 4px; margin-top: 4px;
margin-left: 14px; margin-left: 15px;
}
.repository.view.issue .comment-list .event .detail .svg {
margin-right: 2px;
} }
.repository.view.issue .comment-list .event .segments { .repository.view.issue .comment-list .event .segments {