From: Tom Hughes <tom@compton.nu>
Date: Sun, 7 Jul 2024 09:47:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4954'
X-Git-Tag: live~423
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/625e7c3296c46141d199a8a0c69822bc1b38ae6a

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

625e7c3296c46141d199a8a0c69822bc1b38ae6a
diff --cc app/assets/stylesheets/common.scss
index 11f0a5fd3,69e82666f..a1734682e
--- a/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;
diff --cc app/views/users/blocked.html.erb
index 9776136a8,378d15fac..a3ef3429b
--- a/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>