From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 3 Jun 2024 09:21:11 +0000 (+0300)
Subject: Use flex in routing form to fix marker column width
X-Git-Tag: live~457^2~2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6ae4e53f4582f91267ec829a5b6cb1b2260aa06b?ds=inline;hp=--cc

Use flex in routing form to fix marker column width
---

6ae4e53f4582f91267ec829a5b6cb1b2260aa06b
diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 89eccb8cb..f6b0581ca 100644
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -357,7 +357,7 @@ OSM.Directions = function (map) {
     getRoute(true, true);
   });
 
-  $(".routing_marker").on("dragstart", function (e) {
+  $(".routing_marker_column img").on("dragstart", function (e) {
     var dt = e.originalEvent.dataTransfer;
     dt.effectAllowed = "move";
     var dragData = { type: $(this).data("type") };
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 757da56fe..4cc31d611 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -568,7 +568,13 @@ tr.turn {
     cursor: pointer;
 }
 
-.routing_marker { width: 15px; cursor: move; }
+.routing_marker_column {
+  width: 15px;
+
+  img {
+    cursor: move;
+  }
+}
 
 /* Rules for the history sidebar */
 
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 11b7c7b1e..00cf60b7a 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -33,34 +33,26 @@
   <form method="GET" action="<%= directions_path %>" class="directions_form bg-body-secondary pb-3">
     <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">
-        <%= image_tag "marker-green.png", :class => "routing_marker mx-auto d-block", :data => { :type => "from" }, :draggable => "true" %>
-      </div>
-      <div class="col">
-        <%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from"), :autocomplete => "on", :class => "form-control py-1 px-2", :dir => "auto" %>
+    <div class="d-flex my-1 mx-2 gap-2 align-items-center">
+      <div class="routing_marker_column flex-shrink-0">
+        <%= image_tag "marker-green.png", :class => "img-fluid", :data => { :type => "from" }, :draggable => "true" %>
       </div>
+      <%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from"), :autocomplete => "on", :class => "form-control py-1 px-2", :dir => "auto" %>
     </div>
-    <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">
-        <%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :autocomplete => "on", :class => "form-control py-1 px-2", :dir => "auto" %>
+    <div class="d-flex my-1 mx-2 gap-2 align-items-center">
+      <div class="routing_marker_column flex-shrink-0">
+        <%= image_tag "marker-red.png", :class => "img-fluid", :data => { :type => "to" }, :draggable => "true" %>
       </div>
+      <%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to"), :autocomplete => "on", :class => "form-control py-1 px-2", :dir => "auto" %>
     </div>
-    <div class="row gx-2 m-1">
-      <div class="col offset-1">
-        <select class="routing_engines form-select py-1 px-2" name="routing_engines"></select>
-      </div>
-      <div class="col-auto">
-        <%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-primary py-1 px-2", :data => { :disable_with => false } %>
-      </div>
+    <div class="d-flex my-1 mx-2 gap-2 align-items-center">
+      <div class="routing_marker_column flex-shrink-0"></div>
+      <select class="routing_engines form-select py-1 px-2" name="routing_engines"></select>
+      <%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-primary py-1 px-2", :data => { :disable_with => false } %>
     </div>
-    <div class="row gx-2 m-1">
-      <div class="col offset-1">
-        <button class="btn btn-link py-1 px-2 reverse_directions"><%= t("site.search.reverse_directions_text") %></button>
-      </div>
+    <div class="d-flex my-1 mx-2 gap-2 align-items-center">
+      <div class="routing_marker_column flex-shrink-0"></div>
+      <button class="btn btn-link py-1 px-2 reverse_directions"><%= t("site.search.reverse_directions_text") %></button>
     </div>
 
     <div class="loader_copy d-none">