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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2b9dae62eef75f1220ed4b9c7de9fa1de98b23d6..3ee6129e113799a8818f455694e55266df9c6792 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -60,7 +60,7 @@ jobs:
     - name: Run tests
       run: bundle exec rails test:all
     - name: Report completion to Coveralls
-      uses: coverallsapp/github-action@v2.2.2
+      uses: coverallsapp/github-action@v2.2.3
       with:
         github-token: ${{ secrets.github_token }}
         flag-name: ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}
@@ -72,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Report completion to Coveralls
-      uses: coverallsapp/github-action@v2.2.2
+      uses: coverallsapp/github-action@v2.2.3
       with:
         github-token: ${{ secrets.github_token }}
         parallel-finished: true

diff --git a/app/views/diary_entries/_form.html.erb b/app/views/diary_entries/_form.html.erb
index bfb1c1823dfa2c8a2cc567dfb975db7a413e2731..0b38e3ea6b5b373008aca9c6bb015f394e98b464 100644 (file)
--- a/app/views/diary_entries/_form.html.erb
+++ b/app/views/diary_entries/_form.html.erb
@@ -8,8 +8,8 @@
   <%= tag.div "", :id => "map", :class => "border border-grey rounded mb-3", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
 
   <div class="row mb-3">
-    <%= f.text_field :latitude, :wrapper_class => "col-sm-4", :id => "latitude" %>
-    <%= f.text_field :longitude, :wrapper_class => "col-sm-4", :id => "longitude" %>
+    <%= 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>

diff --git a/app/views/profiles/edit.html.erb b/app/views/profiles/edit.html.erb
index bf53832c8802b6709bd15348ce0ec30d3b0685f7..b207e72e2e6f979df549e0987aa0b73957e63731 100644 (file)
--- a/app/views/profiles/edit.html.erb
+++ b/app/views/profiles/edit.html.erb
@@ -44,8 +44,8 @@
     <legend><%= t ".home location" -%></legend>
     <p id="home_message" class="text-muted m-0<% if current_user.home_location? %> invisible<% end %>"><%= t ".no home location" %></p>
     <div class="row">
-      <%= f.text_field :home_lat, :wrapper_class => "col-sm-4", :id => "home_lat" %>
-      <%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %>
+      <%= f.text_field :home_lat, :wrapper_class => "col-sm-4 d-flex flex-column", :class => "mt-auto", :id => "home_lat" %>
+      <%= f.text_field :home_lon, :wrapper_class => "col-sm-4 d-flex flex-column", :class => "mt-auto", :id => "home_lon" %>
       <div class="col-sm-4 pt-2 align-self-end">
         <button type="button" id="home_show" class="btn btn-outline-primary"<% unless current_user.home_location? %> hidden<% end %> disabled><%= t ".show" %></button>
         <button type="button" id="home_delete" class="btn btn-outline-primary"<% unless current_user.home_location? %> hidden<% end %>><%= t ".delete" %></button>