Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix search bar for small screens #2763

Merged
merged 1 commit into from
Dec 18, 2024
Merged

fix search bar for small screens #2763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/components/exhibit_search_bar_component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<search>
<%= form_with url: @url, local: true, method: @method, class: 'search-across-form search-query-form row gx-0', scope: @prefix, role: 'search', **@form_options do |f| %>
<div class="col-auto search-q"></div>
<div class="col-auto search-q d-none d-sm-block"></div>
<%= render Blacklight::HiddenSearchStateComponent.new(params: @params) %>
<% if search_fields.length > 1 %>
<div class="col-auto pe-1 border-end border-3">
Expand All @@ -15,7 +15,7 @@
<%= f.hidden_field :search_field, value: search_fields.first.last %>
<% end %>

<div class="col-auto">
<div class="col">
<%= f.label @query_param, scoped_t('search.label'), class: 'visually-hidden' %>
<% if autocomplete_path.present? %>
<auto-complete src="<%= autocomplete_path %>" for="autocomplete-popup" class="search-autocomplete-wrapper form-control <%= rounded_border_class %>">
Expand All @@ -29,7 +29,8 @@

<div class="col-auto">
<button type="submit" class="btn btn-primary d-inline" id="search">
<%= t('blacklight.search.form.submit') %>
<span class="d-none d-sm-block"><%= t('blacklight.search.form.submit') %></span>
<span class="d-sm-none d-block"><i class="bi bi-search"></i></span>
</button>
</div>

Expand Down
11 changes: 6 additions & 5 deletions app/components/site_search_form_component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%= form_tag @url, method: :get, class: 'search-across-form search-query-form row gx-0', role: 'search', 'aria-label' => t('blacklight.search.form.submit') do %>
<div class="col-auto search-q"></div>
<div class="col-auto">
<div class="col-auto search-q d-none d-sm-block"></div>
<div class="col-auto align-self-center">
<%= render Blacklight::HiddenSearchStateComponent.new(params: helpers.search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
<% if search_fields.length > 1 %>
<label for="search_field" class="visually-hidden"><%= t('blacklight.search.form.search_field.label') %></label>
Expand All @@ -26,7 +26,7 @@
</div>
</div>

<div class="col-auto">
<div class="col">
<span id="exhibit-search" class="exhibit-search-typeahead site-search-type" data-behavior="site-search-type" style="display: none;">
<auto-complete src="<%= exhibit_autocomplete_index_path %>" for="exhibit-search-popup">
<input type="text" class="form-control" role="combobox" aria-labelledby="site-search-type" name="exhibit-search" data-behavior="exhibit-search-typeahead" />
Expand All @@ -44,9 +44,10 @@
</span>
</div>

<div class="col-auto">
<div class="col-auto align-self-center">
<button type="submit" class="btn btn-primary d-inline" id="search">
<%= t('blacklight.search.form.submit') %>
<span class="d-none d-sm-block"><%= t('blacklight.search.form.submit') %></span>
<span class="d-sm-none d-block"><i class="bi bi-search"></i></span>
</button>
</div>
<% end %>
Loading