Skip to content

Commit be23b73

Browse files
denyskonsilverwind
denyskon
and
silverwind
authored
Restructure issue list template, styles (#25750)
This PR does various modifications on the issue list shared template: - restructure layout to achieve better responsiveness - fix various style issues - restructure styles (better result with less code :) - remove numerous `gt-*` patches and other unneeded classes -> use existing css classes <details> <summary>Before:</summary> ![Bildschirmfoto vom 2023-07-07 14-35-00](https://github.com/go-gitea/gitea/assets/47871822/5301fc80-d58b-41c2-8090-5867e2e8459c) ![Bildschirmfoto vom 2023-07-07 14-35-19](https://github.com/go-gitea/gitea/assets/47871822/d36ab691-7dc4-44bb-a8f6-a4105a2a6777) ![Bildschirmfoto vom 2023-07-07 14-35-43](https://github.com/go-gitea/gitea/assets/47871822/0762c852-eb40-4b00-8757-c5dbfd2ae569) </details> <details> <summary>After:</summary> ![Bildschirmfoto vom 2023-07-07 14-32-04](https://github.com/go-gitea/gitea/assets/47871822/0ac42d36-f98f-451a-b556-70c913d19df8) ![Bildschirmfoto vom 2023-07-07 14-31-32](https://github.com/go-gitea/gitea/assets/47871822/520fac9c-33e3-4290-bfe1-6e941f1100f8) ![Bildschirmfoto vom 2023-07-07 14-31-14](https://github.com/go-gitea/gitea/assets/47871822/05ad46bb-3c67-403d-85b8-d12d64f99c59) </details> --------- Co-authored-by: silverwind <me@silverwind.io>
1 parent 84c7865 commit be23b73

File tree

5 files changed

+114
-148
lines changed

5 files changed

+114
-148
lines changed

‎templates/package/shared/list.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
</form>
1515
<div class="ui {{if .PackageDescriptors}}issue list{{end}}">
1616
{{range .PackageDescriptors}}
17-
<li class="item gt-df gt-py-3">
17+
<li class="item">
1818
<div class="issue-item-main">
19-
<div class="issue-item-top-row">
19+
<div class="issue-item-title">
2020
<a class="title" href="{{.FullWebLink}}">{{.Package.Name}}</a>
2121
<span class="ui label">{{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}</span>
2222
</div>
23-
<div class="desc issue-item-bottom-row">
23+
<div class="issue-item-body">
2424
{{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}}
2525
{{$hasRepositoryAccess := false}}
2626
{{if .Repository}}

‎templates/package/shared/versionlist.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
</form>
2121
<div class="ui {{if .PackageDescriptors}}issue list{{end}}">
2222
{{range .PackageDescriptors}}
23-
<li class="item gt-df gt-py-3">
23+
<li class="item">
2424
<div class="issue-item-main">
25-
<div class="issue-item-top-row">
25+
<div class="issue-item-title">
2626
<a class="title" href="{{.FullWebLink}}">{{.Version.LowerVersion}}</a>
2727
</div>
28-
<div class="desc issue-item-bottom-row">
28+
<div class="issue-item-body">
2929
{{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
3030
</div>
3131
</div>

‎templates/repo/actions/runs_list.tmpl

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
</div>
77
{{end}}
88
{{range .Runs}}
9-
<li class="item gt-df gt-py-3">
10-
<div class="issue-item-left issue-item-icon gt-df gt-items-start">
9+
<li class="item action-item">
10+
<div class="issue-item-left issue-item-icon">
1111
{{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
1212
</div>
1313
<div class="issue-item-main action-item-main">
14-
<div class="issue-item-top-row">
14+
<div class="issue-item-title">
1515
<a class="index gt-no-underline title action-item-title" title="{{.Title}}" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
1616
{{- .Title -}}
1717
</a>
1818
</div>
19-
<div class="desc issue-item-bottom-row">
19+
<div class="issue-item-body">
2020
<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>
2121
: {{$.locale.Tr "actions.runs.commit"}}
2222
<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>
@@ -32,8 +32,8 @@
3232
{{end}}
3333
</div>
3434
<div class="action-item-right">
35-
<div>{{svg "octicon-calendar" 16 "gt-mr-2"}}{{TimeSinceUnix .Updated $.locale}}</div>
36-
<div>{{svg "octicon-stopwatch" 16 "gt-mr-2"}}{{.Duration}}</div>
35+
<div class="flex-text-block">{{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated $.locale}}</div>
36+
<div class="flex-text-block">{{svg "octicon-stopwatch" 16}}{{.Duration}}</div>
3737
</div>
3838
</li>
3939
{{end}}

‎templates/shared/issuelist.tmpl

+61-59
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="issue list">
22
{{$approvalCounts := .ApprovalCounts}}
33
{{range .Issues}}
4-
<li class="item gt-df gt-py-3">
5-
<div class="issue-item-left gt-df gt-items-start">
4+
<li class="item">
5+
<div class="issue-item-left">
66
{{if $.CanWriteIssuesOrPulls}}
77
<input type="checkbox" autocomplete="off" class="issue-checkbox gt-mt-2 gt-mr-4" data-issue-id={{.ID}} aria-label="{{$.locale.Tr "repo.issues.action_check"}} &quot;{{.Title}}&quot;">
88
{{end}}
@@ -11,21 +11,49 @@
1111
</div>
1212
</div>
1313
<div class="issue-item-main">
14-
<div class="issue-item-top-row">
15-
<a class="title gt-no-underline issue-title" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">{{RenderEmoji $.Context .Title | RenderCodeBlock}}</a>
16-
{{if .IsPull}}
17-
{{if (index $.CommitStatuses .PullRequest.ID)}}
18-
{{template "repo/commit_statuses" dict "Status" (index $.CommitLastStatus .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID) "root" $}}
14+
<div class="issue-item-header">
15+
<div class="issue-item-title">
16+
<a class="title gt-no-underline issue-title" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">{{RenderEmoji $.Context .Title | RenderCodeBlock}}</a>
17+
{{if .IsPull}}
18+
{{if (index $.CommitStatuses .PullRequest.ID)}}
19+
{{template "repo/commit_statuses" dict "Status" (index $.CommitLastStatus .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID) "root" $}}
20+
{{end}}
1921
{{end}}
20-
{{end}}
21-
<span class="labels-list gt-ml-2">
22-
{{range .Labels}}
23-
<a href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}{{if ne $.listType "milestone"}}&milestone={{$.MilestoneID}}{{end}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{RenderLabel $.Context .}}</a>
22+
<span class="labels-list gt-ml-2">
23+
{{range .Labels}}
24+
<a href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}{{if ne $.listType "milestone"}}&milestone={{$.MilestoneID}}{{end}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{RenderLabel $.Context .}}</a>
25+
{{end}}
26+
</span>
27+
</div>
28+
{{if or .TotalTrackedTime .Assignees .NumComments}}
29+
<div class="issue-item-right">
30+
{{if .TotalTrackedTime}}
31+
<div class="text grey flex-text-block">
32+
{{svg "octicon-clock" 16}}
33+
{{.TotalTrackedTime | Sec2Time}}
34+
</div>
35+
{{end}}
36+
{{if .Assignees}}
37+
<div class="text grey">
38+
{{range .Assignees}}
39+
<a class="ui assignee gt-no-underline" href="{{.HomeLink}}" data-tooltip-content="{{.GetDisplayName}}">
40+
{{avatar $.Context . 20}}
41+
</a>
42+
{{end}}
43+
</div>
44+
{{end}}
45+
{{if .NumComments}}
46+
<div class="text grey">
47+
<a class="gt-no-underline muted flex-text-inline" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
48+
{{svg "octicon-comment" 16}}{{.NumComments}}
49+
</a>
50+
</div>
2451
{{end}}
25-
</span>
52+
</div>
53+
{{end}}
2654
</div>
27-
<div class="desc issue-item-bottom-row">
28-
<a class="index gt-ml-0 gt-mr-2" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
55+
<div class="issue-item-body">
56+
<a class="index" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
2957
{{if eq $.listType "dashboard"}}
3058
{{.Repo.FullName}}#{{.Index}}
3159
{{else}}
@@ -41,14 +69,14 @@
4169
{{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
4270
{{end}}
4371
{{if .IsPull}}
44-
<div class="branches gt-df gt-ac">
72+
<div class="branches flex-text-inline">
4573
<div class="branch">
4674
<a href="{{.PullRequest.BaseRepo.Link}}/src/branch/{{PathEscapeSegments .PullRequest.BaseBranch}}">
4775
{{/* inline to remove the spaces between spans */}}
4876
{{if ne .RepoID .PullRequest.BaseRepoID}}<span class="truncated-name">{{.PullRequest.BaseRepo.OwnerName}}</span>:{{end}}<span class="truncated-name">{{.PullRequest.BaseBranch}}</span>
4977
</a>
5078
</div>
51-
{{svg "gitea-double-chevron-left" 12 "gt-mx-1"}}
79+
{{svg "gitea-double-chevron-left" 12}}
5280
{{if .PullRequest.HeadRepo}}
5381
<div class="branch">
5482
<a href="{{.PullRequest.HeadRepo.Link}}/src/branch/{{PathEscapeSegments .PullRequest.HeadBranch}}">
@@ -60,32 +88,32 @@
6088
</div>
6189
{{end}}
6290
{{if and .Milestone (ne $.listType "milestone")}}
63-
<a class="milestone" {{if $.RepoLink}}href="{{$.RepoLink}}/milestone/{{.Milestone.ID}}"{{else}}href="{{.Repo.Link}}/milestone/{{.Milestone.ID}}"{{end}}>
64-
{{svg "octicon-milestone" 14 "gt-mr-2"}}{{.Milestone.Name}}
91+
<a class="milestone flex-text-inline" {{if $.RepoLink}}href="{{$.RepoLink}}/milestone/{{.Milestone.ID}}"{{else}}href="{{.Repo.Link}}/milestone/{{.Milestone.ID}}"{{end}}>
92+
{{svg "octicon-milestone" 14}}{{.Milestone.Name}}
6593
</a>
6694
{{end}}
6795
{{if .Project}}
68-
<a class="project" href="{{.Project.Link}}">
69-
{{svg .Project.IconName 14 "gt-mr-2"}}{{.Project.Title}}
96+
<a class="project flex-text-inline" href="{{.Project.Link}}">
97+
{{svg .Project.IconName 14}}{{.Project.Title}}
7098
</a>
7199
{{end}}
72100
{{if .Ref}}
73-
<a class="ref" {{if $.RepoLink}}href="{{index $.IssueRefURLs .ID}}"{{else}}href="{{.Repo.Link}}{{index $.IssueRefURLs .ID}}"{{end}}>
74-
{{svg "octicon-git-branch" 14 "gt-mr-2"}}{{index $.IssueRefEndNames .ID}}
101+
<a class="ref flex-text-inline" {{if $.RepoLink}}href="{{index $.IssueRefURLs .ID}}"{{else}}href="{{.Repo.Link}}{{index $.IssueRefURLs .ID}}"{{end}}>
102+
{{svg "octicon-git-branch" 14}}{{index $.IssueRefEndNames .ID}}
75103
</a>
76104
{{end}}
77105
{{$tasks := .GetTasks}}
78106
{{if gt $tasks 0}}
79107
{{$tasksDone := .GetTasksDone}}
80-
<span class="checklist">
81-
{{svg "octicon-checklist" 14 "gt-mr-2"}}{{$tasksDone}} / {{$tasks}}
108+
<span class="checklist flex-text-inline">
109+
{{svg "octicon-checklist" 14}}{{$tasksDone}} / {{$tasks}}
82110
<progress value="{{$tasksDone}}" max="{{$tasks}}"></progress>
83111
</span>
84112
{{end}}
85113
{{if ne .DeadlineUnix 0}}
86-
<span class="due-date" data-tooltip-content="{{$.locale.Tr "repo.issues.due_date"}}">
114+
<span class="due-date flex-text-inline" data-tooltip-content="{{$.locale.Tr "repo.issues.due_date"}}">
87115
<span{{if .IsOverdue}} class="text red"{{end}}>
88-
{{svg "octicon-calendar" 14 "gt-mr-2"}}
116+
{{svg "octicon-calendar" 14}}
89117
{{DateTime "short" .DeadlineUnix}}
90118
</span>
91119
</span>
@@ -95,58 +123,32 @@
95123
{{$rejectOfficial := call $approvalCounts .ID "reject"}}
96124
{{$waitingOfficial := call $approvalCounts .ID "waiting"}}
97125
{{if gt $approveOfficial 0}}
98-
<span class="approvals gt-df gt-ac green">
99-
{{svg "octicon-check" 14 "gt-mr-1"}}
126+
<span class="approvals green flex-text-inline">
127+
{{svg "octicon-check" 14}}
100128
{{$.locale.TrN $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n" $approveOfficial}}
101129
</span>
102130
{{end}}
103131
{{if gt $rejectOfficial 0}}
104-
<span class="rejects gt-df gt-ac red">
105-
{{svg "octicon-diff" 14 "gt-mr-2"}}
132+
<span class="rejects red flex-text-inline">
133+
{{svg "octicon-diff" 14}}
106134
{{$.locale.TrN $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n" $rejectOfficial}}
107135
</span>
108136
{{end}}
109137
{{if gt $waitingOfficial 0}}
110-
<span class="waiting gt-df gt-ac">
111-
{{svg "octicon-eye" 14 "gt-mr-2"}}
138+
<span class="waiting flex-text-inline">
139+
{{svg "octicon-eye" 14}}
112140
{{$.locale.TrN $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n" $waitingOfficial}}
113141
</span>
114142
{{end}}
115143
{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
116-
<span class="conflicting gt-df gt-ac">
144+
<span class="conflicting flex-text-inline">
117145
{{svg "octicon-x" 14}}
118146
{{$.locale.TrN (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n" (len .PullRequest.ConflictedFiles)}}
119147
</span>
120148
{{end}}
121149
{{end}}
122150
</div>
123151
</div>
124-
{{if or .TotalTrackedTime .Assignees .NumComments}}
125-
<div class="issue-item-icons-right gt-df gt-p-2">
126-
{{if .TotalTrackedTime}}
127-
<div class="issue-item-icon-right text grey">
128-
{{svg "octicon-clock" 16 "gt-mr-2"}}
129-
{{.TotalTrackedTime | Sec2Time}}
130-
</div>
131-
{{end}}
132-
{{if .Assignees}}
133-
<div class="issue-item-icon-right text grey">
134-
{{range .Assignees}}
135-
<a class="ui assignee gt-no-underline" href="{{.HomeLink}}" data-tooltip-content="{{.GetDisplayName}}">
136-
{{avatar $.Context . 20}}
137-
</a>
138-
{{end}}
139-
</div>
140-
{{end}}
141-
{{if .NumComments}}
142-
<div class="issue-item-icon-right text grey">
143-
<a class="gt-no-underline muted" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
144-
{{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}}
145-
</a>
146-
</div>
147-
{{end}}
148-
</div>
149-
{{end}}
150152
</li>
151153
{{end}}
152154
{{if .IssueIndexerUnavailable}}

0 commit comments

Comments
 (0)