From 330fa759453c0248a40c4ad9c2cade2b81e84b51 Mon Sep 17 00:00:00 2001 From: Mike L Date: Sun, 11 Apr 2021 17:50:03 +0200 Subject: [PATCH] Use semantic dropdown for code search query type (#15276) (#15364) Co-authored-by: Lunny Xiao Co-authored-by: 6543 <6543@obermui.de> --- templates/explore/code.tmpl | 94 ++++++++++++++++++------------------- templates/repo/search.tmpl | 22 ++++----- web_src/less/_base.less | 9 ++++ 3 files changed, 64 insertions(+), 61 deletions(-) diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index b22fe039a2a9..222bbb8aae21 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -3,29 +3,27 @@ {{template "explore/navbar" .}}
- -
-
- -
-
- -
-
- -
-
-
-
+ +
+ +
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
{{.i18n.Tr (printf "explore.search.%s" (or .queryType "fuzzy"))}}
+ +
+ +
+ +
{{if .SearchResults}} -

- {{.i18n.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html }} -

+

+ {{.i18n.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html }} +

{{range $term := .SearchResultLanguages}} @@ -35,34 +33,34 @@ {{end}}
-
- {{range $result := .SearchResults}} - {{$repo := (index $.RepoMaps .RepoID)}} -
-

- {{$repo.FullName}} - {{.Filename}} - {{$.i18n.Tr "repo.diff.view_file"}} -

-
-
- - - - - - - -
- {{range .LineNumbers}} - {{.}} - {{end}} - 
    {{.FormattedLines | Safe}}
-
-
- {{template "shared/searchbottom" dict "root" $ "result" .}} -
- {{end}} -
+
+ {{range $result := .SearchResults}} + {{$repo := (index $.RepoMaps .RepoID)}} +
+

+ {{$repo.FullName}} - {{.Filename}} + {{$.i18n.Tr "repo.diff.view_file"}} +

+
+
+ + + + + + + +
+ {{range .LineNumbers}} + {{.}} + {{end}} + 
    {{.FormattedLines | Safe}}
+
+
+ {{template "shared/searchbottom" dict "root" $ "result" .}} +
+ {{end}} +
{{else}}
{{$.i18n.Tr "explore.code_no_results"}}
{{end}} diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index ab9e9be2d6b1..35f7cffbffcb 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -5,20 +5,16 @@
-
- -
-
- -
-
- + +
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
{{.i18n.Tr (printf "repo.search.%s" (or .queryType "fuzzy"))}}
+
+
diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 255842eb62bf..ec0ba42aa80c 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -240,6 +240,15 @@ a.muted:hover, border-color: var(--color-primary) !important; } +/* 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; + + &:not(:focus):not(:hover) { + border-right-color: transparent; + } +} + .ui.action.input:not([class*="left action"]) > input:focus { border-right-color: var(--color-primary); }