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

[rails.git] / app / views / diary_entries / _form.html.erb

diff --git a/app/views/diary_entries/_form.html.erb b/app/views/diary_entries/_form.html.erb
index f72abc19e32c472a77e8e23d51f6184e5788cdb0..a449b0d39c843d6e11267371b6a4eebf3febf0b8 100644 (file)
--- a/app/views/diary_entries/_form.html.erb
+++ b/app/views/diary_entries/_form.html.erb
@@ -5,13 +5,13 @@
 <fieldset>
   <legend><%= t ".location" -%></legend>
 
-  <%= tag.div "", :id => "map", :class => "border border-grey rounded", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
+  <%= tag.div "", :id => "map", :class => "border border-secondary-subtle rounded mb-3 z-0", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
 
-  <div class="form-row">
-    <%= f.text_field :latitude, :wrapper_class => "col-sm-4", :id => "latitude" %>
-    <%= f.text_field :longitude, :wrapper_class => "col-sm-4", :id => "longitude" %>
-    <div class="col-sm-4">
-      <label><a href="#" id="usemap"><%= t ".use_map_link" -%></a></label>
+  <div class="row mb-3">
+    <%= f.text_field :latitude, :wrapper_class => "col-sm-4 d-flex flex-column", :class => "mt-auto", :id => "latitude" %>
+    <%= f.text_field :longitude, :wrapper_class => "col-sm-4 d-flex flex-column", :class => "mt-auto", :id => "longitude" %>
+    <div class="col-sm-4 align-self-end pt-2">
+      <button type="button" id="usemap" class="btn btn-outline-primary"><%= t ".use_map_link" -%></button>
     </div>
   </div>
 </fieldset>