Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve commit record's ui in comment list #26619

Merged
merged 13 commits into from
Mar 14, 2024
Merged

Improve commit record's ui in comment list #26619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
006572c
improve
yp05327 Aug 21, 2023
b995b60
Merge branch 'main' into improve-repo-comment-list-detail
yp05327 Aug 22, 2023
7e92ff1
improve
yp05327 Aug 22, 2023
e4c89d1
Update web_src/css/repo.css
silverwind Aug 22, 2023
2de63e7
improve
yp05327 Aug 23, 2023
8d428d6
Merge branch 'main' into improve-repo-comment-list-detail
yp05327 Nov 6, 2023
046fe6c
Merge branch 'main' into improve-repo-comment-list-detail
yp05327 Mar 11, 2024
7099df7
Merge branch 'main' into improve-repo-comment-list-detail
yp05327 Mar 13, 2024
691546d
remove
yp05327 Mar 13, 2024
728f8a9
remove
yp05327 Mar 13, 2024
34c4e14
remove
yp05327 Mar 13, 2024
f879968
use flex-text-block
silverwind Mar 14, 2024
abc4168
Merge branch 'main' into improve-repo-comment-list-detail
GiteaBot Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions templates/repo/issue/view_content/comments.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
</span>
{{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>
</div>
</div>
Expand All @@ -160,7 +160,7 @@
{{template "shared/user/authorlink" .Poster}}
{{ctx.Locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr}}
</span>
<div class="detail">
<div class="detail flex-text-block">
{{svg "octicon-git-commit"}}
<span class="text grey muted-links">{{.Content | SanitizeHTML}}</span>
</div>
Expand Down Expand Up @@ -252,7 +252,7 @@
{{ctx.Locale.Tr "repo.issues.stop_tracking_history" $createdStr}}
</span>
{{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}}
<div class="detail">
<div class="detail flex-text-block">
{{svg "octicon-clock"}}
{{if .RenderedContent}}
{{/* compatibility with time comments made before v1.21 */}}
Expand All @@ -271,7 +271,7 @@
{{ctx.Locale.Tr "repo.issues.add_time_history" $createdStr}}
</span>
{{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}}
<div class="detail">
<div class="detail flex-text-block">
{{svg "octicon-clock"}}
{{if .RenderedContent}}
{{/* compatibility with time comments made before v1.21 */}}
Expand Down Expand Up @@ -331,7 +331,7 @@
{{ctx.Locale.Tr "repo.issues.dependency.added_dependency" $createdStr}}
</span>
{{if .DependentIssue}}
<div class="detail">
<div class="detail flex-text-block">
{{svg "octicon-plus"}}
<span class="text grey muted-links">
<a href="{{.DependentIssue.Link}}">
Expand All @@ -354,8 +354,8 @@
{{ctx.Locale.Tr "repo.issues.dependency.removed_dependency" $createdStr}}
</span>
{{if .DependentIssue}}
<div class="detail">
<span class="text grey muted-links">{{svg "octicon-trash"}}</span>
<div class="detail flex-text-block">
{{svg "octicon-trash"}}
<span class="text grey muted-links">
<a href="{{.DependentIssue.Link}}">
{{if eq .DependentIssue.RepoID .Issue.RepoID}}
Expand Down Expand Up @@ -506,7 +506,7 @@

{{ctx.Locale.Tr "repo.issues.del_time_history" $createdStr}}
</span>
<div class="detail">
<div class="detail flex-text-block">
{{svg "octicon-clock"}}
{{if .RenderedContent}}
{{/* compatibility with time comments made before v1.21 */}}
Expand Down
6 changes: 1 addition & 5 deletions web_src/css/repo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,11 +1065,7 @@

.repository.view.issue .comment-list .event .detail {
margin-top: 4px;
margin-left: 14px;
}

.repository.view.issue .comment-list .event .detail .svg {
margin-right: 2px;
margin-left: 15px;
}

silverwind marked this conversation as resolved.
Show resolved Hide resolved
.repository.view.issue .comment-list .event .segments {
Expand Down