summaryrefslogtreecommitdiffstats
path: root/templates/repo/issue
diff options
context:
space:
mode:
authorGiteabot <teabot@gitea.io>2023-06-22 06:19:38 -0400
committerGitHub <noreply@github.com>2023-06-22 10:19:38 +0000
commitea00ed320d97e199dba540815a5958ecea6fa162 (patch)
tree9de2f7e678b33b87f5cad7e12de56222430e5442 /templates/repo/issue
parent30a783879f86fc69409d2e2dae2945ea6ae52f0c (diff)
downloadgitea-ea00ed320d97e199dba540815a5958ecea6fa162.tar.gz
gitea-ea00ed320d97e199dba540815a5958ecea6fa162.zip
Various UI fixes (#25264) (#25431)
Backport #25264 by @silverwind Numerous small UI fixes: - Fix double border in collaborator list - Fix system notice table background - Mute links in repo and org lists - Downsize projects edit buttons - Improve milestones and project list rendering - Condense milestone list entry to a single line of "metas" - Mute ".." button in repo files list <img width="899" alt="Screenshot 2023-06-14 at 21 19 23" src="https://github.com/go-gitea/gitea/assets/115237/40d70006-5f76-49ad-b43c-4343ec3311e1"> <img width="905" alt="Screenshot 2023-06-14 at 21 18 29" src="https://github.com/go-gitea/gitea/assets/115237/46ef39ea-ab26-452d-89b0-a55d0cfacfdb"> <img width="270" alt="Screenshot 2023-06-14 at 21 14 09" src="https://github.com/go-gitea/gitea/assets/115237/aa16e833-a03b-4231-bc7c-159a6a6bee19"> <img width="409" alt="Screenshot 2023-06-14 at 21 12 13" src="https://github.com/go-gitea/gitea/assets/115237/b5242d41-f87a-4837-b0cf-9cc4c1f43daf"> <img width="286" alt="Screenshot 2023-06-14 at 21 10 03" src="https://github.com/go-gitea/gitea/assets/115237/d0c36e47-651b-4d34-ad95-3d59474a7c3e"> <img width="928" alt="Screenshot 2023-06-14 at 21 05 24" src="https://github.com/go-gitea/gitea/assets/115237/fc3b713e-d252-40f5-b6ba-6e5a741ab500"> <img width="217" alt="Screenshot 2023-06-14 at 21 02 01" src="https://github.com/go-gitea/gitea/assets/115237/c4c33376-18d6-4820-aff5-f508f6d351a0"> <img width="79" alt="Screenshot 2023-06-14 at 20 42 43" src="https://github.com/go-gitea/gitea/assets/115237/034b5950-c0bf-473b-a2f7-0c27a0259f29"> <img width="607" alt="Screenshot 2023-06-14 at 21 00 42" src="https://github.com/go-gitea/gitea/assets/115237/fba2d3fd-bd3e-4daf-8b2f-530a1c99c8bc"> Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'templates/repo/issue')
-rw-r--r--templates/repo/issue/milestone_issues.tmpl8
-rw-r--r--templates/repo/issue/milestones.tmpl5
2 files changed, 9 insertions, 4 deletions
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index 3a103bd5e0..3cd84d5456 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -33,10 +33,14 @@
{{if .IsClosed}}
{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
{{else}}
- {{svg "octicon-calendar"}}
+
{{if .Milestone.DeadlineString}}
- <span {{if .IsOverdue}}class="overdue"{{end}}>{{DateTime "short" .Milestone.DeadlineString}}</span>
+ <span{{if .IsOverdue}} class="text red"{{end}}>
+ {{svg "octicon-calendar"}}
+ {{DateTime "short" .Milestone.DeadlineString}}
+ </span>
{{else}}
+ {{svg "octicon-calendar"}}
{{$.locale.Tr "repo.milestones.no_due_date"}}
{{end}}
{{end}}
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 46bb060877..da239b694a 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -94,12 +94,13 @@
{{svg "octicon-clock" 14}}
{{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
{{else}}
- {{svg "octicon-calendar" 14}}
{{if .DeadlineString}}
- <span {{if .IsOverdue}}class="overdue"{{end}}>
+ <span{{if .IsOverdue}} class="text red"{{end}}>
+ {{svg "octicon-calendar" 14}}
{{DateTime "short" .DeadlineString}}
</span>
{{else}}
+ {{svg "octicon-calendar" 14}}
{{$.locale.Tr "repo.milestones.no_due_date"}}
{{end}}
{{end}}