Merge branch '0.11-dev' of github.com:Froxlor/Froxlor into 0.11-dev

This commit is contained in:
Michael Kaufmann 2022-04-17 17:18:13 +02:00
commit d1dda00a1c
4 changed files with 41 additions and 5 deletions

View File

@ -7,7 +7,7 @@ $(document).ready(function () {
search.find('input').on('keyup', function () {
let query = $(this).val();
let dropdown = $('#search-dropdown');
let dropdown = $('#search .search-results');
// Hide search if query is empty
if (!query.length) {
dropdown.hide().html('');

View File

@ -0,0 +1,32 @@
#search {
display: flex;
position: relative;
i {
margin-right: .5rem;
}
.search-input {
outline: none;
border: none;
}
.search-results-box {
position: absolute;
top: 2.75rem;
z-index: 50;
width: 70vh;
max-height: 50vh;
background: #fff;
border: $border-color solid 1px;
border-radius: 0 0 $border-radius $border-radius;
.search-results {
width: 70vh; /** same as .search-results-box **/
max-height: calc(50vh - 2px); /** same as .search-results-box - border (top/bottom) **/
overflow: auto;
border-radius: $border-radius;
}
}
}

View File

@ -12,3 +12,4 @@
@import "components/form";
@import "components/navbar";
@import "components/sidebar";
@import "components/search";

View File

@ -31,11 +31,14 @@
</button>
</div>
<div class="collapse navbar-collapse px-3 px-lg-5" id="navbar">
<form id="search" class="d-flex position-relative" method="post">
<div class="input-group">
<input title="search" type="search" class="form-control-plaintext" placeholder="Search for ..." style="outline: none">
<form id="search" method="post">
<div class="d-flex align-items-center">
<i class="fa fa-search text-muted"></i>
<input title="search" type="search" class="search-input" placeholder="Search for ...">
</div>
<div class="search-results-box">
<div class="search-results list-group-flush" style="display: none"></div>
</div>
<ul id="search-dropdown" class="bg-white border list-group list-group-flush position-absolute" style="top: 2.5rem; display:none; z-index: 50; max-height: 300px; overflow-y: scroll"></ul>
</form>
<ul class="navbar-nav ms-auto">
{% if call_static('\\Froxlor\\CurrentUser', 'getField', ['switched_user']) is not empty and call_static('\\Froxlor\\CurrentUser', 'getField', ['switched_user']) is iterable %}