Skip to content

Commit 19d9288

Browse files
silverwindsilverwind
committed
Various CSS and HTML tweaks
- Remove various horizontal dividers on repo pages that didn't provide visual benefit - Remove issue-related pill buttons on projects page - Increase contrast of color-secondary on arc-green - Improve notifications icon - Remove some inline styles
1 parent 18fc4f5 commit 19d9288

File tree

16 files changed

+87
-101
lines changed

16 files changed

+87
-101
lines changed

‎templates/org/member/members.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="list">
88
{{range .Members}}
99
<div class="item ui grid">
10-
<div class="ui four wide column" style="display: flex;">
10+
<div class="ui four wide column gt-df">
1111
<a href="{{.HomeLink}}">{{avatar $.Context . 48}}</a>
1212
<div>
1313
<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>

‎templates/repo/issue/labels.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository labels">
33
{{template "repo/header" .}}
44
<div class="ui container">
5-
<div class="navbar">
5+
<div class="navbar gt-mb-4">
66
{{template "repo/issue/navbar" .}}
77
{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
88
<div class="ui right">
99
<button class="ui green new-label button">{{.locale.Tr "repo.issues.new_label"}}</button>
1010
</div>
1111
{{end}}
1212
</div>
13-
<div class="ui divider"></div>
1413
{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
1514
{{template "repo/issue/labels/label_new" .}}
1615
{{end}}

‎templates/repo/issue/list.tmpl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
{{end}}
1818
{{end}}
1919
</div>
20-
21-
<div class="ui divider"></div>
22-
2320
<div id="issue-filters" class="issue-list-toolbar">
2421
<div class="issue-list-toolbar-left">
2522
{{if $.CanWriteIssuesOrPulls}}

‎templates/repo/issue/milestones.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository milestones">
33
{{template "repo/header" .}}
44
<div class="ui container">
5-
<div class="navbar">
5+
<div class="navbar gt-mb-4">
66
{{template "repo/issue/navbar" .}}
77
{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
88
<div class="ui right">
99
<a class="ui small green button" href="{{$.Link}}/new">{{.locale.Tr "repo.milestones.new"}}</a>
1010
</div>
1111
{{end}}
1212
</div>
13-
<div class="ui divider"></div>
1413
{{template "base/alert" .}}
1514

1615
<div class="list-header">

‎templates/repo/issue/view.tmpl

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,6 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository view issue pull">
33
{{template "repo/header" .}}
44
<div class="ui container">
5-
<div class="ui two column grid">
6-
<div class="column">
7-
{{template "repo/issue/navbar" .}}
8-
</div>
9-
{{if and (not .Repository.IsArchived) (not .Issue.IsPull)}}
10-
<div class="column right aligned">
11-
{{if .PageIsIssueList}}
12-
<a class="ui green button" href="{{.RepoLink}}/issues/new{{if .NewIssueChooseTemplate}}/choose{{end}}">{{.locale.Tr "repo.issues.new"}}</a>
13-
{{else}}
14-
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName | PathEscapeSegments}}...{{.PullRequestCtx.HeadInfoSubURL}}">{{.locale.Tr "repo.pulls.new"}}</a>
15-
{{end}}
16-
</div>
17-
{{end}}
18-
</div>
19-
<div class="ui divider"></div>
205
{{if .Issue.IsPull}}
216
{{template "repo/issue/view_title" .}}
227
{{template "repo/pulls/tab_menu" .}}

‎templates/repo/issue/view_title.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
44
<button id="edit-title" class="ui basic button secondary edit-button not-in-edit">{{.locale.Tr "repo.issues.edit"}}</button>
55
{{end}}
6-
<h1>
6+
<h1 class="gt-mt-3 gt-mb-3">
77
<span id="issue-title">{{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}}</span>
88
<span class="index">#{{.Issue.Index}}</span>
99
<div id="edit-title-input" class="ui input gt-ml-4 gt-hidden">
@@ -103,5 +103,4 @@
103103
{{$.locale.Tr "repo.issues.num_comments" .Issue.NumComments}}
104104
</span>
105105
{{end}}
106-
<div class="ui divider"></div>
107106
</div>

‎templates/repo/projects/list.tmpl

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,39 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository projects milestones">
33
{{template "repo/header" .}}
44
<div class="ui container">
5-
<div class="navbar">
6-
{{template "repo/issue/navbar" .}}
7-
{{if and .CanWriteProjects (not .Repository.IsArchived)}}
8-
<div class="ui right">
9-
<a class="ui small green button" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a>
5+
<div class="navbar gt-mb-4">
6+
<div>
7+
<div class="small-pill-buttons ui compact tiny menu">
8+
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=open">
9+
{{svg "octicon-project" 16 "gt-mr-3"}}
10+
{{.locale.PrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
11+
</a>
12+
<a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=closed">
13+
{{svg "octicon-check" 16 "gt-mr-3"}}
14+
{{.locale.PrettyNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
15+
</a>
1016
</div>
11-
{{end}}
12-
</div>
13-
<div class="ui divider"></div>
14-
{{template "base/alert" .}}
15-
<div class="small-pill-buttons ui compact tiny menu">
16-
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=open">
17-
{{svg "octicon-project" 16 "gt-mr-3"}}
18-
{{.locale.PrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
19-
</a>
20-
<a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=closed">
21-
{{svg "octicon-check" 16 "gt-mr-3"}}
22-
{{.locale.PrettyNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
23-
</a>
24-
</div>
25-
26-
<div class="ui right floated secondary filter menu">
27-
<!-- Sort -->
28-
<div class="ui dropdown type jump item">
29-
<span class="text">
30-
{{.locale.Tr "repo.issues.filter_sort"}}
31-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
32-
</span>
33-
<div class="menu">
34-
<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=oldest&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>
35-
<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=recentupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>
36-
<a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=leastupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</a>
17+
</div>
18+
<div>
19+
<!-- Sort -->
20+
<div class="ui small dropdown type jump item">
21+
<span class="text">
22+
{{.locale.Tr "repo.issues.filter_sort"}}
23+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
24+
</span>
25+
<div class="menu">
26+
<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=oldest&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>
27+
<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=recentupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>
28+
<a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=leastupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</a>
29+
</div>
3730
</div>
31+
{{if and .CanWriteProjects (not .Repository.IsArchived)}}
32+
<a class="ui small green button gt-ml-4" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a>
33+
{{end}}
3834
</div>
3935
</div>
36+
{{template "base/alert" .}}
37+
4038
<div class="milestone list">
4139
{{range .Projects}}
4240
<li class="item">

‎templates/repo/pulls/commits.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName | PathEscapeSegments}}...{{.PullRequestCtx.HeadInfoSubURL}}">{{.locale.Tr "repo.pulls.new"}}</a>
99
</div>
1010
</div>
11-
<div class="ui divider"></div>
1211
{{template "repo/issue/view_title" .}}
1312
{{template "repo/pulls/tab_menu" .}}
1413
<div class="ui bottom attached tab pull active">

‎templates/repo/pulls/files.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName | PathEscapeSegments}}...{{.PullRequestCtx.HeadInfoSubURL}}">{{.locale.Tr "repo.pulls.new"}}</a>
1313
</div>
1414
</div>
15-
<div class="ui divider"></div>
1615
{{template "repo/issue/view_title" .}}
1716
{{template "repo/pulls/tab_menu" .}}
1817
{{template "base/alert" .}}

‎templates/repo/release/list.tmpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<span class="commit">
2121
<a class="gt-mono muted" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a>
2222
</span>
23-
{{template "repo/branch_dropdown" dict "root" $ "release" .}}
23+
<div class="release-branch-button">
24+
{{template "repo/branch_dropdown" dict "root" $ "release" .}}
25+
</div>
2426
{{end}}
2527
</div>
2628
<div class="ui twelve wide column detail">

‎templates/repo/settings/options.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}</td>
9292
<td>{{DateTime "full" .Mirror.UpdatedUnix}}</td>
9393
<td class="right aligned">
94-
<form method="post" style="display: inline-block">
94+
<form method="post gt-dib">
9595
{{.CsrfTokenHtml}}
9696
<input type="hidden" name="action" value="mirror-sync">
9797
<button class="ui primary tiny button inline text-thin">{{$.locale.Tr "repo.settings.sync_mirror"}}</button>
@@ -169,13 +169,13 @@
169169
<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
170170
<td>{{if .LastUpdateUnix}}{{DateTime "full" .LastUpdateUnix}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
171171
<td class="right aligned">
172-
<form method="post" style="display: inline-block">
172+
<form method="post gt-dib">
173173
{{$.CsrfTokenHtml}}
174174
<input type="hidden" name="action" value="push-mirror-remove">
175175
<input type="hidden" name="push_mirror_id" value="{{.ID}}">
176176
<button class="ui basic red tiny button inline text-thin">{{$.locale.Tr "remove"}}</button>
177177
</form>
178-
<form method="post" style="display: inline-block">
178+
<form method="post gt-dib">
179179
{{$.CsrfTokenHtml}}
180180
<input type="hidden" name="action" value="push-mirror-sync">
181181
<input type="hidden" name="push_mirror_id" value="{{.ID}}">

‎web_src/css/base.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2584,18 +2584,18 @@ a.ui.basic.label:hover {
25842584

25852585
.notification_count {
25862586
position: absolute;
2587-
left: 5px;
2588-
top: -8px;
2587+
left: 7px;
2588+
top: -9px;
25892589
min-width: 1.5em;
25902590
text-align: center;
25912591
background: var(--color-primary);
25922592
border: 2px solid var(--color-header-bar);
25932593
color: var(--color-header-bar);
2594-
padding: 2px;
2594+
padding: 2.75px;
25952595
border-radius: 1em;
2596-
font-size: 10px;
2596+
font-size: 11px;
25972597
font-weight: 700;
2598-
line-height: 0.7;
2598+
line-height: .67em;
25992599
}
26002600

26012601
table th[data-sortt-asc]:hover,

‎web_src/css/repository.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,6 @@
659659

660660
.repository.view.issue .title .issue-title .edit-button {
661661
float: right;
662-
padding-left: 1rem;
663662
}
664663

665664
.repository.view.issue .title .issue-title .edit-buttons {
@@ -1199,13 +1198,15 @@
11991198

12001199
.repository .milestone.list {
12011200
list-style: none;
1202-
padding-top: 15px;
12031201
}
12041202

12051203
.repository .milestone.list > .item {
12061204
padding-top: 10px;
12071205
padding-bottom: 10px;
1208-
border-bottom: 1px dashed var(--color-secondary);
1206+
}
1207+
1208+
.repository .milestone.list > .item + .item {
1209+
border-top: 1px solid var(--color-secondary);
12091210
}
12101211

12111212
.repository .milestone.list > .item progress {

‎web_src/css/repository/issue-list.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
flex-wrap: wrap;
44
align-items: flex-start;
55
gap: 1rem;
6+
margin-top: 1rem;
67
}
78

89
.issue-list-toolbar-left {

‎web_src/css/repository/release-tag.css

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.repository.releases #release-list {
2-
border-top: 1px solid var(--color-secondary);
3-
margin-top: 20px;
4-
padding-top: 15px;
2+
margin-top: 12px;
3+
padding-top: 12px;
54
padding-left: 0;
65
}
76

@@ -45,7 +44,7 @@
4544
}
4645

4746
.repository.releases #release-list > li .detail {
48-
border-left: 2px solid var(--color-secondary);
47+
border-left: 1px solid var(--color-secondary);
4948
}
5049

5150
.repository.releases #release-list > li .detail .author img {
@@ -92,7 +91,7 @@
9291
z-index: 9;
9392
position: absolute;
9493
display: block;
95-
left: -6px;
94+
left: -5.5px;
9695
top: 40px;
9796
border-radius: 100%;
9897
border: 2.5px solid var(--color-body);
@@ -149,3 +148,11 @@
149148
.repository.new.release .field .attachment_edit {
150149
width: 450px !important;
151150
}
151+
152+
.release-branch-button {
153+
margin-top: 10px;
154+
}
155+
156+
.release-branch-button .button {
157+
margin-right: 0;
158+
}

‎web_src/css/themes/theme-arc-green.css

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,33 @@
2929
--color-primary-alpha-70: #87ab63b3;
3030
--color-primary-alpha-80: #87ab63cc;
3131
--color-primary-alpha-90: #87ab63e1;
32-
--color-secondary: #454a57;
33-
--color-secondary-dark-1: #505665;
34-
--color-secondary-dark-2: #5b6273;
35-
--color-secondary-dark-3: #71798e;
36-
--color-secondary-dark-4: #7f8699;
37-
--color-secondary-dark-5: #8c93a4;
38-
--color-secondary-dark-6: #9aa0af;
39-
--color-secondary-dark-7: #a8adba;
40-
--color-secondary-dark-8: #b6bac5;
41-
--color-secondary-dark-9: #c4c7d0;
42-
--color-secondary-dark-10: #d2d4db;
43-
--color-secondary-dark-11: #dfe1e6;
44-
--color-secondary-dark-12: #edeef1;
32+
--color-secondary: #525767;
33+
--color-secondary-dark-1: #5c6374;
34+
--color-secondary-dark-2: #666e81;
35+
--color-secondary-dark-3: #7c8497;
36+
--color-secondary-dark-4: #8990a1;
37+
--color-secondary-dark-5: #959cab;
38+
--color-secondary-dark-6: #a2a8b5;
39+
--color-secondary-dark-7: #afb4c0;
40+
--color-secondary-dark-8: #bcc0ca;
41+
--color-secondary-dark-9: #c9cbd4;
42+
--color-secondary-dark-10: #d6d7de;
43+
--color-secondary-dark-11: #e2e3e8;
44+
--color-secondary-dark-12: #eeeff2;
4545
--color-secondary-dark-13: #fbfbfc;
46-
--color-secondary-light-1: #373b46;
47-
--color-secondary-light-2: #292c34;
48-
--color-secondary-light-3: #1c1e23;
49-
--color-secondary-light-4: #0e0f11;
50-
--color-secondary-alpha-10: #454a5719;
51-
--color-secondary-alpha-20: #454a5733;
52-
--color-secondary-alpha-30: #454a574b;
53-
--color-secondary-alpha-40: #454a5766;
54-
--color-secondary-alpha-50: #454a5780;
55-
--color-secondary-alpha-60: #454a5799;
56-
--color-secondary-alpha-70: #454a57b3;
57-
--color-secondary-alpha-80: #454a57cc;
58-
--color-secondary-alpha-90: #454a57e1;
46+
--color-secondary-light-1: #454a57;
47+
--color-secondary-light-2: #383c47;
48+
--color-secondary-light-3: #2c2f37;
49+
--color-secondary-light-4: #1f2226;
50+
--color-secondary-alpha-10: #52576719;
51+
--color-secondary-alpha-20: #52576733;
52+
--color-secondary-alpha-30: #5257674b;
53+
--color-secondary-alpha-40: #52576766;
54+
--color-secondary-alpha-50: #52576780;
55+
--color-secondary-alpha-60: #52576799;
56+
--color-secondary-alpha-70: #525767b3;
57+
--color-secondary-alpha-80: #525767cc;
58+
--color-secondary-alpha-90: #525767e1;
5959
/* colors */
6060
--color-red: #cc4848;
6161
--color-orange: #cc580c;

0 commit comments

Comments
 (0)