Skip to content

Commit f418e14

Browse files
silverwindsilverwind
committed
Various UI fixes
1 parent e24f651 commit f418e14

File tree

12 files changed

+106
-62
lines changed

12 files changed

+106
-62
lines changed

‎templates/admin/notice.tmpl

Lines changed: 1 addition & 1 deletion
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/list.tmpl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,22 @@
3838
<div class="milestone list">
3939
{{range .Projects}}
4040
<li class="item">
41-
{{svg .IconName}} <a href="{{.Link}}">{{.Title}}</a>
41+
{{svg .IconName 16 "gt-mr-3"}}
42+
<a class="muted gt-font-16" href="{{.Link}}">{{.Title}}</a>
4243
<div class="meta">
4344
{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
4445
{{if .IsClosed}}
4546
{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
4647
{{end}}
47-
<span class="issue-stats">
48-
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
49-
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
50-
{{svg "octicon-check" 16 "gt-mr-3"}}
51-
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
48+
<span class="issue-stats gt-df gt-ac gt-fw gt-gap-3">
49+
<div class="gt-df gt-ac gt-gap-2">
50+
{{svg "octicon-issue-opened" 14}}
51+
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
52+
</div>
53+
<div class="gt-df gt-ac gt-gap-2">
54+
{{svg "octicon-check" 14}}
55+
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
56+
</div>
5257
</span>
5358
</div>
5459
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}

‎templates/projects/view.tmpl

Lines changed: 1 addition & 1 deletion
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" data-id={{$.Project.ID}} data-title={{$.Project.Title}}>
5050
{{svg "octicon-pencil"}}
5151
<span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_edit"}}</span>

‎templates/repo/issue/milestones.tmpl

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,42 @@
6666
</div>
6767
</div>
6868
<div class="meta">
69-
{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
70-
{{if .IsClosed}}
71-
{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
72-
{{else}}
73-
{{svg "octicon-calendar"}}
74-
{{if .DeadlineString}}
75-
<span {{if .IsOverdue}}class="overdue"{{end}}>{{DateTime "short" .DeadlineString}}</span>
69+
<span class="issue-stats gt-df gt-ac gt-fw gt-gap-3">
70+
<div class="gt-df gt-ac gt-gap-2">
71+
{{svg "octicon-issue-opened"}}
72+
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
73+
</div>
74+
<div class="gt-df gt-ac gt-gap-2">
75+
{{svg "octicon-check" 14}}
76+
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
77+
</div>
78+
{{if .TotalTrackedTime}}
79+
<div class="gt-df gt-ac gt-gap-2">
80+
{{svg "octicon-clock" 14}}&nbsp;{{.TotalTrackedTime|Sec2Time}}
81+
</div>
82+
{{end}}
83+
{{if .UpdatedUnix}}
84+
<div class="gt-dif gt-ac gt-gap-2">
85+
{{svg "octicon-clock" 14}}{{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}
86+
</div>
87+
{{end}}
88+
{{if .IsClosed}}
89+
<div class="gt-df gt-ac gt-gap-2">
90+
{{svg "octicon-clock" 14}}
91+
{{$.locale.Tr "repo.milestones.closed" (TimeSinceUnix .ClosedDateUnix $.locale) | Safe}}
92+
</div>
7693
{{else}}
77-
{{$.locale.Tr "repo.milestones.no_due_date"}}
94+
<div class="gt-df gt-ac gt-gap-2">
95+
{{svg "octicon-calendar" 14}}
96+
{{if .DeadlineString}}
97+
<span{{if .IsOverdue}} class="overdue"{{end}}>
98+
{{DateTime "short" .DeadlineString}}
99+
</span>
100+
{{else}}
101+
{{$.locale.Tr "repo.milestones.no_due_date"}}
102+
{{end}}
103+
</div>
78104
{{end}}
79-
{{end}}
80-
<span class="issue-stats">
81-
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
82-
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
83-
{{svg "octicon-check" 16 "gt-mr-3"}}
84-
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
85-
{{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}}
86-
{{if .UpdatedUnix}}{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}{{end}}
87105
</span>
88106
</div>
89107
{{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}

‎templates/repo/projects/list.tmpl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,22 @@
3838
<div class="milestone list">
3939
{{range .Projects}}
4040
<li class="item">
41-
{{svg .IconName}} <a href="{{.Link}}">{{.Title}}</a>
41+
{{svg .IconName 16 "gt-mr-3"}}
42+
<a class="muted gt-font-16" href="{{.Link}}">{{.Title}}</a>
4243
<div class="meta">
4344
{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
4445
{{if .IsClosed}}
4546
{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
4647
{{end}}
47-
<span class="issue-stats">
48-
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
49-
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
50-
{{svg "octicon-check" 16 "gt-mr-3"}}
51-
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
48+
<span class="issue-stats gt-df gt-ac gt-fw gt-gap-3">
49+
<div class="gt-df gt-ac gt-gap-2">
50+
{{svg "octicon-issue-opened" 14}}
51+
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
52+
</div>
53+
<div class="gt-df gt-ac gt-gap-2">
54+
{{svg "octicon-check" 14}}
55+
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
56+
</div>
5257
</span>
5358
</div>
5459
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}

‎templates/repo/projects/view.tmpl

Lines changed: 1 addition & 1 deletion
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" data-id={{$.Project.ID}} data-title={{$.Project.Title}}>
5454
{{svg "octicon-pencil"}}
5555
<span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_edit"}}</span>

‎templates/repo/view_list.tmpl

Lines changed: 1 addition & 1 deletion
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/user/dashboard/milestones.tmpl

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -85,24 +85,41 @@
8585
</div>
8686
</div>
8787
<div class="meta">
88-
{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
89-
{{if .IsClosed}}
90-
{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
91-
{{else}}
92-
{{svg "octicon-calendar"}}
93-
{{if .DeadlineString}}
94-
<span {{if .IsOverdue}}class="overdue"{{end}}>{{DateTime "short" .DeadlineString}}</span>
95-
{{else}}
96-
{{$.locale.Tr "repo.milestones.no_due_date"}}
97-
{{end}}
98-
{{end}}
99-
<span class="issue-stats">
100-
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
101-
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
102-
{{svg "octicon-check" 16 "gt-mr-3"}}
103-
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
88+
<span class="issue-stats gt-df gt-ac gt-fw gt-gap-3">
89+
<div class="gt-df gt-ac gt-gap-2">
90+
{{svg "octicon-issue-opened"}}
91+
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
92+
</div>
93+
<div class="gt-df gt-ac gt-gap-2">
94+
{{svg "octicon-check" 14}}
95+
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
96+
</div>
10497
{{if .TotalTrackedTime}}
105-
{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}
98+
<div class="gt-df gt-ac gt-gap-2">
99+
{{svg "octicon-clock" 14}}&nbsp;{{.TotalTrackedTime|Sec2Time}}
100+
</div>
101+
{{end}}
102+
{{if .UpdatedUnix}}
103+
<div class="gt-dif gt-ac gt-gap-2">
104+
{{svg "octicon-clock" 14}}{{$.locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix $.locale) | Safe}}
105+
</div>
106+
{{end}}
107+
{{if .IsClosed}}
108+
<div class="gt-df gt-ac gt-gap-2">
109+
{{svg "octicon-clock" 14}}
110+
{{$.locale.Tr "repo.milestones.closed" (TimeSinceUnix .ClosedDateUnix $.locale) | Safe}}
111+
</div>
112+
{{else}}
113+
<div class="gt-df gt-ac gt-gap-2">
114+
{{svg "octicon-calendar" 14}}
115+
{{if .DeadlineString}}
116+
<span{{if .IsOverdue}} class="overdue"{{end}}>
117+
{{DateTime "short" .DeadlineString}}
118+
</span>
119+
{{else}}
120+
{{$.locale.Tr "repo.milestones.no_due_date"}}
121+
{{end}}
122+
</div>
106123
{{end}}
107124
</span>
108125
</div>

‎templates/user/settings/organization.tmpl

Lines changed: 3 additions & 3 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 7 additions & 0 deletions
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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,10 +1190,6 @@
11901190
padding-top: 5px;
11911191
}
11921192

1193-
.repository .milestone.list > .item .meta .issue-stats .svg {
1194-
padding-left: 5px;
1195-
}
1196-
11971193
.repository .milestone.list > .item .meta .overdue {
11981194
color: var(--color-red);
11991195
}
@@ -1975,10 +1971,6 @@
19751971
line-height: 2em;
19761972
}
19771973

1978-
.repository.settings.collaboration .collaborator.list > .item:not(:last-child) {
1979-
border-bottom: 1px solid var(--color-secondary);
1980-
}
1981-
19821974
.repository.settings.collaboration #repo-collab-form #search-user-box .results {
19831975
left: 7px;
19841976
}

0 commit comments

Comments
 (0)