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

diff --git a/app/assets/images/microsoft.svg b/app/assets/images/microsoft.svg
index fdc0cbd76383cb999464247d3ce78ca2a3d8b22a..1f739764834586f6940428a24b87510d29425deb 100644 (file)
--- a/app/assets/images/microsoft.svg
+++ b/app/assets/images/microsoft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36"><defs><style>.a{fill:#575352;}.b{fill:#f25022;}.c{fill:#7fba00;}.d{fill:#00a4ef;}.e{fill:#ffb900;}</style></defs><rect class="a" width="36" height="36"/><rect class="b" x="4" y="3.99" width="13.31" height="13.31"/><rect class="c" x="18.69" y="3.99" width="13.31" height="13.31"/><rect class="d" x="4" y="18.69" width="13.31" height="13.3"/><rect class="e" x="18.69" y="18.69" width="13.31" height="13.3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="21" height="21" viewBox="0 0 21 21"><title>MS-SymbolLockup</title><rect x="1" y="1" width="9" height="9" fill="#f25022"/><rect x="1" y="11" width="9" height="9" fill="#00a4ef"/><rect x="11" y="1" width="9" height="9" fill="#7fba00"/><rect x="11" y="11" width="9" height="9" fill="#ffb900"/></svg>
\ No newline at end of file

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 3554980b84fc37fa53e7f23f797c2a401f364455..e1ab423a1e4b567b57f6a83c4e5ff072ed6d0d8d 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -58,7 +58,10 @@ module UserHelper
 
   def auth_button(name, provider, options = {})
     link_to(
-      image_tag("#{name}.svg", :alt => t("sessions.new.auth_providers.#{name}.alt"), :class => "rounded-3"),
+      image_tag("#{name}.svg",
+                :alt => t("sessions.new.auth_providers.#{name}.alt"),
+                :class => "rounded-3",
+                :size => "36"),
       auth_path(options.merge(:provider => provider)),
       :method => :post,
       :class => "auth_button",

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index f15430efa554627f3b9a9dcf708818a40b6ee656..ffaad054af63f4b89f731415627b08a35e4ad03a 100644 (file)
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -28,7 +28,15 @@
       <label class="form-label"><%= t ".with external" %></label>
 
       <ul class='list-inline' id="login_auth_buttons">
-        <li class="list-inline-item me-3"><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>
+        <li class="list-inline-item me-3">
+          <%= link_to image_tag("openid.png",
+                                :alt => t(".auth_providers.openid.title"),
+                                :size => "36"),
+                      "#",
+                      :id => "openid_open_url",
+                      :title => t(".auth_providers.openid.title") %>
+        </li>
+
         <% %w[google facebook microsoft github wikipedia].each do |provider| %>
           <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
             <li class="list-inline-item me-3"><%= auth_button provider, provider %></li>

diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb
index d2b2f6d3b40daeb0bc4c95ab185a012d6dd4b1d8..f1239bc1ec5d9b54ec9badd4f22cea85f4f3644c 100644 (file)
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -3,10 +3,9 @@
   <div class='header-illustration new-user-main'>
     <h1><%= t "users.new.title" %></h1>
   </div>
-  <div class='header-illustration new-user-arm'></div>
 <% end %>
 
-<div class="message">
-  <h1><%= t "users.new.no_auto_account_create" %></h1>
-  <h2><%= t "users.new.please_contact_support_html", :support_link => mail_to(Settings.support_email, t("users.new.support")) %></h2>
+<div class="mx-auto my-0">
+  <p><strong><%= t "users.new.no_auto_account_create" %></strong></p>
+  <p><%= t "users.new.please_contact_support_html", :support_link => mail_to(Settings.support_email, t("users.new.support")) %></p>
 </div>

diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb
index 52d3090d02b392220508d28a6c9aab27dbd9f83e..0767dea56c777b135d66666a2a183e1e4bcd9638 100644 (file)
--- a/test/helpers/user_helper_test.rb
+++ b/test/helpers/user_helper_test.rb
@@ -116,7 +116,7 @@ class UserHelperTest < ActionView::TestCase
 
   def test_auth_button
     button = auth_button("google", "google")
-    img_tag = "<img alt=\"Log in with a Google OpenID\" class=\"rounded-3\" src=\"/images/google.svg\" />"
+    img_tag = "<img alt=\"Log in with a Google OpenID\" class=\"rounded-3\" src=\"/images/google.svg\" width=\"36\" height=\"36\" />"
     assert_equal("<a class=\"auth_button\" title=\"Log in with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\">#{img_tag}</a>", button)
   end