Skip to content

Commit ea00ed3

Browse files
GiteaBotsilverwind
GiteaBot
and
silverwind
authoredJun 22, 2023
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>
·
v1.20.6v1.20.0-rc1
1 parent 30a7838 commit ea00ed3

File tree

14 files changed

+29
-28
lines changed

14 files changed

+29
-28
lines changed
 

‎templates/admin/notice.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h4 class="ui top attached header">
44
{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
55
</h4>
6-
<table class="ui attached basic select selectable table unstackable g-table-auto-ellipsis">
6+
<table class="ui attached segment select selectable striped table unstackable g-table-auto-ellipsis">
77
<thead>
88
<tr>
99
<th></th>

‎templates/projects/view.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</div>
4646
{{if $.CanWriteProjects}}
4747
<div class="column right aligned">
48-
<div class="ui compact right small menu">
48+
<div class="ui compact right mini menu">
4949
<a class="item" href="{{$.Link}}/edit?redirect=project">
5050
{{svg "octicon-pencil"}}
5151
<span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_edit"}}</span>

‎templates/repo/issue/milestone_issues.tmpl

+6-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@
3333
{{if .IsClosed}}
3434
{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
3535
{{else}}
36-
{{svg "octicon-calendar"}}
36+
3737
{{if .Milestone.DeadlineString}}
38-
<span {{if .IsOverdue}}class="overdue"{{end}}>{{DateTime "short" .Milestone.DeadlineString}}</span>
38+
<span{{if .IsOverdue}} class="text red"{{end}}>
39+
{{svg "octicon-calendar"}}
40+
{{DateTime "short" .Milestone.DeadlineString}}
41+
</span>
3942
{{else}}
43+
{{svg "octicon-calendar"}}
4044
{{$.locale.Tr "repo.milestones.no_due_date"}}
4145
{{end}}
4246
{{end}}

‎templates/repo/issue/milestones.tmpl

+3-2
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,13 @@
9494
{{svg "octicon-clock" 14}}
9595
{{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
9696
{{else}}
97-
{{svg "octicon-calendar" 14}}
9897
{{if .DeadlineString}}
99-
<span {{if .IsOverdue}}class="overdue"{{end}}>
98+
<span{{if .IsOverdue}} class="text red"{{end}}>
99+
{{svg "octicon-calendar" 14}}
100100
{{DateTime "short" .DeadlineString}}
101101
</span>
102102
{{else}}
103+
{{svg "octicon-calendar" 14}}
103104
{{$.locale.Tr "repo.milestones.no_due_date"}}
104105
{{end}}
105106
{{end}}

‎templates/repo/projects/view.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</div>
5050
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
5151
<div class="column right aligned">
52-
<div class="ui compact right small menu">
52+
<div class="ui compact right mini menu">
5353
<a class="item" href="{{$.RepoLink}}/projects/{{.Project.ID}}/edit?redirect=project">
5454
{{svg "octicon-pencil"}}
5555
<span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_edit"}}</span>

‎templates/repo/view_list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<tbody>
4141
{{if .HasParentPath}}
4242
<tr class="has-parent">
43-
<td colspan="3">{{svg "octicon-reply"}}<a href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">..</a></td>
43+
<td colspan="3">{{svg "octicon-reply"}}<a class="muted" href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">..</a></td>
4444
</tr>
4545
{{end}}
4646
{{range $item := .Files}}

‎templates/shared/issuelist.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
{{end}}
8585
{{if ne .DeadlineUnix 0}}
8686
<span class="due-date" data-tooltip-content="{{$.locale.Tr "repo.issues.due_date"}}">
87-
<span{{if .IsOverdue}} class="overdue"{{end}}>
87+
<span{{if .IsOverdue}} class="text red"{{end}}>
8888
{{svg "octicon-calendar" 14 "gt-mr-2"}}
8989
{{DateTime "short" .DeadlineUnix}}
9090
</span>

‎templates/user/dashboard/milestones.tmpl

+3-2
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,13 @@
115115
{{svg "octicon-clock" 14}}
116116
{{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
117117
{{else}}
118-
{{svg "octicon-calendar" 14}}
119118
{{if .DeadlineString}}
120-
<span {{if .IsOverdue}}class="overdue"{{end}}>
119+
<span{{if .IsOverdue}} class="text red"{{end}}>
120+
{{svg "octicon-calendar" 14}}
121121
{{DateTime "short" .DeadlineString}}
122122
</span>
123123
{{else}}
124+
{{svg "octicon-calendar" 14}}
124125
{{$.locale.Tr "repo.milestones.no_due_date"}}
125126
{{end}}
126127
{{end}}

‎templates/user/settings/organization.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
</button>
2424
</form>
2525
</div>
26-
{{avatar $.Context . 28 "mini"}}
27-
<div class="content">
28-
<a href="{{.HomeLink}}">{{.Name}}</a>
26+
<div class="content gt-df gt-ac gt-gap-3">
27+
{{avatar $.Context . 28 "mini"}}
28+
<a class="muted" href="{{.HomeLink}}">{{.Name}}</a>
2929
</div>
3030
</div>
3131
{{end}}

‎templates/user/settings/repos.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
{{else}}
2424
<span class="icon">{{svg "octicon-repo"}}</span>
2525
{{end}}
26-
<a class="name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
27-
<span>{{FileSize $repo.Size}}</span>
26+
<a class="muted name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
27+
<span class="text light-3">{{FileSize $repo.Size}}</span>
2828
{{if $repo.IsFork}}
2929
{{$.locale.Tr "repo.forked_from"}}
3030
<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>

‎web_src/css/base.css

+7
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,13 @@ a.label,
869869
border-color: var(--color-secondary);
870870
}
871871

872+
.ui.table > tfoot > tr > th,
873+
.ui.table > tfoot > tr > td {
874+
border-color: var(--color-secondary);
875+
background: var(--color-box-body);
876+
color: var(--color-text);
877+
}
878+
872879
img.ui.avatar,
873880
.ui.avatar img,
874881
.ui.avatar svg {

‎web_src/css/repo.css

-4
Original file line numberDiff line numberDiff line change
@@ -1952,10 +1952,6 @@
19521952
line-height: 2em;
19531953
}
19541954

1955-
.repository.settings.collaboration .collaborator.list > .item:not(:last-child) {
1956-
border-bottom: 1px solid var(--color-secondary);
1957-
}
1958-
19591955
.repository.settings.collaboration #repo-collab-form #search-user-box .results {
19601956
left: 7px;
19611957
}

‎web_src/css/shared/issuelist.css

-4
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,6 @@
135135
margin-right: -4px;
136136
}
137137

138-
.issue.list > .item .desc .overdue {
139-
color: var(--color-red);
140-
}
141-
142138
.issue.list .branches {
143139
display: inline-flex;
144140
padding: 0 4px;

‎web_src/css/shared/milestone.css

-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
gap: 8px;
4545
}
4646

47-
.milestone-toolbar .group .overdue {
48-
color: var(--color-red);
49-
}
50-
5147
.milestone-toolbar .group > a {
5248
font-size: 15px;
5349
color: var(--color-text-light-2);

0 commit comments

Comments
 (0)
Please sign in to comment.