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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 11f0a5fd386c28e914b2ad10e3175df50988b399..a1734682e159e2c3040ca67fee5b828c864331cd 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -677,7 +677,13 @@ tr.turn {
   padding: $lineheight;
 }
 
-/* Overrides for pages that use new layout conventions */
+/* Rules for login and signup pages */
+
+.sessions-new, .users-new, .users-create {
+  #content .content-inner {
+    max-width: 760px;
+  }
+}
 
 .header-illustration {
   background-position: right;
@@ -895,10 +901,6 @@ div.secondary-actions {
   }
 }
 
-.auth-container {
-  max-width: 600px;
-}
-
 /* Rules for tabs inside secondary background sections */
 
 .bg-body-secondary .nav-tabs {

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 162ea542ea8be5d3477e5e9d202f21629e0ad7cf..52e01444279f4b1d52ec324483724c932a7f250a 100644 (file)
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -3,14 +3,14 @@
   <%= javascript_include_tag "auth_providers" %>
 <% end %>
 
-<% content_for :heading_class, "p-0 mw-100" %>
+<% content_for :heading_class, "pb-0" %>
 
 <% content_for :heading do %>
   <% if @client_app_name %>
     <p class="text-center text-body-secondary fs-6 py-2 mb-0 bg-body"><%= t(".login_to_authorize_html", :client_app_name => @client_app_name) %></p>
   <% end %>
 
-  <div class="header-illustration new-user-main auth-container mx-auto">
+  <div class="header-illustration new-user-main">
     <ul class="nav nav-tabs position-absolute bottom-0 fs-6 w-100">
       <li class="nav-item">
         <%= link_to t("sessions.new.tab_title"), "#", :class => "nav-link active" %>
@@ -22,7 +22,7 @@
   </div>
 <% end %>
 
-<div id="login_login" class="auth-container mx-auto my-0">
+<div id="login_login">
   <% if @preferred_auth_provider %>
     <%= render :partial => "auth_providers" %>
     <%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %>

diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb
index 9776136a8e6c18b1dc5d289d7377346f16a22bc9..a3ef3429b9ff2372e5ba8e456171dd417c4d768f 100644 (file)
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -1,6 +1,6 @@
-<% content_for :heading_class, "p-0 mw-100" %>
+<% content_for :heading_class, "pb-0" %>
 <% content_for :heading do %>
-  <div class="header-illustration new-user-main auth-container mx-auto">
+  <div class="header-illustration new-user-main">
     <ul class="nav nav-tabs position-absolute bottom-0 fs-6 w-100">
       <li class="nav-item">
         <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions), :class => "nav-link" %>
@@ -12,7 +12,7 @@
   </div>
 <% end %>
 
-<div class="auth-container mx-auto my-0">
+<div>
   <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/app/views/users/new.html.erb b/app/views/users/new.html.erb
index b87244b9f42f8b0842fc1575a1276f9578a2580f..d2f1d27def20488a82f5698847f6a1437a6ed595 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -3,14 +3,14 @@
   <%= javascript_include_tag "auth_providers" %>
 <% end %>
 
-<% content_for :heading_class, "p-0 mw-100" %>
+<% content_for :heading_class, "pb-0" %>
 
 <% content_for :heading do %>
   <% if @client_app_name %>
     <p class="text-center text-body-secondary fs-6 py-2 mb-0 bg-body"><%= t(".signup_to_authorize_html", :client_app_name => @client_app_name) %></p>
   <% end %>
 
-  <div class="header-illustration new-user-main auth-container mx-auto">
+  <div class="header-illustration new-user-main">
     <ul class="nav nav-tabs position-absolute bottom-0 fs-6 w-100">
       <li class="nav-item">
         <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions, :referer => @referer), :class => "nav-link" %>
@@ -22,7 +22,7 @@
   </div>
 <% end %>
 
-<div class="auth-container mx-auto my-0">
+<div>
   <% if current_user.auth_uid.nil? %>
     <div class="text-body-secondary fs-6">
       <p><strong><%= t ".about.header" %></strong> <%= t ".about.paragraph_1" %></p>