From 8ee3d678319062d4f2f27918d3f98d3465d9eb36 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 5 Jul 2024 14:38:25 +0300 Subject: [PATCH] Set "login/signup" page width equal to "about" page width --- app/assets/stylesheets/common.scss | 12 +++++++----- app/views/sessions/new.html.erb | 6 +++--- app/views/users/blocked.html.erb | 6 +++--- app/views/users/new.html.erb | 6 +++--- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 7f92b9785..69e82666f 100644 --- 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: 0 0; @@ -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 162ea542e..52e014442 100644 --- 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 %>

<%= t(".login_to_authorize_html", :client_app_name => @client_app_name) %>

<% end %> -
+
<% end %> -
+
<% 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 a97d9ba8d..378d15fac 100644 --- 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 %> -
+
<% end %> -
+

<%= t "users.new.no_auto_account_create" %>

<%= t "users.new.please_contact_support_html", :support_link => mail_to(Settings.support_email, t("users.new.support")) %>

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index b87244b9f..d2f1d27de 100644 --- 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 %>

<%= t(".signup_to_authorize_html", :client_app_name => @client_app_name) %>

<% end %> -
+
<% end %> -
+
<% if current_user.auth_uid.nil? %>

<%= t ".about.header" %> <%= t ".about.paragraph_1" %>

-- 2.39.5