Skip to content

Commit 4a722c9

Browse files
silverwindwxiaoguang
silverwind
and
wxiaoguang
authoredMay 3, 2023
Make Issue/PR/projects more compact, misc CSS tweaks (#24459)
- Remove various horizontal dividers on repo pages that didn't provide visual benefit - Remove label/milestone pills on single issue/pr page - Remove issue-related pill buttons on projects page - Increase contrast of color-secondary on arc-green - Improve notifications icon, make circle bigger - Remove some inline styles - Fix focus in issue/pr title edit and select all text on button click ### Issue and PR before and after <img width="1249" alt="Screenshot 2023-05-01 at 11 44 22" src="https://user-images.githubusercontent.com/115237/235436662-a708288e-84fb-4b2e-a5a2-3a1c17d28f6c.png"> <img width="1248" alt="Screenshot 2023-05-01 at 11 58 51" src="https://user-images.githubusercontent.com/115237/235437992-f863e483-f3cc-4cc1-8204-fd223647a0c9.png"> ### Projects before and after <img width="1255" alt="Screenshot 2023-05-01 at 11 41 02" src="https://user-images.githubusercontent.com/115237/235436433-0deb85d6-4e7d-4e74-847f-254cc70a0cf9.png"> <img width="1267" alt="Screenshot 2023-05-01 at 11 40 03" src="https://user-images.githubusercontent.com/115237/235436431-715b13cb-f78c-4d86-b27a-9229f9738c5b.png"> ### Releases before and after <img width="1243" alt="Screenshot 2023-05-01 at 11 41 12" src="https://user-images.githubusercontent.com/115237/235436457-b655ee6f-03b8-4595-8d8c-b15ea469e988.png"> <img width="1240" alt="Screenshot 2023-05-01 at 11 40 10" src="https://user-images.githubusercontent.com/115237/235436456-05a2a0dd-7cbb-4f26-b0d3-4f667df4bb95.png"> ### Misc <img width="58" alt="Screenshot 2023-05-01 at 10 49 13" src="https://user-images.githubusercontent.com/115237/235432494-936ce995-6e22-47bc-ab2d-c9e93d31987d.png"> <img width="57" alt="Screenshot 2023-05-01 at 18 57 08" src="https://user-images.githubusercontent.com/115237/235492430-1d32cfe0-0f2c-467c-b2fa-925b27e30e0e.png"> Issue title edit and wrap: <img width="1238" alt="Screenshot 2023-05-01 at 12 34 40" src="https://user-images.githubusercontent.com/115237/235441407-d5067a57-e586-4865-a652-282e5944abb4.png"> <img width="1232" alt="Screenshot 2023-05-01 at 12 06 24" src="https://user-images.githubusercontent.com/115237/235438710-1a543dda-220f-4d87-8f93-f1710c0695f0.png"> --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
·
v1.24.0-devv1.20.0-rc0
1 parent 723598b commit 4a722c9

34 files changed

+255
-320
lines changed
 

‎templates/org/member/members.tmpl

+1-1
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/projects/list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{{end}}
1111

1212
{{template "base/alert" .}}
13-
<div class="small-pill-buttons ui compact tiny menu">
13+
<div class="small-menu-items ui compact tiny menu">
1414
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{$.Link}}?state=open">
1515
{{svg "octicon-project-symlink" 16 "gt-mr-3"}}
1616
{{.locale.PrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}

‎templates/repo/actions/openclose.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="small-pill-buttons ui compact tiny menu">
1+
<div class="small-menu-items ui compact tiny menu">
22
<a class="{{if not .IsShowClosed}}active {{end}}item" href="{{$.Link}}?workflow={{.CurWorkflow}}&state=open">
33
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
44
{{.locale.Tr "actions.runs.open_tab" $.NumOpenActionRuns}}

‎templates/repo/branch_dropdown.tmpl

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
{{/* Attributes:
2+
* root
3+
* ContainerClasses
4+
* (TODO: search "branch_dropdown" in the template direcotry)
5+
*/}}
16
{{$defaultBranch := $.root.BranchName}}
27
{{if and .root.IsViewTag (not .noTag)}}
38
{{$defaultBranch = .root.TagName}}
@@ -62,10 +67,10 @@
6267
window.config.pageData.branchDropdownDataList.push(data);
6368
</script>
6469

65-
<div class="fitted item js-branch-tag-selector">
70+
<div class="js-branch-tag-selector {{if .ContainerClasses}}{{.ContainerClasses}}{{end}}">
6671
{{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
6772
<div class="ui floating filter dropdown custom">
68-
<button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df">
73+
<button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df gt-m-0">
6974
<span class="text gt-df gt-ac gt-mr-2">
7075
{{if .release}}
7176
{{.root.locale.Tr "repo.release.compare"}}

‎templates/repo/commits.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{{template "repo/sub_menu" .}}
66
<div class="repo-button-row gt-df gt-ac gt-sb gt-fw gt-mb-4 gt-mt-3">
77
<div class="gt-df gt-ac">
8-
{{template "repo/branch_dropdown" dict "root" .}}
8+
{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}}
99
<a href="{{.RepoLink}}/graph" class="ui basic small compact button">
1010
<span class="text">
1111
{{svg "octicon-git-branch"}}

‎templates/repo/home.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
{{template "repo/sub_menu" .}}
6464
<div class="repo-button-row gt-df gt-ac gt-sb gt-fw">
6565
<div class="gt-df gt-ac gt-fw gt-gap-y-3">
66-
{{template "repo/branch_dropdown" dict "root" .}}
66+
{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "gt-mr-2"}}
6767
{{$n := len .TreeNames}}
6868
{{$l := Eval $n "-" 1}}
6969
<!-- If home page, show new pr. If not, show breadcrumb -->

‎templates/repo/issue/labels.tmpl

+1-2
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

-3
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

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
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">
17-
<div class="small-pill-buttons ui compact tiny menu">
16+
<div class="small-menu-items ui compact tiny menu">
1817
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=open&q={{$.Keyword}}">
1918
{{svg "octicon-milestone" 16 "gt-mr-3"}}
2019
{{.locale.PrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}

‎templates/repo/issue/navbar.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h2 class="ui compact small menu header small-pill-buttons">
1+
<h2 class="ui compact small menu header small-menu-items">
22
<a class="{{if .PageIsLabels}}active {{end}}item" href="{{.RepoLink}}/labels">{{.locale.Tr "repo.labels"}}</a>
33
<a class="{{if .PageIsMilestones}}active {{end}}item" href="{{.RepoLink}}/milestones">{{.locale.Tr "repo.milestones"}}</a>
44
</h2>

‎templates/repo/issue/new.tmpl

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository new issue">
33
{{template "repo/header" .}}
44
<div class="ui container">
5-
<div class="navbar">
6-
{{template "repo/issue/navbar" .}}
7-
</div>
8-
<div class="ui divider"></div>
95
{{if .Flash.WarningMsg}}
106
{{/*
117
There's already an importing of alert.tmpl in new_form.tmpl,

‎templates/repo/issue/openclose.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="small-pill-buttons ui compact tiny menu">
1+
<div class="small-menu-items ui compact tiny menu">
22
<a class="{{if not .IsShowClosed}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&project={{.ProjectID}}&assignee={{.AssigneeID}}&poster={{.PosterID}}">
33
{{if .PageIsPullList}}
44
{{svg "octicon-git-pull-request" 16 "gt-mr-3"}}

‎templates/repo/issue/view.tmpl

+2-23
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,11 @@
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>
5+
{{template "repo/issue/view_title" .}}
206
{{if .Issue.IsPull}}
21-
{{template "repo/issue/view_title" .}}
227
{{template "repo/pulls/tab_menu" .}}
23-
<div class="ui bottom attached tab pull active" data-tab="request-{{.ID}}">
24-
{{template "repo/issue/view_content" .}}
25-
</div>
26-
{{else}}
27-
<div>
28-
{{template "repo/issue/view_content" .}}
29-
</div>
308
{{end}}
9+
{{template "repo/issue/view_content" .}}
3110
</div>
3211
</div>
3312
{{template "base/footer" .}}

‎templates/repo/issue/view_content.tmpl

-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
<div class="ui stackable grid">
2-
{{if .Flash}}
3-
<div class="sixteen wide column">
4-
{{template "base/alert" .}}
5-
</div>
6-
{{end}}
7-
{{if not .Issue.IsPull}}
8-
{{template "repo/issue/view_title" .}}
9-
{{end}}
10-
112
<!-- I know, there is probably a better way to do this (moved from sidebar.tmpl, original author: 6543 @ 2021-02-28) -->
123
<!-- Agree, there should be a better way, eg: introduce window.config.pageData (original author: wxiaoguang @ 2021-09-05) -->
134
<input type="hidden" id="repolink" value="{{$.RepoRelPath}}">

‎templates/repo/issue/view_title.tmpl

+102-90
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,119 @@
1-
<div class="sixteen wide column title">
1+
{{if .Flash}}
2+
<div class="sixteen wide column gt-mb-3">
3+
{{template "base/alert" .}}
4+
</div>
5+
{{end}}
6+
<div class="issue-title-header">
27
<div class="issue-title" id="issue-title-wrapper">
3-
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
4-
<button id="edit-title" class="ui basic button secondary edit-button not-in-edit">{{.locale.Tr "repo.issues.edit"}}</button>
5-
{{end}}
6-
<h1>
7-
<span id="issue-title">{{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}}</span>
8-
<span class="index">#{{.Issue.Index}}</span>
9-
<div id="edit-title-input" class="ui input gt-ml-4 gt-hidden">
8+
<h1 class="gt-word-break">
9+
<span id="issue-title">{{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} <span class="index">#{{.Issue.Index}}</span>
10+
</span>
11+
<div id="edit-title-input" class="ui input gt-f1 gt-hidden">
1012
<input value="{{.Issue.Title}}" maxlength="255" autocomplete="off">
1113
</div>
1214
</h1>
15+
<div class="issue-title-buttons">
16+
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
17+
<button id="edit-title" class="ui small basic button secondary edit-button not-in-edit{{if .Issue.IsPull}} gt-mr-0{{end}}">{{.locale.Tr "repo.issues.edit"}}</button>
18+
{{end}}
19+
{{if not .Issue.IsPull}}
20+
<a role="button" class="ui small green button new-issue-button gt-mr-0" href="{{.RepoLink}}/issues/new{{if .NewIssueChooseTemplate}}/choose{{end}}">{{.locale.Tr "repo.issues.new"}}</a>
21+
{{end}}
22+
</div>
1323
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
1424
<div class="edit-buttons">
15-
<button id="cancel-edit-title" class="ui basic button secondary in-edit gt-hidden">{{.locale.Tr "repo.issues.cancel"}}</button>
16-
<button id="save-edit-title" class="ui primary button in-edit gt-hidden" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title" {{if .Issue.IsPull}}data-target-update-url="{{$.RepoLink}}/pull/{{.Issue.Index}}/target_branch"{{end}}>{{.locale.Tr "repo.issues.save"}}</button>
25+
<button id="cancel-edit-title" class="ui small basic button secondary in-edit gt-hidden">{{.locale.Tr "repo.issues.cancel"}}</button>
26+
<button id="save-edit-title" class="ui small primary button in-edit gt-hidden gt-mr-0" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title" {{if .Issue.IsPull}}data-target-update-url="{{$.RepoLink}}/pull/{{.Issue.Index}}/target_branch"{{end}}>{{.locale.Tr "repo.issues.save"}}</button>
1727
</div>
1828
{{end}}
1929
</div>
20-
{{if .HasMerged}}
21-
<div class="ui purple large label">{{svg "octicon-git-merge" 16}} {{if eq .Issue.PullRequest.Status 3}}{{.locale.Tr "repo.pulls.manually_merged"}}{{else}}{{.locale.Tr "repo.pulls.merged"}}{{end}}</div>
22-
{{else if .Issue.IsClosed}}
23-
<div class="ui red large label">{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}</div>
24-
{{else if .Issue.IsPull}}
25-
{{if .IsPullWorkInProgress}}
26-
<div class="ui grey large label">{{svg "octicon-git-pull-request-draft"}} {{.locale.Tr "repo.issues.draft_title"}}</div>
27-
{{else}}
28-
<div class="ui green large label">{{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}</div>
29-
{{end}}
30-
{{else}}
31-
<div class="ui green large label">{{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}</div>
32-
{{end}}
33-
34-
{{if .Issue.IsPull}}
35-
{{$headHref := .HeadTarget|Escape}}
36-
{{if .HeadBranchLink}}
37-
{{$headHref = printf "<a href=\"%s\">%s</a>" (.HeadBranchLink | Escape) $headHref}}
38-
{{end}}
39-
{{$headHref = printf "%s <a data-tooltip-content=\"%s\" data-clipboard-text=\"%s\">%s</a>" $headHref (.locale.Tr "copy_branch") (.HeadTarget | Escape) (svg "octicon-copy" 14)}}
40-
{{$baseHref := .BaseTarget|Escape}}
41-
{{if .BaseBranchLink}}
42-
{{$baseHref = printf "<a href=\"%s\">%s</a>" (.BaseBranchLink | Escape) $baseHref}}
43-
{{end}}
44-
{{if .Issue.PullRequest.HasMerged}}
45-
{{$mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix $.locale}}
46-
{{if .Issue.OriginalAuthor}}
47-
{{.Issue.OriginalAuthor}}
48-
<span class="pull-desc">{{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}}</span>
30+
<div class="issue-title-meta">
31+
{{if .HasMerged}}
32+
<div class="ui purple label issue-state-label">{{svg "octicon-git-merge" 16 "gt-mr-2"}} {{if eq .Issue.PullRequest.Status 3}}{{.locale.Tr "repo.pulls.manually_merged"}}{{else}}{{.locale.Tr "repo.pulls.merged"}}{{end}}</div>
33+
{{else if .Issue.IsClosed}}
34+
<div class="ui red label issue-state-label">{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}</div>
35+
{{else if .Issue.IsPull}}
36+
{{if .IsPullWorkInProgress}}
37+
<div class="ui grey label issue-state-label">{{svg "octicon-git-pull-request-draft"}} {{.locale.Tr "repo.issues.draft_title"}}</div>
4938
{{else}}
50-
<a {{if gt .Issue.PullRequest.Merger.ID 0}}href="{{.Issue.PullRequest.Merger.HomeLink}}"{{end}}>{{.Issue.PullRequest.Merger.GetDisplayName}}</a>
51-
<span class="pull-desc">{{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}}</span>
39+
<div class="ui green label issue-state-label">{{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}</div>
5240
{{end}}
5341
{{else}}
54-
{{if .Issue.OriginalAuthor}}
55-
<span id="pull-desc" class="pull-desc">{{.Issue.OriginalAuthor}} {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}}</span>
56-
{{else}}
57-
<span id="pull-desc" class="pull-desc">
58-
<a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a>
59-
{{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}}
60-
</span>
61-
{{end}}
62-
<span id="pull-desc-edit" class="gt-hidden">
63-
<div class="ui floating filter dropdown">
64-
<div class="ui basic small button">
65-
<span class="text">{{.locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}</span>
66-
</div>
67-
</div>
68-
{{svg "octicon-arrow-right"}}
69-
<div class="ui floating filter dropdown" data-no-results="{{.locale.Tr "repo.pulls.no_results"}}">
70-
<div class="ui basic small button">
71-
<span class="text" id="pull-target-branch" data-basename="{{$.BaseName}}" data-branch="{{$.BaseBranch}}">{{.locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span>
72-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
73-
</div>
74-
<div class="menu">
75-
<div class="ui icon search input">
76-
<i class="icon gt-df gt-ac gt-jc gt-m-0">{{svg "octicon-filter" 16}}</i>
77-
<input name="search" placeholder="{{.locale.Tr "repo.pulls.filter_branch"}}...">
42+
<div class="ui green label issue-state-label">{{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}</div>
43+
{{end}}
44+
<div class="gt-ml-3">
45+
{{if .Issue.IsPull}}
46+
{{$headHref := .HeadTarget|Escape}}
47+
{{if .HeadBranchLink}}
48+
{{$headHref = printf "<a href=\"%s\">%s</a>" (.HeadBranchLink | Escape) $headHref}}
49+
{{end}}
50+
{{$headHref = printf "%s <a data-tooltip-content=\"%s\" data-clipboard-text=\"%s\">%s</a>" $headHref (.locale.Tr "copy_branch") (.HeadTarget | Escape) (svg "octicon-copy" 14)}}
51+
{{$baseHref := .BaseTarget|Escape}}
52+
{{if .BaseBranchLink}}
53+
{{$baseHref = printf "<a href=\"%s\">%s</a>" (.BaseBranchLink | Escape) $baseHref}}
54+
{{end}}
55+
{{if .Issue.PullRequest.HasMerged}}
56+
{{$mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix $.locale}}
57+
{{if .Issue.OriginalAuthor}}
58+
{{.Issue.OriginalAuthor}}
59+
<span class="pull-desc">{{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}}</span>
60+
{{else}}
61+
<a {{if gt .Issue.PullRequest.Merger.ID 0}}href="{{.Issue.PullRequest.Merger.HomeLink}}"{{end}}>{{.Issue.PullRequest.Merger.GetDisplayName}}</a>
62+
<span class="pull-desc">{{$.locale.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}}</span>
63+
{{end}}
64+
{{else}}
65+
{{if .Issue.OriginalAuthor}}
66+
<span id="pull-desc" class="pull-desc">{{.Issue.OriginalAuthor}} {{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}}</span>
67+
{{else}}
68+
<span id="pull-desc" class="pull-desc">
69+
<a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a>
70+
{{$.locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}}
71+
</span>
72+
{{end}}
73+
<span id="pull-desc-edit" class="gt-hidden">
74+
<div class="ui floating filter dropdown">
75+
<div class="ui basic small button">
76+
<span class="text">{{.locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}</span>
77+
</div>
7878
</div>
79-
<div class="scrolling menu" id="branch-select">
80-
{{range .Branches}}
81-
{{$sameBase := ne $.BaseName $.HeadUserName}}
82-
{{$differentBranch := ne . $.HeadBranch}}
83-
{{if or $sameBase $differentBranch}}
84-
<div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-branch="{{.}}">{{$.BaseName}}{{if $.HeadRepo}}/{{$.HeadRepo}}{{end}}:{{.}}</div>
85-
{{end}}
86-
{{end}}
79+
{{svg "octicon-arrow-right"}}
80+
<div class="ui floating filter dropdown" data-no-results="{{.locale.Tr "repo.pulls.no_results"}}">
81+
<div class="ui basic small button">
82+
<span class="text" id="pull-target-branch" data-basename="{{$.BaseName}}" data-branch="{{$.BaseBranch}}">{{.locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span>
83+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
84+
</div>
85+
<div class="menu">
86+
<div class="ui icon search input">
87+
<i class="icon gt-df gt-ac gt-jc gt-m-0">{{svg "octicon-filter" 16}}</i>
88+
<input name="search" placeholder="{{.locale.Tr "repo.pulls.filter_branch"}}...">
89+
</div>
90+
<div class="scrolling menu" id="branch-select">
91+
{{range .Branches}}
92+
{{$sameBase := ne $.BaseName $.HeadUserName}}
93+
{{$differentBranch := ne . $.HeadBranch}}
94+
{{if or $sameBase $differentBranch}}
95+
<div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-branch="{{.}}">{{$.BaseName}}{{if $.HeadRepo}}/{{$.HeadRepo}}{{end}}:{{.}}</div>
96+
{{end}}
97+
{{end}}
98+
</div>
99+
</div>
87100
</div>
88-
</div>
89-
</div>
90-
</span>
91-
{{end}}
92-
{{else}}
93-
{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
94-
<span class="time-desc">
95-
{{if .Issue.OriginalAuthor}}
96-
{{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.OriginalAuthor|Escape) | Safe}}
97-
{{else if gt .Issue.Poster.ID 0}}
98-
{{$.locale.Tr "repo.issues.opened_by" $createdStr (.Issue.Poster.HomeLink|Escape) (.Issue.Poster.GetDisplayName|Escape) | Safe}}
101+
</span>
102+
{{end}}
99103
{{else}}
100-
{{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.Poster.GetDisplayName|Escape) | Safe}}
104+
{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
105+
<span class="time-desc">
106+
{{if .Issue.OriginalAuthor}}
107+
{{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.OriginalAuthor|Escape) | Safe}}
108+
{{else if gt .Issue.Poster.ID 0}}
109+
{{$.locale.Tr "repo.issues.opened_by" $createdStr (.Issue.Poster.HomeLink|Escape) (.Issue.Poster.GetDisplayName|Escape) | Safe}}
110+
{{else}}
111+
{{$.locale.Tr "repo.issues.opened_by_fake" $createdStr (.Issue.Poster.GetDisplayName|Escape) | Safe}}
112+
{{end}}
113+
·
114+
{{$.locale.Tr "repo.issues.num_comments" .Issue.NumComments}}
115+
</span>
101116
{{end}}
102-
·
103-
{{$.locale.Tr "repo.issues.num_comments" .Issue.NumComments}}
104-
</span>
105-
{{end}}
106-
<div class="ui divider"></div>
117+
</div>
118+
</div>
107119
</div>

‎templates/repo/projects/list.tmpl

+29-31
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-menu-items 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

+1-10
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,9 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository view issue pull commits">
33
{{template "repo/header" .}}
44
<div class="ui container">
5-
<div class="navbar">
6-
{{template "repo/issue/navbar" .}}
7-
<div class="ui right">
8-
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName | PathEscapeSegments}}...{{.PullRequestCtx.HeadInfoSubURL}}">{{.locale.Tr "repo.pulls.new"}}</a>
9-
</div>
10-
</div>
11-
<div class="ui divider"></div>
125
{{template "repo/issue/view_title" .}}
136
{{template "repo/pulls/tab_menu" .}}
14-
<div class="ui bottom attached tab pull active">
15-
{{template "repo/commits_table" .}}
16-
</div>
7+
{{template "repo/commits_table" .}}
178
</div>
189
</div>
1910
{{template "base/footer" .}}

‎templates/repo/pulls/files.tmpl

+2-12
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,10 @@
55

66
<div role="main" aria-label="{{.Title}}" class="page-content repository view issue pull files diff">
77
{{template "repo/header" .}}
8-
<div class="ui container fluid padded">
9-
<div class="navbar">
10-
{{template "repo/issue/navbar" .}}
11-
<div class="ui right">
12-
<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{.RepoLink}}/compare/{{.BranchName | PathEscapeSegments}}...{{.PullRequestCtx.HeadInfoSubURL}}">{{.locale.Tr "repo.pulls.new"}}</a>
13-
</div>
14-
</div>
15-
<div class="ui divider"></div>
8+
<div class="ui container">
169
{{template "repo/issue/view_title" .}}
1710
{{template "repo/pulls/tab_menu" .}}
18-
{{template "base/alert" .}}
19-
<div class="ui bottom attached tab pull active">
20-
{{template "repo/diff/box" .}}
21-
</div>
11+
{{template "repo/diff/box" .}}
2212
</div>
2313
</div>
2414
{{template "base/footer" .}}

‎templates/repo/release/list.tmpl

+4-6
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@
1414
<ul id="release-list">
1515
{{range $idx, $release := .Releases}}
1616
<li class="ui grid">
17-
<div class="ui four wide column meta gt-mt-2">
18-
<a class="gt-df gt-ac gt-je muted" href="{{if not .Sha1}}#{{else}}{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}{{end}}" rel="nofollow">{{svg "octicon-tag" 16 "gt-mr-2"}}{{.TagName}}</a>
17+
<div class="ui four wide column meta">
18+
<a class="gt-db muted" href="{{if not .Sha1}}#{{else}}{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}{{end}}" rel="nofollow">{{svg "octicon-tag" 16 "gt-mr-2"}}{{.TagName}}</a>
1919
{{if .Sha1}}
20-
<span class="commit">
21-
<a class="gt-mono muted" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a>
22-
</span>
23-
{{template "repo/branch_dropdown" dict "root" $ "release" .}}
20+
<a class="gt-mono muted gt-db gt-mt-4 gt-pt-1" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a>
21+
{{template "repo/branch_dropdown" dict "root" $ "release" . "ContainerClasses" "gt-mt-4"}}
2422
{{end}}
2523
</div>
2624
<div class="ui twelve wide column detail">

‎templates/repo/settings/options.tmpl

+3-3
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}}">

‎templates/repo/sub_menu_release_tag.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{{$canReadCode := $.Permission.CanRead $.UnitTypeCode}}
33

44
{{if $canReadReleases}}
5-
<h2 class="ui compact small menu header small-pill-buttons">
5+
<h2 class="ui compact small menu header small-menu-items">
66
<a class="{{if .PageIsReleaseList}}active {{end}}item" href="{{.RepoLink}}/releases">{{.locale.Tr "repo.release.releases"}}</a>
77
{{if $canReadCode}}
88
<a class="{{if .PageIsTagList}}active {{end}}item" href="{{.RepoLink}}/tags">{{.locale.Tr "repo.release.tags"}}</a>

‎templates/user/dashboard/issues.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</div>
6262
<div class="twelve wide column content">
6363
<div class="list-header">
64-
<div class="small-pill-buttons ui compact tiny menu">
64+
<div class="small-menu-items ui compact tiny menu">
6565
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}">
6666
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
6767
{{.locale.PrettyNumber .IssueStats.OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}

‎templates/user/dashboard/milestones.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</div>
3636
<div class="twelve wide column content">
3737
<div class="list-header">
38-
<div class="small-pill-buttons ui compact tiny menu">
38+
<div class="small-menu-items ui compact tiny menu">
3939
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}">
4040
{{svg "octicon-milestone" 16 "gt-mr-3"}}
4141
{{.locale.PrettyNumber .MilestoneStats.OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}

‎templates/user/notification/notification_subscriptions.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{{if eq .Status 1}}
1414
<div class="ui stackable grid">
1515
<div class="six wide column">
16-
<div class="small-pill-buttons ui compact tiny menu">
16+
<div class="small-menu-items ui compact tiny menu">
1717
<a class="{{if eq .State "all"}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state=all&issueType={{$.IssueType}}&labels={{$.Labels}}">
1818
{{.locale.Tr "all"}}
1919
</a>

‎tests/integration/issue_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func testNewIssue(t *testing.T, session *TestSession, user, repo, title, content
143143

144144
htmlDoc = NewHTMLParser(t, resp.Body)
145145
val := htmlDoc.doc.Find("#issue-title").Text()
146-
assert.Equal(t, title, val)
146+
assert.Contains(t, val, title)
147147
val = htmlDoc.doc.Find(".comment .render-content p").First().Text()
148148
assert.Equal(t, content, val)
149149

‎web_src/css/base.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -2559,18 +2559,18 @@ a.ui.basic.label:hover {
25592559

25602560
.notification_count {
25612561
position: absolute;
2562-
left: 5px;
2563-
top: -8px;
2562+
left: 7px;
2563+
top: -9px;
25642564
min-width: 1.5em;
25652565
text-align: center;
25662566
background: var(--color-primary);
25672567
border: 2px solid var(--color-header-bar);
25682568
color: var(--color-header-bar);
2569-
padding: 2px;
2569+
padding: 2.75px;
25702570
border-radius: 1em;
2571-
font-size: 10px;
2571+
font-size: 11px;
25722572
font-weight: 700;
2573-
line-height: 0.7;
2573+
line-height: .67em;
25742574
}
25752575

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

‎web_src/css/repository.css

+46-48
Original file line numberDiff line numberDiff line change
@@ -591,85 +591,81 @@
591591
display: inline-block;
592592
}
593593

594-
.repository.view.issue .title {
595-
padding-bottom: 0 !important;
596-
}
597-
598-
.repository.view.issue .title .issue-title {
599-
margin-bottom: 0.5rem;
594+
.issue-title-header {
595+
width: 100%;
596+
padding-bottom: 4px;
597+
margin-bottom: 1rem;
600598
}
601599

602-
.repository.view.issue .title .issue-title.edit-active {
600+
.issue-title-meta {
603601
display: flex;
604602
align-items: center;
605603
}
606604

607-
.repository.view.issue .title .issue-title.edit-active h1 {
605+
.repository.view.issue .issue-title-buttons,
606+
.repository.view.issue .edit-buttons {
608607
display: flex;
609-
width: 100%;
610608
}
611609

612610
@media (max-width: 767px) {
613-
.repository.view.issue .title .issue-title.edit-active {
611+
.repository.view.issue .issue-title {
614612
flex-direction: column;
615613
}
616-
.repository.view.issue .title .issue-title.edit-active h1 {
617-
margin-right: 0;
618-
margin-bottom: 1rem;
619-
padding-right: 0;
620-
}
621-
.repository.view.issue .title .issue-title.edit-active h1 .ui.input input {
622-
width: calc(100% - 2rem);
623-
}
624-
.repository.view.issue .title .issue-title.edit-active .edit-buttons {
625-
padding-bottom: 1rem;
626-
width: 100%;
627-
}
628-
.repository.view.issue .title .issue-title.edit-active .edit-buttons .button {
629-
width: 100%;
630-
margin-right: 0.5rem;
631-
}
632-
.repository.view.issue .title .issue-title.edit-active .edit-buttons .button:last-child {
633-
margin-right: 0;
614+
.repository.view.issue .edit-buttons {
615+
margin-top: .5rem;
634616
}
635617
}
636618

637-
.repository.view.issue .title .issue-title h1 {
619+
.repository.view.issue .issue-title {
620+
display: flex;
621+
align-items: center;
622+
margin-bottom: 8px;
623+
}
624+
625+
.repository.view.issue .issue-title h1 {
626+
display: flex;
627+
align-items: center;
628+
flex: 1;
629+
width: 100%;
638630
font-weight: 300;
639-
font-size: 2.3rem;
631+
font-size: 32px;
632+
line-height: 40px;
640633
margin: 0;
641-
padding-right: 0.5rem;
634+
padding-right: 0.25rem;
635+
min-height: 41px; /* avoid layout shift on edit */
642636
}
643637

644-
.repository.view.issue .title .issue-title h1 .ui.input {
638+
.repository.view.issue .issue-title h1 .ui.input {
645639
font-size: 0.5em;
646-
width: 100%;
647640
}
648641

649-
.repository.view.issue .title .issue-title h1 .ui.input input {
642+
.repository.view.issue .issue-title h1 .ui.input input {
650643
font-size: 1.5em;
651-
padding: 6px 1rem;
644+
padding: 2px .5rem;
652645
}
653646

654-
.repository.view.issue .title .issue-title .edit-button {
655-
float: right;
656-
padding-left: 1rem;
647+
.repository.view.issue .issue-title .index {
648+
color: var(--color-text-light-2);
657649
}
658650

659-
.repository.view.issue .title .issue-title .edit-buttons {
660-
display: flex;
651+
.repository.view.issue .issue-title .label {
652+
margin-right: 10px;
661653
}
662654

663-
.repository.view.issue .title .issue-title .index {
664-
color: var(--color-text-light-2);
655+
.repository.view.issue .issue-title .edit-zone {
656+
margin-top: 10px;
665657
}
666658

667-
.repository.view.issue .title .issue-title .label {
668-
margin-right: 10px;
659+
.issue-state-label {
660+
display: flex !important;
661+
align-items: center !important;
662+
font-size: 14px !important;
663+
padding: 7px 10px !important;
664+
border-radius: 6px !important;
669665
}
670666

671-
.repository.view.issue .title .issue-title .edit-zone {
672-
margin-top: 10px;
667+
.issue-state-label .svg {
668+
margin-right: 4px;
673669
}
674670

675671
.repository.view.issue .pull-desc code {
@@ -1193,13 +1189,15 @@
11931189

11941190
.repository .milestone.list {
11951191
list-style: none;
1196-
padding-top: 15px;
11971192
}
11981193

11991194
.repository .milestone.list > .item {
12001195
padding-top: 10px;
12011196
padding-bottom: 10px;
1202-
border-bottom: 1px dashed var(--color-secondary);
1197+
}
1198+
1199+
.repository .milestone.list > .item + .item {
1200+
border-top: 1px solid var(--color-secondary);
12031201
}
12041202

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

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

+1
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/list-header.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
flex: 1;
2727
}
2828

29-
.small-pill-buttons {
29+
.small-menu-items {
3030
min-height: 35.4px !important; /* match .small.button in height */
3131
}
3232

33-
.small-pill-buttons .item {
33+
.small-menu-items .item {
3434
padding-top: 6px !important;
3535
padding-bottom: 6px !important;
3636
}

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

+5-22
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

@@ -23,29 +22,13 @@
2322
}
2423

2524
.repository.releases #release-list > li .meta {
25+
margin-top: 4px;
2626
text-align: right;
2727
position: relative;
2828
}
2929

30-
.repository.releases #release-list > li .meta .label {
31-
margin-right: 0;
32-
}
33-
34-
.repository.releases #release-list > li .meta .commit {
35-
display: block;
36-
margin-top: 10px;
37-
}
38-
39-
.repository.releases #release-list > li .meta .choose {
40-
margin-top: 15px;
41-
}
42-
43-
.repository.releases #release-list > li .meta .choose .button {
44-
margin-right: 0;
45-
}
46-
4730
.repository.releases #release-list > li .detail {
48-
border-left: 2px solid var(--color-secondary);
31+
border-left: 1px solid var(--color-secondary);
4932
}
5033

5134
.repository.releases #release-list > li .detail .author img {
@@ -92,7 +75,7 @@
9275
z-index: 9;
9376
position: absolute;
9477
display: block;
95-
left: -6px;
78+
left: -5.5px;
9679
top: 40px;
9780
border-radius: 100%;
9881
border: 2.5px solid var(--color-body);

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

+26-26
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;

‎web_src/js/components/RepoBranchTagSelector.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="ui floating filter dropdown custom">
3-
<button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df" @click="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible">
3+
<button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df gt-m-0" @click="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible">
44
<span class="text gt-df gt-ac gt-mr-2">
55
<template v-if="release">{{ textReleaseCompare }}</template>
66
<template v-else>

‎web_src/js/features/repo-issue.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,10 @@ export function initRepoIssueTitleEdit() {
572572
toggleElem($('#pull-desc'));
573573
toggleElem($('#pull-desc-edit'));
574574
toggleElem($('.in-edit'));
575+
toggleElem($('.new-issue-button'));
575576
$('#issue-title-wrapper').toggleClass('edit-active');
576-
$editInput.trigger('focus');
577+
$editInput[0].focus();
578+
$editInput[0].select();
577579
return false;
578580
};
579581

‎web_src/js/features/repo-legacy.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,7 @@ export function initRepository() {
469469
return;
470470
}
471471

472-
// File list and commits
473-
if ($('.repository.file.list').length > 0 || $('.branch-dropdown').length > 0 ||
474-
$('.repository.commits').length > 0 || $('.repository.release').length > 0) {
475-
initRepoBranchTagSelector('.js-branch-tag-selector');
476-
}
472+
initRepoBranchTagSelector('.js-branch-tag-selector');
477473

478474
// Options
479475
if ($('.repository.settings.options').length > 0) {

0 commit comments

Comments
 (0)
Please sign in to comment.