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

[rails.git] / app / views / sessions / new.html.erb

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 18f536206007ab965724be7ec2cefc7d038c7bb7..dea65f768985860104b27651a7ff6bb600702b41 100644 (file)
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -24,8 +24,8 @@
   <hr>
 
   <div id="loginForm">
-    <div class="form-group">
-      <label><%= t ".with external" %></label>
+    <div class="mb-3">
+      <label class="form-label"><%= t ".with external" %></label>
 
       <ul class='list-unstyled' id="login_auth_buttons">
         <li><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>
@@ -35,8 +35,8 @@
         <% if Settings.key?(:facebook_auth_id) -%>
         <li><%= auth_button "facebook", "facebook" %></li>
         <% end -%>
-        <% if Settings.key?(:windowslive_auth_id) -%>
-        <li><%= auth_button "windowslive", "windowslive" %></li>
+        <% if Settings.key?(:microsoft_auth_id) -%>
+        <li><%= auth_button "microsoft", "microsoft" %></li>
         <% end -%>
         <% if Settings.key?(:github_auth_id) -%>
         <li><%= auth_button "github", "github" %></li>
@@ -47,8 +47,8 @@
       </ul>
 
       <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
-        <div id='login_openid_url' class="form-group">
-          <label for='openid_url'><%= t ".openid_html", :logo => openid_logo %></label>
+        <div id='login_openid_url' class="mb-3">
+          <label for='openid_url' class="form-label"><%= t ".openid_html", :logo => openid_logo %></label>
           <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>
           <%= text_field_tag("openid_url", "", :tabindex => 3, :autocomplete => "on", :class => "openid_url form-control") %>
           <span class="form-text text-muted">(<a href="<%= t "accounts.edit.openid.link" %>" target="_new"><%= t "accounts.edit.openid.link text" %></a>)</span>