Merge remote-tracking branch 'upstream/pull/4685'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1ccdc7871454547b94623c1f393e469a1c222e1f..42046c0a62f270c6e49086cd3abe6eb26761f4ea 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -815,10 +815,6 @@ tr.turn:hover {
 }
 
 .search_form {
-  #query {
-    z-index: 0;
-  }
-
   .describe_location {
     font-size: 10px;
   }

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index c7939aa01c955975688a24a7b37ed851bfbbf83d..5d612dd78b2412861aad07915457ed4e2c0236db 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -3,7 +3,7 @@
     <div class="row gx-2 mx-0">
       <div class="col">
         <div class="input-group flex-nowrap">
-          <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
+          <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :autocomplete => "on", :class => "form-control form-control-sm z-0", :dir => "auto" %>
           <div class="input-group-text border-start-0 p-0 position-relative">
             <%= button_tag t("site.search.where_am_i"), :type => "button", :class => "describe_location position-absolute end-0 me-1 btn btn-sm btn-outline-primary border-0 bg-transparent", :title => t("site.search.where_am_i_title") %>
           </div>