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

diff --combined app/assets/stylesheets/common.scss
index 11f0a5fd386c28e914b2ad10e3175df50988b399,69e82666ffbae81f4ade63bfa2197387978e0733..a1734682e159e2c3040ca67fee5b828c864331cd
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -677,10 -677,16 +677,16 @@@ 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: 0 0;
 +  background-position: right;
    background-repeat: no-repeat;
    position: relative;
    min-height: 200px;
@@@ -689,16 -695,16 +695,16 @@@
    bottom: 0;
  
    &.new-user-main {
 -    background-image: image-url("sign-up-illustration.png");
 -    background-position-x: 50px;
 +    background-image: image-url("sign-up-illustration.svg");
 +    background-position-x: 70px;
    }
  
    &.confirm-main {
 -    background-image: image-url("confirm-illustration.png");
 +    background-image: image-url("confirm-illustration.svg");
    }
  
    &.new-user-terms {
 -    background-image: image-url("terms-illustration.png");
 +    background-image: image-url("terms-illustration.svg");
    }
  }
  
@@@ -895,10 -901,6 +901,6 @@@ div.secondary-actions 
    }
  }
  
- .auth-container {
-   max-width: 600px;
- }
- 
  /* Rules for tabs inside secondary background sections */
  
  .bg-body-secondary .nav-tabs {

diff --combined app/views/users/blocked.html.erb
index 9776136a8e6c18b1dc5d289d7377346f16a22bc9,378d15facd1126f5eeb45338aec4aa4a6a866ba3..a3ef3429b9ff2372e5ba8e456171dd417c4d768f
--- 1/app/views/users/blocked.html.erb
--- 2/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@@ -1,7 -1,7 +1,7 @@@
- <% 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 px-3 fs-6 w-100">
 +    <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" %>
        </li>
@@@ -12,7 -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>