From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Jun 2024 16:56:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4916'
X-Git-Tag: live~429
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5cc0b26bba2729a88dd17be3b654ff6c7957c847?ds=sidebyside;hp=-c

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

5cc0b26bba2729a88dd17be3b654ff6c7957c847
diff --combined app/helpers/user_helper.rb
index 4f5d7e0c2,f48de1754..d767cb887
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@@ -53,7 -53,7 +53,7 @@@ module UserHelpe
    # External authentication support
  
    def openid_logo
 -    image_tag "openid.svg", :size => "24", :alt => t("application.auth_providers.openid_logo_alt"), :class => "align-text-bottom"
 +    image_tag "openid.svg", :size => "36", :alt => t("application.auth_providers.openid_logo_alt"), :class => "align-text-bottom"
    end
  
    def auth_button(name, provider, options = {})
@@@ -61,10 -61,10 +61,10 @@@
        image_tag("#{name}.svg",
                  :alt => t("application.auth_providers.#{name}.alt"),
                  :class => "rounded-1",
 -                :size => "24"),
 +                :size => "36"),
        auth_path(options.merge(:provider => provider)),
        :method => :post,
-       :class => "auth_button p-2 d-block",
+       :class => "auth_button btn btn-light mx-1 p-2 d-block",
        :title => t("application.auth_providers.#{name}.title")
      )
    end
@@@ -74,10 -74,10 +74,10 @@@
        image_tag("#{name}.svg",
                  :alt => t("application.auth_providers.#{name}.alt"),
                  :class => "rounded-1 me-3",
 -                :size => "24") + t("application.auth_providers.#{name}.title"),
 +                :size => "36") + t("application.auth_providers.#{name}.title"),
        auth_path(options.merge(:provider => provider)),
        :method => :post,
-       :class => "auth_button fs-6 border rounded text-body-secondary text-decoration-none py-2 px-4 d-flex justify-content-center align-items-center",
+       :class => "auth_button btn btn-outline-secondary fs-6 border rounded py-2 px-4 d-flex justify-content-center align-items-center",
        :title => t("application.auth_providers.#{name}.title")
      )
    end
diff --combined app/views/application/_auth_providers.html.erb
index e92c9caac,c3fef47d9..be921ee9c
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@@ -25,13 -25,13 +25,13 @@@
        <div class="list-inline justify-content-center d-flex align-items-center flex-wrap w-100">
      <% end %>
  
 -      <%= link_to image_tag("openid.png",
 +      <%= link_to image_tag("openid.svg",
                              :alt => t("application.auth_providers.openid.title"),
 -                            :size => "24"),
 +                            :size => "36"),
                    "#",
                    :id => "openid_open_url",
                    :title => t("application.auth_providers.openid.title"),
-                   :class => "p-2 d-block" %>
+                   :class => "btn btn-light mx-1 p-2 d-block" %>
  
        <% %w[google facebook microsoft github wikipedia].each do |provider| %>
          <% unless @preferred_auth_provider == provider %>
diff --combined test/helpers/user_helper_test.rb
index ed05aca36,7d9d558f2..c7c63d62a
--- a/test/helpers/user_helper_test.rb
+++ b/test/helpers/user_helper_test.rb
@@@ -116,8 -116,8 +116,8 @@@ class UserHelperTest < ActionView::Test
  
    def test_auth_button
      button = auth_button("google", "google")
 -    img_tag = "<img alt=\"Log in with a Google OpenID\" class=\"rounded-1\" src=\"/images/google.svg\" width=\"24\" height=\"24\" />"
 +    img_tag = "<img alt=\"Log in with a Google OpenID\" class=\"rounded-1\" src=\"/images/google.svg\" width=\"36\" height=\"36\" />"
-     assert_equal("<a class=\"auth_button 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 mx-1 p-2 d-block\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
    end
  
    private