TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request 'ui: wiki/code search fixes' (#5260) from snematoda/search-ui-fix into forgejo

Browse source 
closes forgejo/forgejo#5259 (leftover arrowhead in Safari)
Fixes long results in wiki search overflowing the page

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5260
Reviewed-by: Otto <otto@codeberg.org>
This commit is contained in:
Otto 2024-09-14 19:38:35 +00:00
commit d78598ef0d
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates/repo/wiki/search.tmpl
View file

@ -1,9 +1,9 @@
{{if .Results}} {{if .Results}}
{{range .Results}} {{range .Results}}
<a class="item" href="{{$.RepoLink}}/wiki/{{.Filename}}"> <a class="item tw-max-w-[80vw]" href="{{$.RepoLink}}/wiki/{{.Filename}}">
<b class="tw-block tw-mb-2">{{.Filename}}</b> <b class="tw-block tw-mb-2 tw-whitespace-break-spaces">{{.Filename}}</b>
{{range .LineCodes}} {{range .LineCodes}}
<p class="tw-my-0">{{.}}</p> <p class="tw-my-0 tw-whitespace-break-spaces">{{.}}</p>
{{end}} {{end}}
</a> </a>
{{end}} {{end}}

6
templates/repo/wiki/view.tmpl
View file

@ -28,16 +28,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="clone-panel ui action small input"> <div class="clone-panel ui action small input tw-ml-auto">
{{template "repo/clone_buttons" .}} {{template "repo/clone_buttons" .}}
{{template "repo/clone_script" .}} {{template "repo/clone_script" .}}
</div> </div>
<div class="ui floating dropdown jump"> <div class="ui floating dropdown jump tw-ml-auto">
<div class="ui icon search input"> <div class="ui icon search input">
<i class="icon">{{svg "octicon-search"}}</i> <i class="icon">{{svg "octicon-search"}}</i>
<input type="search" name="q" hx-get="{{$.RepoLink}}/wiki/search" hx-target="#wiki-search" hx-swap="innerHTML" hx-trigger="keyup changed delay:.5s" placeholder="{{ctx.Locale.Tr "repo.wiki.search"}}..." /> <input type="search" name="q" hx-get="{{$.RepoLink}}/wiki/search" hx-target="#wiki-search" hx-swap="innerHTML" hx-trigger="keyup changed delay:.5s" placeholder="{{ctx.Locale.Tr "repo.wiki.search"}}..." />
</div> </div>
<div id="wiki-search" class="menu tw-absolute tw-mt-3 tw-rounded right"> <div id="wiki-search" class="menu tw-absolute tw-max-h-[65dvh] tw-overflow-y-auto tw-mt-3 tw-rounded left">
<div class="item muted">{{ctx.Locale.Tr "repo.wiki.no_search_results"}}</div> <div class="item muted">{{ctx.Locale.Tr "repo.wiki.no_search_results"}}</div>
</div> </div>
</div> </div>

7
web_src/css/repo.css
View file

@ -1747,6 +1747,13 @@ td .commit-summary {
color: inherit; color: inherit;
} }
/* workaround for safari as it does not support 'display: list-item' for summary tags yet
** see https://codeberg.org/forgejo/forgejo/issues/5259 */
details.repo-search-result summary::-webkit-details-marker,
details.repo-search-result summary::marker {
display: none;
}
.search-highlight { .search-highlight {
background: var(--color-primary-alpha-40); background: var(--color-primary-alpha-40);
} }