diff options
author | silverwind <me@silverwind.io> | 2023-04-30 05:33:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-29 23:33:25 -0400 |
commit | 8f4dafcd4e6b0b5d307c3e060ffe908c2a96f047 (patch) | |
tree | 64ffc8db1d00e3a608aad99bb9ddaaaca9ad8d56 | |
parent | 0f52beb6b7e9fcb755cad64a60682ea76cfa2c9e (diff) | |
download | gitea-8f4dafcd4e6b0b5d307c3e060ffe908c2a96f047.tar.gz gitea-8f4dafcd4e6b0b5d307c3e060ffe908c2a96f047.zip |
Rework header bar on issue, pull requests and milestone (#24420)
- Make search bar dynamic full width via flexbox
- Make all buttons `small` so font size is the same for all elements in
the header
- Remove primary color from search field, add SVG icon like on Code tab
- Fix button vertical padding being enlarged by SVG icons
[View diff without
whitespace](https://github.com/go-gitea/gitea/pull/24420/files?diff=unified&w=1)
<img width="1226" alt="Screenshot 2023-04-29 at 11 58 53"
src="https://user-images.githubusercontent.com/115237/235296851-74848267-664f-4c1f-b94c-a1b94196ff75.png">
<img width="1219" alt="Screenshot 2023-04-29 at 11 59 39"
src="https://user-images.githubusercontent.com/115237/235296852-bcfde5ed-8658-43c2-b7e5-3ad84611e76f.png">
Mobile:
<img width="437" alt="Screenshot 2023-04-29 at 11 59 52"
src="https://user-images.githubusercontent.com/115237/235296860-99263373-7b27-4540-868c-a93e70f281ca.png">
<img width="433" alt="Screenshot 2023-04-29 at 12 00 00"
src="https://user-images.githubusercontent.com/115237/235296862-6cf64317-a864-405a-a00f-b5ab620349f5.png">
-rw-r--r-- | templates/projects/list.tmpl | 4 | ||||
-rw-r--r-- | templates/projects/new.tmpl | 2 | ||||
-rw-r--r-- | templates/projects/view.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/actions/openclose.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/home.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/issue/list.tmpl | 28 | ||||
-rw-r--r-- | templates/repo/issue/milestones.tmpl | 70 | ||||
-rw-r--r-- | templates/repo/issue/navbar.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/issue/openclose.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/issue/search.tmpl | 8 | ||||
-rw-r--r-- | templates/repo/projects/list.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/projects/new.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/projects/view.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/sub_menu_release_tag.tmpl | 2 | ||||
-rw-r--r-- | templates/user/dashboard/issues.tmpl | 90 | ||||
-rw-r--r-- | templates/user/dashboard/milestones.tmpl | 72 | ||||
-rw-r--r-- | templates/user/notification/notification_subscriptions.tmpl | 2 | ||||
-rw-r--r-- | tests/integration/pull_compare_test.go | 2 | ||||
-rw-r--r-- | web_src/css/base.css | 19 | ||||
-rw-r--r-- | web_src/css/index.css | 1 | ||||
-rw-r--r-- | web_src/css/repository.css | 14 | ||||
-rw-r--r-- | web_src/css/repository/list-header.css | 36 |
22 files changed, 197 insertions, 175 deletions
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index ac4b34a960..1ef0b0be97 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -3,14 +3,14 @@ {{if .CanWriteProjects}} <div class="navbar"> <div class="ui right"> - <a class="ui green button" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a> + <a class="ui small green button" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a> </div> </div> <div class="ui divider"></div> {{end}} {{template "base/alert" .}} - <div class="ui compact tiny menu"> + <div class="small-pill-buttons ui compact tiny menu"> <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{$.Link}}?state=open"> {{svg "octicon-project-symlink" 16 "gt-mr-3"}} {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 9accfbcc1c..60609999fc 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -3,7 +3,7 @@ <div class="navbar"> {{if and .CanWriteProjects .PageIsEditProject}} <div class="ui right floated secondary menu"> - <a class="ui green button" href="{{$.HomeLink}}/-/projects/new">{{.locale.Tr "repo.milestones.new"}}</a> + <a class="ui small green button" href="{{$.HomeLink}}/-/projects/new">{{.locale.Tr "repo.milestones.new"}}</a> </div> {{end}} </div> diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index c108d0b370..705ce52d6c 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -5,7 +5,7 @@ </div> <div class="column right aligned"> {{if .CanWriteProjects}} - <a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a> + <a class="ui small green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a> {{end}} <div class="ui small modal new-board-modal" id="new-board-item"> <div class="header"> diff --git a/templates/repo/actions/openclose.tmpl b/templates/repo/actions/openclose.tmpl index 804ef104ef..74630187cd 100644 --- a/templates/repo/actions/openclose.tmpl +++ b/templates/repo/actions/openclose.tmpl @@ -1,4 +1,4 @@ -<div class="ui compact tiny menu"> +<div class="small-pill-buttons ui compact tiny menu"> <a class="{{if not .IsShowClosed}}active {{end}}item" href="{{$.Link}}?workflow={{.CurWorkflow}}&state=open"> {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.Tr "actions.runs.open_tab" $.NumOpenActionRuns}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index de7c3a1dd0..1db073c326 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -14,12 +14,12 @@ <div class="ui repo-search"> <form class="ui form ignore-dirty" action="{{.RepoLink}}/search" method="get"> <div class="field"> - <div class="ui action input{{if .CodeIndexerUnavailable}} disabled left icon{{end}}"{{if .CodeIndexerUnavailable}} data-tooltip-content="{{.locale.Tr "repo.search.code_search_unavailable"}}"{{end}}> + <div class="ui small action input{{if .CodeIndexerUnavailable}} disabled left icon{{end}}"{{if .CodeIndexerUnavailable}} data-tooltip-content="{{.locale.Tr "repo.search.code_search_unavailable"}}"{{end}}> <input name="q" value="{{.Keyword}}"{{if .CodeIndexerUnavailable}} disabled{{end}} placeholder="{{.locale.Tr "repo.search.search_repo"}}"> {{if .CodeIndexerUnavailable}} <i class="icon gt-df gt-ac gt-jc">{{svg "octicon-alert"}}</i> {{end}} - <button class="ui icon button"{{if .CodeIndexerUnavailable}} disabled{{end}} type="submit"> + <button class="ui small icon button"{{if .CodeIndexerUnavailable}} disabled{{end}} type="submit"> {{svg "octicon-search"}} </button> </div> diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index a99680c024..ba927b8498 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -2,26 +2,18 @@ <div role="main" aria-label="{{.Title}}" class="page-content repository issue-list"> {{template "repo/header" .}} <div class="ui container"> - <div class="ui three column grid issue-list-headers"> - <div class="column"> - {{template "repo/issue/navbar" .}} - </div> - <div class="column center aligned"> - {{template "repo/issue/search" .}} - </div> + <div class="list-header"> + {{template "repo/issue/navbar" .}} + {{template "repo/issue/search" .}} {{if not .Repository.IsArchived}} - <div class="column right aligned"> - {{if .PageIsIssueList}} - <a class="ui green button" href="{{.RepoLink}}/issues/new{{if .NewIssueChooseTemplate}}/choose{{end}}">{{.locale.Tr "repo.issues.new"}}</a> - {{else}} - <a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{if .PullRequestCtx.Allowed}}{{.Repository.Link}}/compare/{{.Repository.DefaultBranch | PathEscapeSegments}}...{{if ne .Repository.Owner.Name .PullRequestCtx.BaseRepo.Owner.Name}}{{PathEscape .Repository.Owner.Name}}:{{end}}{{.Repository.DefaultBranch | PathEscapeSegments}}{{end}}">{{.locale.Tr "repo.pulls.new"}}</a> - {{end}} - </div> + {{if .PageIsIssueList}} + <a class="ui small green button" href="{{.RepoLink}}/issues/new{{if .NewIssueChooseTemplate}}/choose{{end}}">{{.locale.Tr "repo.issues.new"}}</a> + {{else}} + <a class="ui small green button new-pr-button{{if not .PullRequestCtx.Allowed}} disabled{{end}}" href="{{if .PullRequestCtx.Allowed}}{{.Repository.Link}}/compare/{{.Repository.DefaultBranch | PathEscapeSegments}}...{{if ne .Repository.Owner.Name .PullRequestCtx.BaseRepo.Owner.Name}}{{PathEscape .Repository.Owner.Name}}:{{end}}{{.Repository.DefaultBranch | PathEscapeSegments}}{{end}}">{{.locale.Tr "repo.pulls.new"}}</a> + {{end}} {{else}} {{if not .PageIsIssueList}} - <div class="column right aligned"> - <a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{if .PullRequestCtx.Allowed}}{{.PullRequestCtx.BaseRepo.Link}}/compare/{{.PullRequestCtx.BaseRepo.DefaultBranch | PathEscapeSegments}}...{{if ne .Repository.Owner.Name .PullRequestCtx.BaseRepo.Owner.Name}}{{PathEscape .Repository.Owner.Name}}:{{end}}{{.Repository.DefaultBranch | PathEscapeSegments}}{{end}}">{{$.locale.Tr "action.compare_commits_general"}}</a> - </div> + <a class="ui small green small button{{if not .PullRequestCtx.Allowed}} disabled{{end}}" href="{{if .PullRequestCtx.Allowed}}{{.PullRequestCtx.BaseRepo.Link}}/compare/{{.PullRequestCtx.BaseRepo.DefaultBranch | PathEscapeSegments}}...{{if ne .Repository.Owner.Name .PullRequestCtx.BaseRepo.Owner.Name}}{{PathEscape .Repository.Owner.Name}}:{{end}}{{.Repository.DefaultBranch | PathEscapeSegments}}{{end}}">{{$.locale.Tr "action.compare_commits_general"}}</a> {{end}} {{end}} </div> @@ -176,7 +168,7 @@ {{end}} <!-- Sort --> - <div class="ui dropdown downward type jump item"> + <div class="list-header-sort ui small dropdown downward type jump item"> <span class="text"> {{.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)}} <div class="ui right"> - <a class="ui green button" href="{{$.Link}}/new">{{.locale.Tr "repo.milestones.new"}}</a> + <a class="ui small green button" href="{{$.Link}}/new">{{.locale.Tr "repo.milestones.new"}}</a> </div> {{end}} </div> <div class="ui divider"></div> {{template "base/alert" .}} - <div class="ui three column stackable grid"> - <div class="column"> - <div class="ui compact tiny menu"> - <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=open&q={{$.Keyword}}"> - {{svg "octicon-milestone" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - </a> - <a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=closed&q={{$.Keyword}}"> - {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - </a> - </div> + <div class="list-header"> + <div class="small-pill-buttons ui compact tiny menu"> + <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=open&q={{$.Keyword}}"> + {{svg "octicon-milestone" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} + </a> + <a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=closed&q={{$.Keyword}}"> + {{svg "octicon-check" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} + </a> </div> <!-- Search --> - <div class="column center aligned"> - <form class="ui form ignore-dirty"> - <div class="ui search fluid action input"> - <input type="hidden" name="state" value="{{$.State}}"> - <input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..."> - <button class="ui primary button" type="submit">{{.locale.Tr "explore.search"}}</button> - </div> - </form> - </div> + <form class="list-header-search ui form ignore-dirty"> + <div class="ui small search fluid action input"> + <input type="hidden" name="state" value="{{$.State}}"> + <input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..."> + <button class="ui small icon button" type="submit" aria-label="{{.locale.Tr "explore.search"}}"> + {{svg "octicon-search"}} + </button> + </div> + </form> - <div class="column right aligned gt-df gt-ac gt-je"> - <!-- Sort --> - <div class="ui dropdown type jump item"> - <span class="text"> - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - </span> - <div class="menu"> - <a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=closestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}}</a> - <a class="{{if eq .SortType "furthestduedate"}}active {{end}}item" href="{{$.Link}}?sort=furthestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}}</a> - <a class="{{if eq .SortType "leastcomplete"}}active {{end}}item" href="{{$.Link}}?sort=leastcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_complete"}}</a> - <a class="{{if eq .SortType "mostcomplete"}}active {{end}}item" href="{{$.Link}}?sort=mostcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_complete"}}</a> - <a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?sort=mostissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a> - <a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a> - </div> + <!-- Sort --> + <div class="list-header-sort ui small dropdown type jump item"> + <span class="text"> + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + </span> + <div class="menu"> + <a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=closestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}}</a> + <a class="{{if eq .SortType "furthestduedate"}}active {{end}}item" href="{{$.Link}}?sort=furthestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}}</a> + <a class="{{if eq .SortType "leastcomplete"}}active {{end}}item" href="{{$.Link}}?sort=leastcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_complete"}}</a> + <a class="{{if eq .SortType "mostcomplete"}}active {{end}}item" href="{{$.Link}}?sort=mostcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_complete"}}</a> + <a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?sort=mostissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a> + <a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a> </div> </div> </div> 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 @@ -<h2 class="ui compact small menu header"> +<h2 class="ui compact small menu header small-pill-buttons"> <a class="{{if .PageIsLabels}}active {{end}}item" href="{{.RepoLink}}/labels">{{.locale.Tr "repo.labels"}}</a> <a class="{{if .PageIsMilestones}}active {{end}}item" href="{{.RepoLink}}/milestones">{{.locale.Tr "repo.milestones"}}</a> </h2> 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 @@ -<div class="ui compact tiny menu"> +<div class="small-pill-buttons ui compact tiny menu"> <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}}"> {{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 @@ -<form class="ui form ignore-dirty"> - <div class="ui search fluid action input"> +<form class="list-header-search ui form ignore-dirty"> + <div class="ui small search fluid action input"> <input type="hidden" name="type" value="{{$.ViewType}}"> <input type="hidden" name="state" value="{{$.State}}"> <input type="hidden" name="labels" value="{{.SelectLabels}}"> @@ -8,6 +8,8 @@ <input type="hidden" name="assignee" value="{{$.AssigneeID}}"> <input type="hidden" name="poster" value="{{$.PosterID}}"> <input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..."> - <button class="ui primary button" type="submit">{{.locale.Tr "explore.search"}}</button> + <button class="ui small icon button" type="submit" aria-label="{{.locale.Tr "explore.search"}}"> + {{svg "octicon-search"}} + </button> </div> </form> 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)}} <div class="ui right"> - <a class="ui green button" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a> + <a class="ui small green button" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a> </div> {{end}} </div> <div class="ui divider"></div> {{template "base/alert" .}} - <div class="ui compact tiny menu"> + <div class="small-pill-buttons ui compact tiny menu"> <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=open"> {{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}} <div class="ui right floated secondary menu"> - <a class="ui green button" href="{{$.RepoLink}}/projects/new">{{.locale.Tr "repo.milestones.new"}}</a> + <a class="ui small green button" href="{{$.RepoLink}}/projects/new">{{.locale.Tr "repo.milestones.new"}}</a> </div> {{end}} </div> 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 @@ </div> <div class="column right aligned"> {{if and .CanWriteProjects (not .Repository.IsArchived)}} - <a class="ui green button item" href="{{$.RepoLink}}/issues/new/choose?project={{$.Project.ID}}">{{.locale.Tr "repo.issues.new"}}</a> - <a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a> + <a class="ui small green button item" href="{{$.RepoLink}}/issues/new/choose?project={{$.Project.ID}}">{{.locale.Tr "repo.issues.new"}}</a> + <a class="ui small green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a> {{end}} <div class="ui small modal new-board-modal" id="new-board-item"> <div class="header"> diff --git a/templates/repo/sub_menu_release_tag.tmpl b/templates/repo/sub_menu_release_tag.tmpl index 9e95c3c920..2795241556 100644 --- a/templates/repo/sub_menu_release_tag.tmpl +++ b/templates/repo/sub_menu_release_tag.tmpl @@ -2,7 +2,7 @@ {{$canReadCode := $.Permission.CanRead $.UnitTypeCode}} {{if $canReadReleases}} - <h2 class="ui compact small menu header"> + <h2 class="ui compact small menu header small-pill-buttons"> <a class="{{if .PageIsReleaseList}}active {{end}}item" href="{{.RepoLink}}/releases">{{.locale.Tr "repo.release.releases"}}</a> {{if $canReadCode}} <a class="{{if .PageIsTagList}}active {{end}}item" href="{{.RepoLink}}/tags">{{.locale.Tr "repo.release.tags"}}</a> diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 5a207aac60..da7867a225 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -60,57 +60,51 @@ </div> </div> <div class="twelve wide column content"> - <div class="ui three column stackable grid"> - <div class="column"> - <div class="ui compact tiny menu"> - <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}"> - {{svg "octicon-issue-opened" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .IssueStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - </a> - <a class="item{{if .IsShowClosed}} active{{end}}" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed&q={{$.Keyword}}"> - {{svg "octicon-issue-closed" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .IssueStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - </a> - </div> - </div> - <div class="column center aligned"> - <form class="ui form ignore-dirty"> - <div class="ui search fluid action input"> - <input type="hidden" name="type" value="{{$.ViewType}}"> - <input type="hidden" name="repos" value="[{{range $.RepoIDs}}{{.}}%2C{{end}}]"> - <input type="hidden" name="sort" value="{{$.SortType}}"> - <input type="hidden" name="state" value="{{$.State}}"> - <input name="q" value="{{$.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..."> - <button class="ui primary button" type="submit">{{.locale.Tr "explore.search"}}</button> - </div> - </form> + <div class="list-header"> + <div class="small-pill-buttons ui compact tiny menu"> + <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}"> + {{svg "octicon-issue-opened" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .IssueStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} + </a> + <a class="item{{if .IsShowClosed}} active{{end}}" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed&q={{$.Keyword}}"> + {{svg "octicon-issue-closed" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .IssueStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} + </a> </div> - <div class="column right aligned gt-df gt-ac gt-je"> - <!-- Sort --> - <div class="ui dropdown type jump item"> - <span class="text gt-whitespace-nowrap"> - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - </span> - <div class="menu"> - <a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=recentupdate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a> - <a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastupdate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</a> - <a class="{{if or (eq .SortType "latest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=latest&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a> - <a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=oldest&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> - <a class="{{if eq .SortType "mostcomment"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=mostcomment&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.mostcomment"}}</a> - <a class="{{if eq .SortType "leastcomment"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastcomment&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.leastcomment"}}</a> - <a class="{{if eq .SortType "nearduedate"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=nearduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.nearduedate"}}</a> - <a class="{{if eq .SortType "farduedate"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=farduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.farduedate"}}</a> - </div> + <form class="list-header-search ui form ignore-dirty"> + <div class="ui small search fluid action input"> + <input type="hidden" name="type" value="{{$.ViewType}}"> + <input type="hidden" name="repos" value="[{{range $.RepoIDs}}{{.}}%2C{{end}}]"> + <input type="hidden" name="sort" value="{{$.SortType}}"> + <input type="hidden" name="state" value="{{$.State}}"> + <input name="q" value="{{$.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..."> + <button class="ui small icon button" type="submit" aria-label="{{.locale.Tr "explore.search"}}">{{svg "octicon-search"}}</button> + </div> + </form> + <!-- Sort --> + <div class="list-header-sort ui small dropdown type jump item"> + <span class="text gt-whitespace-nowrap"> + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + </span> + <div class="menu"> + <a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=recentupdate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a> + <a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastupdate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</a> + <a class="{{if or (eq .SortType "latest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=latest&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.latest"}}</a> + <a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=oldest&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> + <a class="{{if eq .SortType "mostcomment"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=mostcomment&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.mostcomment"}}</a> + <a class="{{if eq .SortType "leastcomment"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastcomment&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.leastcomment"}}</a> + <a class="{{if eq .SortType "nearduedate"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=nearduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.nearduedate"}}</a> + <a class="{{if eq .SortType "farduedate"}}active {{end}}item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=farduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.issues.filter_sort.farduedate"}}</a> </div> - {{if .SingleRepoLink}} - {{if eq .SingleRepoAction "issue"}} - <a class="ui green button gt-ml-4" href="{{.SingleRepoLink}}/issues/new/choose">{{.locale.Tr "repo.issues.new"}}</a> - {{else if eq .SingleRepoAction "pull"}} - <a class="ui green button gt-ml-4" href="{{.SingleRepoLink}}/compare">{{.locale.Tr "repo.pulls.new"}}</a> - {{end}} - {{end}} </div> + {{if .SingleRepoLink}} + {{if eq .SingleRepoAction "issue"}} + <a class="ui green button gt-ml-4" href="{{.SingleRepoLink}}/issues/new/choose">{{.locale.Tr "repo.issues.new"}}</a> + {{else if eq .SingleRepoAction "pull"}} + <a class="ui green button gt-ml-4" href="{{.SingleRepoLink}}/compare">{{.locale.Tr "repo.pulls.new"}}</a> + {{end}} + {{end}} </div> {{template "shared/issuelist" dict "." . "listType" "dashboard"}} </div> 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 @@ </div> </div> <div class="twelve wide column content"> - <div class="ui three column stackable grid"> - <div class="column"> - <div class="ui compact tiny menu"> - <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}"> - {{svg "octicon-milestone" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .MilestoneStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - </a> - <a class="item{{if .IsShowClosed}} active{{end}}" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed&q={{$.Keyword}}"> - {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .MilestoneStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - </a> - </div> + <div class="list-header"> + <div class="small-pill-buttons ui compact tiny menu"> + <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}"> + {{svg "octicon-milestone" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .MilestoneStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} + </a> + <a class="item{{if .IsShowClosed}} active{{end}}" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed&q={{$.Keyword}}"> + {{svg "octicon-check" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .MilestoneStats.ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} + </a> </div> - <div class="column center aligned"> - <form class="ui form ignore-dirty"> - <div class="ui search fluid action input"> - <input type="hidden" name="type" value="{{$.ViewType}}"> - <input type="hidden" name="repos" value="[{{range $.RepoIDs}}{{.}},{{end}}]"> - <input type="hidden" name="sort" value="{{$.SortType}}"> - <input type="hidden" name="state" value="{{$.State}}"> - <input name="q" value="{{$.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..."> - <button class="ui primary button" type="submit">{{.locale.Tr "explore.search"}}</button> - </div> - </form> - </div> - <div class="column right aligned gt-df gt-ac gt-je"> - <!-- Sort --> - <div class="ui dropdown type jump item"> - <span class="text"> - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - </span> - <div class="menu"> - <a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=closestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}}</a> - <a class="{{if eq .SortType "furthestduedate"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=furthestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}}</a> - <a class="{{if eq .SortType "leastcomplete"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_complete"}}</a> - <a class="{{if eq .SortType "mostcomplete"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=mostcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_complete"}}</a> - <a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=mostissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a> - <a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a> - </div> + <form class="list-header-search ui form ignore-dirty"> + <div class="ui small search fluid action input"> + <input type="hidden" name="type" value="{{$.ViewType}}"> + <input type="hidden" name="repos" value="[{{range $.RepoIDs}}{{.}},{{end}}]"> + <input type="hidden" name="sort" value="{{$.SortType}}"> + <input type="hidden" name="state" value="{{$.State}}"> + <input name="q" value="{{$.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..."> + <button class="ui small icon button" type="submit" aria-label="{{.locale.Tr "explore.search"}}">{{svg "octicon-search"}}</button> + </div> + </form> + <!-- Sort --> + <div class="list-header-sort ui dropdown type jump item"> + <span class="text"> + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + </span> + <div class="menu"> + <a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=closestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.closest_due_date"}}</a> + <a class="{{if eq .SortType "furthestduedate"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=furthestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.furthest_due_date"}}</a> + <a class="{{if eq .SortType "leastcomplete"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_complete"}}</a> + <a class="{{if eq .SortType "mostcomplete"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=mostcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_complete"}}</a> + <a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=mostissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a> + <a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a> </div> </div> </div> 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}} <div id="issue-filters" class="ui stackable grid"> <div class="six wide column"> - <div class="ui compact tiny menu"> + <div class="small-pill-buttons ui compact tiny menu"> <a class="{{if eq .State "all"}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state=all&issueType={{$.IssueType}}&labels={{$.Labels}}"> {{.locale.Tr "all"}} </a> 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; +} |