cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use flex in routing form to fix marker column width

Browse source
This commit is contained in:
Anton Khorev 2024-06-03 12:21:11 +03:00
parent 1e6db7b52c
commit 6ae4e53f45
3 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/index/directions.js
View file

@ -357,7 +357,7 @@ OSM.Directions = function (map) {
getRoute(true, true); getRoute(true, true);
}); });
$(".routing_marker").on("dragstart", function (e) { $(".routing_marker_column img").on("dragstart", function (e) {
var dt = e.originalEvent.dataTransfer; var dt = e.originalEvent.dataTransfer;
dt.effectAllowed = "move"; dt.effectAllowed = "move";
var dragData = { type: $(this).data("type") }; var dragData = { type: $(this).data("type") };

8
app/assets/stylesheets/common.scss
View file

@ -568,7 +568,13 @@ tr.turn {
cursor: pointer; cursor: pointer;
} }
.routing_marker { width: 15px; cursor: move; } .routing_marker_column {
width: 15px;
img {
cursor: move;
}
}
/* Rules for the history sidebar */ /* Rules for the history sidebar */

38
app/views/layouts/_search.html.erb
View file

@ -33,34 +33,26 @@
<form method="GET" action="<%= directions_path %>" class="directions_form bg-body-secondary pb-3"> <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="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="d-flex my-1 mx-2 gap-2 align-items-center">
<div class="col-1"> <div class="routing_marker_column flex-shrink-0">
<%= image_tag "marker-green.png", :class => "routing_marker mx-auto d-block", :data => { :type => "from" }, :draggable => "true" %> <%= image_tag "marker-green.png", :class => "img-fluid", :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> </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>
<div class="row gx-2 m-1"> <div class="d-flex my-1 mx-2 gap-2 align-items-center">
<div class="col-1"> <div class="routing_marker_column flex-shrink-0">
<%= image_tag "marker-red.png", :class => "routing_marker mx-auto d-block", :data => { :type => "to" }, :draggable => "true" %> <%= image_tag "marker-red.png", :class => "img-fluid", :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> </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>
<div class="row gx-2 m-1"> <div class="d-flex my-1 mx-2 gap-2 align-items-center">
<div class="col offset-1"> <div class="routing_marker_column flex-shrink-0"></div>
<select class="routing_engines form-select py-1 px-2" name="routing_engines"></select> <select class="routing_engines form-select py-1 px-2" name="routing_engines"></select>
</div> <%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-primary py-1 px-2", :data => { :disable_with => false } %>
<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> </div>
<div class="row gx-2 m-1"> <div class="d-flex my-1 mx-2 gap-2 align-items-center">
<div class="col offset-1"> <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> <button class="btn btn-link py-1 px-2 reverse_directions"><%= t("site.search.reverse_directions_text") %></button>
</div>
</div> </div>
<div class="loader_copy d-none"> <div class="loader_copy d-none">