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

diff --git a/app/assets/javascripts/auth_providers.js b/app/assets/javascripts/auth_providers.js
index 3dd7601a088686c124f3b3ef170028b5ba099351..75eca253efa9861fb2ea8d503d54c005b6631940 100644 (file)
--- a/app/assets/javascripts/auth_providers.js
+++ b/app/assets/javascripts/auth_providers.js
@@ -11,7 +11,7 @@ $(document).ready(function () {
   // Add click handler to show OpenID field
   $("#openid_open_url").click(function () {
     $("#openid_url").val("http://");
-    $("#login_auth_buttons").hide().removeClass("d-flex");
+    $("#login_auth_buttons").hide();
     $("#login_openid_url").show();
     $("#openid_login_button").show();
   });

diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb
index bdd0c474a932afd2eb42b20bb8d96a90d23b1e18..ddf143d968b26c6e618a9afb73fae7599edbd69d 100644 (file)
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -1,17 +1,18 @@
-<div>
-  <div class="justify-content-center d-flex align-items-center flex-wrap mb-3" id="login_auth_buttons">
+<% prefered_auth_button_available = false %>
+<% %w[google facebook microsoft github wikipedia].each do |provider| %>
+  <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
+    <% if @preferred_auth_provider == provider %>
+      <% prefered_auth_button_available = true %>
+    <% end %>
+  <% end -%>
+<% end -%>
 
-    <% prefered_auth_button_available = false %>
-    <% %w[google facebook microsoft github wikipedia].each do |provider| %>
-      <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
-        <% if @preferred_auth_provider == provider %>
-          <% prefered_auth_button_available = true %>
-        <% end %>
-      <% end -%>
-    <% end -%>
+<div>
+  <%= tag.div :id => "login_auth_buttons",
+              :class => ["row row-cols-1", { "row-cols-sm-2" => prefered_auth_button_available }, "g-2 mb-3"] do %>
 
     <% if prefered_auth_button_available %>
-      <div class="justify-content-center d-flex align-items-center flex-wrap w-50">
+      <div class="col justify-content-center d-flex align-items-center flex-wrap">
         <% %w[google facebook microsoft github wikipedia].each do |provider| %>
           <% if Settings.key?("#{provider}_auth_id".to_sym) -%>
             <% if @preferred_auth_provider == provider %>
@@ -20,11 +21,9 @@
           <% end -%>
         <% end -%>
       </div>
-      <div class="justify-content-center d-flex align-items-center flex-wrap gap-2 w-50 px-1">
-    <% else %>
-      <div class="justify-content-center d-flex align-items-center flex-wrap gap-2">
     <% end %>
 
+    <div class="col justify-content-center d-flex align-items-center flex-wrap gap-2">
       <%= button_tag image_tag("openid.svg",
                                :alt => t(".openid.alt"),
                                :size => "36"),
@@ -41,7 +40,7 @@
         <% end %>
       <% end -%>
     </div>
-  </div>
+  <% end %>
 
   <%# :tabindex starts high to allow rendering at the bottom of the template %>
   <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>