diff options
| author | HesterG <hestergong@gmail.com> | 2023-06-28 20:10:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 20:10:36 +0800 |
| commit | c082689471f799b9f22ffee4c96db26e5b94804f (patch) | |
| tree | 5db78b4d2e0b3a6eb933cc0d9e3e1d7a98f644a9 /templates/admin | |
| parent | 65d3e1161b0544f50d94dbbecb6bcf135535e112 (diff) | |
| download | gitea-c082689471f799b9f22ffee4c96db26e5b94804f.tar.gz gitea-c082689471f799b9f22ffee4c96db26e5b94804f.zip | |
Use flex instead of float for sort button and search input (#25519)
Right now some sort buttons beside search input are unclickable because
#25338 removed `max-width` and the sort button is using float, sort
button is then covered by the `input`.
The way to fix this in this PR is changing the layout to `flex` and put
`input form` and sort `button` into `secondary menu`.
After:
<img width="1411" alt="Screen Shot 2023-06-26 at 16 40 52"
src="https://github.com/go-gitea/gitea/assets/17645053/63c12b17-793a-4ae7-bbda-f67b13b87212">
<img width="1428" alt="Screen Shot 2023-06-26 at 16 34 06"
src="https://github.com/go-gitea/gitea/assets/17645053/cb7d967e-355d-4cb0-955c-6139580fc17a">
<img width="716" alt="Screen Shot 2023-06-26 at 16 34 22"
src="https://github.com/go-gitea/gitea/assets/17645053/c74b5ef2-d46e-4487-8794-28bec984bb36">
<img width="1424" alt="Screen Shot 2023-06-26 at 16 34 32"
src="https://github.com/go-gitea/gitea/assets/17645053/8a5fdc05-a2c5-4ec4-979d-15a21501fe14">
<img width="1425" alt="Screen Shot 2023-06-26 at 16 35 21"
src="https://github.com/go-gitea/gitea/assets/17645053/eb73cd31-3914-4bc9-92ab-aba56f25128b">
<img width="1437" alt="Screen Shot 2023-06-26 at 16 36 14"
src="https://github.com/go-gitea/gitea/assets/17645053/1c3b4595-bb26-491f-aa68-60dc9ab22b84">
Diffstat (limited to 'templates/admin')
| -rw-r--r-- | templates/admin/base/search.tmpl | 18 | ||||
| -rw-r--r-- | templates/admin/emails/list.tmpl | 18 | ||||
| -rw-r--r-- | templates/admin/repo/search.tmpl | 16 |
3 files changed, 26 insertions, 26 deletions
diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl index bc684e7657..19977f05a9 100644 --- a/templates/admin/base/search.tmpl +++ b/templates/admin/base/search.tmpl @@ -1,6 +1,12 @@ -<div class="ui right floated secondary filter menu"> -<!-- Sort --> - <div class="ui dropdown type jump item"> +<div class="ui secondary filter menu gt-ac gt-mx-0"> + <form class="ui form ignore-dirty gt-f1"> + <div class="ui fluid action input"> + {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} + <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> + </div> + </form> + <!-- Sort --> + <div class="ui dropdown type jump item gt-mr-0"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -15,9 +21,3 @@ </div> </div> </div> -<form class="ui form ignore-dirty"> - <div class="ui fluid action input"> - {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} - <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> - </div> -</form> diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index db15887d98..67e9cb05e8 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -4,9 +4,15 @@ {{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}}) </h4> <div class="ui attached segment"> - <div class="ui right floated secondary filter menu"> - <!-- Sort --> - <div class="ui dropdown type jump item"> + <div class="ui secondary filter menu gt-ac gt-mx-0"> + <form class="ui form ignore-dirty gt-f1"> + <div class="ui fluid action input"> + {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} + <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> + </div> + </form> + <!-- Sort --> + <div class="ui dropdown type jump item gt-mr-0"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -19,12 +25,6 @@ </div> </div> </div> - <form class="ui form ignore-dirty"> - <div class="ui fluid action input"> - {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} - <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> - </div> - </form> </div> <div class="ui attached table segment"> <table class="ui very basic striped table unstackable"> diff --git a/templates/admin/repo/search.tmpl b/templates/admin/repo/search.tmpl index cb9aad1a66..0d98e3e4f2 100644 --- a/templates/admin/repo/search.tmpl +++ b/templates/admin/repo/search.tmpl @@ -1,6 +1,12 @@ -<div class="ui right floated secondary filter menu"> +<div class="ui secondary filter menu gt-ac gt-mx-0"> + <form class="ui form ignore-dirty gt-f1"> + <div class="ui fluid action input"> + {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} + <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> + </div> + </form> <!-- Sort --> - <div class="ui dropdown type jump item"> + <div class="ui dropdown type jump item gt-mr-0"> <span class="text"> {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -21,9 +27,3 @@ </div> </div> </div> -<form class="ui form ignore-dirty"> - <div class="ui fluid action input"> - {{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} - <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> - </div> -</form> |