{{template "repo/header" .}}
-
-
- {{template "repo/issue/navbar" .}} -
-
- {{template "repo/issue/search" .}} -
+
+ {{template "repo/issue/navbar" .}} + {{template "repo/issue/search" .}} {{if not .Repository.IsArchived}} -
- {{if .PageIsIssueList}} - {{.locale.Tr "repo.issues.new"}} - {{else}} - {{.locale.Tr "repo.pulls.new"}} - {{end}} -
+ {{if .PageIsIssueList}} + {{.locale.Tr "repo.issues.new"}} + {{else}} + {{.locale.Tr "repo.pulls.new"}} + {{end}} {{else}} {{if not .PageIsIssueList}} -
- {{$.locale.Tr "action.compare_commits_general"}} -
+ {{$.locale.Tr "action.compare_commits_general"}} {{end}} {{end}}
@@ -176,7 +168,7 @@ {{end}} -
+
{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 3a23d225c4..ceaad947d2 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -6,53 +6,49 @@ {{template "repo/issue/navbar" .}} {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
- {{.locale.Tr "repo.milestones.new"}} + {{.locale.Tr "repo.milestones.new"}}
{{end}}
{{template "base/alert" .}} -
-
-
- - {{svg "octicon-milestone" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - - - {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - -
+
+
+ + {{svg "octicon-milestone" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} + + + {{svg "octicon-check" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} +
-
- -
- - - -
- -
+
+
+ + + +
+
-
- -
- - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}} - {{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}} - {{.locale.Tr "repo.milestones.filter_sort.least_complete"}} - {{.locale.Tr "repo.milestones.filter_sort.most_complete"}} - {{.locale.Tr "repo.milestones.filter_sort.most_issues"}} - {{.locale.Tr "repo.milestones.filter_sort.least_issues"}} -
+ +
+ + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+ {{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}} + {{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}} + {{.locale.Tr "repo.milestones.filter_sort.least_complete"}} + {{.locale.Tr "repo.milestones.filter_sort.most_complete"}} + {{.locale.Tr "repo.milestones.filter_sort.most_issues"}} + {{.locale.Tr "repo.milestones.filter_sort.least_issues"}}
diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index fce835d66a..da4f17d28e 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -

+

{{.locale.Tr "repo.labels"}} {{.locale.Tr "repo.milestones"}}

diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl index 045f513974..6c8529f0ff 100644 --- a/templates/repo/issue/openclose.tmpl +++ b/templates/repo/issue/openclose.tmpl @@ -1,4 +1,4 @@ -
+
{{if .PageIsPullList}} {{svg "octicon-git-pull-request" 16 "gt-mr-3"}} diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl index 9a8a77bb87..cb460eae6f 100644 --- a/templates/repo/issue/search.tmpl +++ b/templates/repo/issue/search.tmpl @@ -1,5 +1,5 @@ -
-
+ +
@@ -8,6 +8,8 @@ - +
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 5fd1466331..5cd94c626d 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -6,13 +6,13 @@ {{template "repo/issue/navbar" .}} {{if and .CanWriteProjects (not .Repository.IsArchived)}}
- {{.locale.Tr "repo.projects.new"}} + {{.locale.Tr "repo.projects.new"}}
{{end}}
{{template "base/alert" .}} -
+
{{svg "octicon-project" 16 "gt-mr-3"}} {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl index 4778279317..5bfb367ece 100644 --- a/templates/repo/projects/new.tmpl +++ b/templates/repo/projects/new.tmpl @@ -6,7 +6,7 @@ {{template "repo/issue/navbar" .}} {{if and .CanWriteProjects .PageIsEditProject}}
- {{.locale.Tr "repo.milestones.new"}} + {{.locale.Tr "repo.milestones.new"}}
{{end}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index fa98d2eeba..4c4f82c8e7 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -8,8 +8,8 @@
{{if and .CanWriteProjects (not .Repository.IsArchived)}} - {{.locale.Tr "repo.issues.new"}} - {{.locale.Tr "new_project_column"}} + {{.locale.Tr "repo.issues.new"}} + {{.locale.Tr "new_project_column"}} {{end}}
-
-
-
- - {{svg "octicon-issue-opened" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .IssueStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - - - {{svg "octicon-issue-closed" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .IssueStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - +
+
+ + {{svg "octicon-issue-opened" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .IssueStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} + + + {{svg "octicon-issue-closed" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .IssueStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} + +
+
+
+ + + + + + +
+
+ +
+ + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+ {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{.locale.Tr "repo.issues.filter_sort.latest"}} + {{.locale.Tr "repo.issues.filter_sort.oldest"}} + {{.locale.Tr "repo.issues.filter_sort.mostcomment"}} + {{.locale.Tr "repo.issues.filter_sort.leastcomment"}} + {{.locale.Tr "repo.issues.filter_sort.nearduedate"}} + {{.locale.Tr "repo.issues.filter_sort.farduedate"}}
-
-
-
- - - - - - -
-
-
-
- -
- - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{.locale.Tr "repo.issues.filter_sort.latest"}} - {{.locale.Tr "repo.issues.filter_sort.oldest"}} - {{.locale.Tr "repo.issues.filter_sort.mostcomment"}} - {{.locale.Tr "repo.issues.filter_sort.leastcomment"}} - {{.locale.Tr "repo.issues.filter_sort.nearduedate"}} - {{.locale.Tr "repo.issues.filter_sort.farduedate"}} -
-
- {{if .SingleRepoLink}} - {{if eq .SingleRepoAction "issue"}} - {{.locale.Tr "repo.issues.new"}} - {{else if eq .SingleRepoAction "pull"}} - {{.locale.Tr "repo.pulls.new"}} - {{end}} + {{if .SingleRepoLink}} + {{if eq .SingleRepoAction "issue"}} + {{.locale.Tr "repo.issues.new"}} + {{else if eq .SingleRepoAction "pull"}} + {{.locale.Tr "repo.pulls.new"}} {{end}} -
+ {{end}}
{{template "shared/issuelist" dict "." . "listType" "dashboard"}}
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index aaa728dab0..f9d8ae1eb0 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -34,46 +34,40 @@
-
-
-
- - {{svg "octicon-milestone" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .MilestoneStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - - - {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .MilestoneStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - +
+
+ + {{svg "octicon-milestone" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .MilestoneStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} + + + {{svg "octicon-check" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .MilestoneStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} + +
+
+
+ + + + + +
-
-
- -
- - - - - - -
- -
-
- -
- - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}} - {{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}} - {{.locale.Tr "repo.milestones.filter_sort.least_complete"}} - {{.locale.Tr "repo.milestones.filter_sort.most_complete"}} - {{.locale.Tr "repo.milestones.filter_sort.most_issues"}} - {{.locale.Tr "repo.milestones.filter_sort.least_issues"}} -
+ + +
+ + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+ {{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}} + {{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}} + {{.locale.Tr "repo.milestones.filter_sort.least_complete"}} + {{.locale.Tr "repo.milestones.filter_sort.most_complete"}} + {{.locale.Tr "repo.milestones.filter_sort.most_issues"}} + {{.locale.Tr "repo.milestones.filter_sort.least_issues"}}
diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index 26a33bf9ba..ce46919236 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -13,7 +13,7 @@ {{if eq .Status 1}}
-
+
{{.locale.Tr "all"}} diff --git a/tests/integration/pull_compare_test.go b/tests/integration/pull_compare_test.go index fa385ddae4..f5baf05965 100644 --- a/tests/integration/pull_compare_test.go +++ b/tests/integration/pull_compare_test.go @@ -19,7 +19,7 @@ func TestPullCompare(t *testing.T) { req := NewRequest(t, "GET", "/user2/repo1/pulls") resp := session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) - link, exists := htmlDoc.doc.Find(".ui.three.column.grid").Find(".ui.green.button").Attr("href") + link, exists := htmlDoc.doc.Find(".new-pr-button").Attr("href") assert.True(t, exists, "The template has changed") req = NewRequest(t, "GET", link) diff --git a/web_src/css/base.css b/web_src/css/base.css index a5a3377376..0aefbd0c3f 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -769,6 +769,10 @@ a.label, border-color: var(--color-primary); } +.ui.action.input .button { + border-color: var(--color-input-border); +} + /* currently used for search bar dropdowns in repo search and explore code */ .ui.action.input:not([class*="left action"]) > .ui.dropdown.selection { min-width: 10em; @@ -778,10 +782,21 @@ a.label, border-right-color: transparent; } +.ui.action.input:not([class*="left action"]) > input:hover { + border-right-color: transparent; +} + .ui.action.input:not([class*="left action"]) > input:focus { border-right-color: var(--color-primary); } +/* fix button enlarged vertically by svg icon */ +/* TODO: change to just `.small.button:has(svg)` but may have global side effects */ +.ui.action.input .small.button:has(svg) { + padding-top: 7px !important; + padding-bottom: 7px !important; +} + .ui.menu, .ui.vertical.menu { background: var(--color-menu); @@ -830,6 +845,10 @@ a.label, color: var(--color-text-light-3); } +.ui.menu .item::before { + background: var(--color-secondary); +} + /* sub menu of vertical menu */ .ui.vertical.menu .item .menu .item { color: var(--color-text-light-2); diff --git a/web_src/css/index.css b/web_src/css/index.css index 9d00566674..cdd0c51a54 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -32,6 +32,7 @@ @import "./repository.css"; @import "./repository/release-tag.css"; @import "./repository/issue-label.css"; +@import "./repository/list-header.css"; @import "./editor.css"; @import "./editor/combomarkdowneditor.css"; @import "./organization.css"; diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 5ef7bd6c50..6ad6ba88a8 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -161,7 +161,7 @@ .repository .ui.tabs.divider { margin-top: -1px; - margin-bottom: 20px; + margin-bottom: 12px; } .repository #clone-panel #repo-clone-url { @@ -3289,18 +3289,6 @@ td.blob-excerpt { .repository.file.list #repo-files-table .commit-list span.commit-summary { display: none !important; } - .issue-list-headers.ui[class].grid > div:nth-child(1) { - order: 1; - width: 50%; - } - .issue-list-headers.ui[class].grid > div:nth-child(2) { - order: 3; - width: 100%; - } - .issue-list-headers.ui[class].grid > div.column:not(.row):nth-child(3) { - order: 2; - width: 50%; - } .repository.view.issue .comment-list .timeline, .repository.view.issue .comment-list .timeline-item { margin-left: 0; diff --git a/web_src/css/repository/list-header.css b/web_src/css/repository/list-header.css new file mode 100644 index 0000000000..4130383f89 --- /dev/null +++ b/web_src/css/repository/list-header.css @@ -0,0 +1,36 @@ +.list-header { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: .5rem; +} + +.list-header-sort { + display: flex; + align-items: center; + justify-content: flex-end; + padding-left: 1rem; + padding-right: 1rem; +} + +.list-header-search { + display: flex; + flex: 1; + align-items: center; + flex-wrap: wrap; + justify-content: center; + min-width: 200px; /* to enable flexbox wrapping on mobile */ +} + +.list-header-search .input { + flex: 1; +} + +.small-pill-buttons { + min-height: 35.4px !important; /* match .small.button in height */ +} + +.small-pill-buttons .item { + padding-top: 6px !important; + padding-bottom: 6px !important; +}