Add aria-label to close buttons

[rails.git] / app / views / layouts / _search.html.erb

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 57b7b763867dcb2bab4389ebcf5bfe1e0668d638..e7cae0471c9d58c8ebc566e5aecba16765eb405b 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,6 +1,6 @@
 <div class="search_forms">
   <form method="GET" action="<%= search_path %>" class="search_form px-1 py-2">
 <div class="search_forms">
   <form method="GET" action="<%= search_path %>" class="search_form px-1 py-2">

-    <div class="form-row mx-0">
+    <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="col">
         <div class="input-group flex-nowrap">
           <div class='query_wrapper position-relative flex-grow-1'>


@@ -19,9 +19,9 @@
   </form>
 
   <form method="GET" action="<%= directions_path %>" class="directions_form pb-3">
   </form>
 
   <form method="GET" action="<%= directions_path %>" class="directions_form pb-3">

-    <div class="clearfix px-3 py-3"><span class="icon close"></span></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="form-row m-1">
+    <div class="row gx-2 m-1">

       <div class="col-1">
         <%= image_tag "marker-green.png", :class => "routing_marker mx-auto d-block", :data => { :type => "from" }, :draggable => "true" %>
       </div>
       <div class="col-1">
         <%= image_tag "marker-green.png", :class => "routing_marker mx-auto d-block", :data => { :type => "from" }, :draggable => "true" %>
       </div>


@@ -29,7 +29,7 @@
         <%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from"), :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
       </div>
     </div>
         <%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from"), :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
       </div>
     </div>

-    <div class="form-row m-1">
+    <div class="row gx-2 m-1">

       <div class="col-1">
         <%= image_tag "marker-red.png", :class => "routing_marker mx-auto d-block", :data => { :type => "to" }, :draggable => "true" %>
       </div>
       <div class="col-1">
         <%= image_tag "marker-red.png", :class => "routing_marker mx-auto d-block", :data => { :type => "to" }, :draggable => "true" %>
       </div>


@@ -37,17 +37,17 @@
         <%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
       </div>
     </div>
         <%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :autocomplete => "on", :class => "form-control form-control-sm", :dir => "auto" %>
       </div>
     </div>

-    <div class="form-row m-1">
+    <div class="row gx-2 m-1">

       <div class="col offset-1">
       <div class="col offset-1">

-        <select class="routing_engines form-control form-control-sm" name="routing_engines"></select>
+        <select class="routing_engines form-select form-select-sm" name="routing_engines"></select>

       </div>
       <div class="col-auto">
         <%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-sm btn-primary", :data => { :disable_with => false } %>
       </div>
     </div>
       </div>
       <div class="col-auto">
         <%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-sm btn-primary", :data => { :disable_with => false } %>
       </div>
     </div>

-    <div class="form-row m-1">
+    <div class="row gx-2 m-1">

       <div class="col offset-1">
       <div class="col offset-1">

-        <a class="reverse_directions"><%= t("site.search.reverse_directions_text") %></a>
+        <button class="btn btn-sm btn-link reverse_directions"><%= t("site.search.reverse_directions_text") %></button>

       </div>
     </div>
 
       </div>
     </div>