Merge pull request #3690 from AntonKhorev/search-form-no-group

Stick search input and Go button together with flex instead of input group

diff --combined app/views/layouts/_search.html.erb
index 31386b1ab291dc30408c8597a002bf7bd45b81ab,a301ad2ce815084b055a8ba4ddec17dccd1c2c70..2f785079c8eb21bae3861c3a68d94cc7bac61ace
--- 1/app/views/layouts/_search.html.erb
--- 2/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@@ -2,14 -2,12 +2,12 @@@
    <form method="GET" action="<%= search_path %>" class="search_form px-1 py-2">
      <div class="row gx-2 mx-0">
        <div class="col">
-         <div class="input-group flex-nowrap">
-           <div class='query_wrapper position-relative flex-grow-1'>
+         <div class="d-flex">
+           <span class='position-relative flex-grow-1'>
              <%= link_to t("site.search.where_am_i"), "#", :class => "describe_location position-absolute", :title => t("site.search.where_am_i_title") %>
-             <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
-           </div>
-           <div class="input-group-append">
-             <%= submit_tag t("site.search.submit_text"), :class => "btn btn-sm btn-primary", :data => { :disable_with => false } %>
-           </div>
+             <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm rounded-0 rounded-start border-end-0", :dir => "auto" %>
+           </span>
+           <%= submit_tag t("site.search.submit_text"), :class => "btn btn-sm btn-primary rounded-0 rounded-end", :data => { :disable_with => false } %>
          </div>
        </div>
        <div class="col-auto">
@@@ -19,7 -17,7 +17,7 @@@
    </form>
  
    <form method="GET" action="<%= directions_path %>" class="directions_form pb-3">
 -    <div class="d-flex flex-row-reverse px-3 py-3"><button type="button" class="btn-close"></button></div>
 +    <div class="d-flex flex-row-reverse px-3 py-3"><button type="button" class="btn-close" aria-label="<%= t("javascripts.close") %>"></button></div>
  
      <div class="row gx-2 m-1">
        <div class="col-1">
@@@ -51,12 -49,6 +49,12 @@@
        </div>
      </div>
  
 -    <div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>
 +    <div class="loader_copy d-none">
 +      <div class="text-center loader">
 +        <div class="spinner-border" role="status">
 +          <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
 +        </div>
 +      </div>
 +    </div>
    </form>
  </div>