Skip to content

Commit c60029c

Browse files
committed
color and layout tweaks
1 parent d3ce829 commit c60029c

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

templates/repo/issue/list.tmpl

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -256,53 +256,52 @@
256256
{{else}}
257257
{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
258258
{{end}}
259-
260259
{{if .Milestone}}
261260
<a class="milestone" href="{{$.RepoLink}}/milestone/{{.Milestone.ID}}">
262-
{{svg "octicon-milestone"}} {{.Milestone.Name}}
261+
{{svg "octicon-milestone" 14}} {{.Milestone.Name}}
263262
</a>
264263
{{end}}
265264
{{if .Ref}}
266265
<a class="ref" href="{{index $.IssueRefURLs .ID}}">
267-
{{svg "octicon-git-branch"}} {{index $.IssueRefEndNames .ID}}
266+
{{svg "octicon-git-branch" 14}} {{index $.IssueRefEndNames .ID}}
268267
</a>
269268
{{end}}
270269
{{$tasks := .GetTasks}}
271270
{{if gt $tasks 0}}
272271
{{$tasksDone := .GetTasksDone}}
273272
<span class="checklist">
274-
{{svg "octicon-checklist"}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span>
273+
{{svg "octicon-checklist" 14}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span>
275274
</span>
276275
{{end}}
277276
{{if ne .DeadlineUnix 0}}
278277
<span class="due-date poping up" data-content="{{$.i18n.Tr "repo.issues.due_date"}}" data-variation="tiny inverted" data-position="right center">
279-
{{svg "octicon-calendar"}}<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
278+
{{svg "octicon-calendar" 14}}<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
280279
</span>
281280
{{end}}
282281
{{if .IsPull}}
283282
{{$approveOfficial := call $approvalCounts .ID "approve"}}
284283
{{$rejectOfficial := call $approvalCounts .ID "reject"}}
285284
{{$waitingOfficial := call $approvalCounts .ID "waiting"}}
286285
{{if gt $approveOfficial 0}}
287-
<span class="approvals">{{svg "octicon-check"}}
286+
<span class="approvals">{{svg "octicon-check" 14}}
288287
{{$.i18n.Tr (TrN $.i18n.Lang $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n") $approveOfficial}}
289288
</span>
290289
{{end}}
291290

292291
{{if gt $rejectOfficial 0}}
293-
<span class="rejects">{{svg "octicon-diff"}}
292+
<span class="rejects">{{svg "octicon-diff" 14}}
294293
{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
295294
</span>
296295
{{end}}
297296

298297
{{if gt $waitingOfficial 0}}
299-
<span class="waiting">{{svg "octicon-eye"}}
298+
<span class="waiting">{{svg "octicon-eye" 14}}
300299
{{$.i18n.Tr (TrN $.i18n.Lang $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n") $waitingOfficial}}
301300
</span>
302301
{{end}}
303302

304303
{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
305-
<span class="conflicting">{{svg "octicon-x"}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
304+
<span class="conflicting">{{svg "octicon-x" 14}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
306305
{{end}}
307306
{{end}}
308307
</div>

web_src/less/_base.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
/* target-based colors */
7777
--color-body: #ffffff;
7878
--color-text: #212121;
79-
--color-text-hover: #000000;
8079
--color-box-header: #f7f7f7;
8180
--color-box-body: #ffffff;
8281
--color-timeline: #ececec;

web_src/less/_repository.less

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2631,7 +2631,7 @@
26312631
font-weight: 600;
26322632

26332633
&:hover {
2634-
color: var(--color-text-hover);
2634+
color: var(--color-primary);
26352635
}
26362636
}
26372637

@@ -2641,17 +2641,26 @@
26412641

26422642
.assignee {
26432643
position: relative;
2644-
top: -3px;
2644+
top: -2px;
26452645
}
26462646

26472647
.assignee img {
26482648
width: 20px;
26492649
height: 20px;
2650+
margin-right: 2px;
26502651
}
26512652

26522653
.desc {
26532654
color: #999999;
26542655

2656+
a {
2657+
color: inherit;
2658+
}
2659+
2660+
a:hover {
2661+
color: var(--color-primary);
2662+
}
2663+
26552664
.time-since,
26562665
a {
26572666
margin-left: .25rem;
@@ -2695,19 +2704,17 @@
26952704

26962705
a.milestone {
26972706
margin-left: 5px;
2698-
color: #999999 !important;
26992707

27002708
&:hover {
2701-
color: var(--color-text-hover) !important;
2709+
color: var(--color-primary) !important;
27022710
}
27032711
}
27042712

27052713
a.ref {
27062714
margin-left: 8px;
2707-
color: #999999 !important;
27082715

27092716
&:hover {
2710-
color: var(--color-text-hover) !important;
2717+
color: var(--color-primary) !important;
27112718
}
27122719

27132720
span {

web_src/less/themes/theme-arc-green.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
--color-box-header: #454a57;
7474
--color-box-body: #353945;
7575
--color-text: #b6bac5;
76-
--color-text-hover: #d6dae5;
7776
--color-timeline: #4a505c;
7877
--color-input-text: #dcdcdc;
7978
--color-input-background: #2e323e;

0 commit comments

Comments
 (0)