From: Tom Hughes <tom@compton.nu>
Date: Mon, 8 Jul 2024 17:31:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4965'
X-Git-Tag: live~335
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/1bc6c2e1dc71da2530a0aac9985526f04cf03885?hp=e415ba764d49f352bbeae2aba5b3f47a23c475d5

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

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index d767cb887..3e779a00c 100644
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -64,7 +64,7 @@ module UserHelper
                 :size => "36"),
       auth_path(options.merge(:provider => provider)),
       :method => :post,
-      :class => "auth_button btn btn-light mx-1 p-2 d-block",
+      :class => "auth_button btn btn-light p-2 d-block",
       :title => t("application.auth_providers.#{name}.title")
     )
   end
@@ -77,7 +77,7 @@ module UserHelper
                 :size => "36") + t("application.auth_providers.#{name}.title"),
       auth_path(options.merge(:provider => provider)),
       :method => :post,
-      :class => "auth_button btn btn-outline-secondary fs-6 border rounded py-2 px-4 d-flex justify-content-center align-items-center",
+      :class => "auth_button btn btn-outline-secondary border py-2 px-4 d-flex justify-content-center align-items-center",
       :title => t("application.auth_providers.#{name}.title")
     )
   end
diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb
index 66417bca2..e3e5123cc 100644
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -20,9 +20,9 @@
           <% end -%>
         <% end -%>
       </div>
-      <div class="list-inline justify-content-center d-flex align-items-center flex-wrap w-50">
+      <div class="list-inline justify-content-center d-flex align-items-center flex-wrap gap-2 w-50 px-1">
     <% else %>
-      <div class="list-inline justify-content-center d-flex align-items-center flex-wrap w-100">
+      <div class="list-inline justify-content-center d-flex align-items-center flex-wrap gap-2 w-100">
     <% end %>
 
       <%= link_to image_tag("openid.svg",
@@ -31,7 +31,7 @@
                   "#",
                   :id => "openid_open_url",
                   :title => t("application.auth_providers.openid.title"),
-                  :class => "btn btn-light mx-1 p-2 d-block" %>
+                  :class => "btn btn-light p-2 d-block" %>
 
       <% %w[google facebook microsoft github wikipedia].each do |provider| %>
         <% unless @preferred_auth_provider == provider %>
diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb
index 09adfc14b..a415bd029 100644
--- a/test/helpers/user_helper_test.rb
+++ b/test/helpers/user_helper_test.rb
@@ -117,7 +117,7 @@ class UserHelperTest < ActionView::TestCase
   def test_auth_button
     button = auth_button("google", "google")
     img_tag = "<img alt=\"Google logo\" class=\"rounded-1\" src=\"/images/google.svg\" width=\"36\" height=\"36\" />"
-    assert_equal("<a class=\"auth_button btn btn-light mx-1 p-2 d-block\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
+    assert_equal("<a class=\"auth_button btn btn-light p-2 d-block\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
   end
 
   private