Merge pull request #5362 from AntonKhorev/color-mode-preference-map

[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 57e6d014a3ce5e0ae85bab7f7223b3728b0c44de..c2d96b63cc37ae2b9def6ba868cf8742927c3212 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 %>
 
   <%= 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 %>
 
 
 <% 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" %>
     <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,38 +22,33 @@
   </div>
 <% end %>
 
   </div>
 <% end %>
 

-<div id="login_login" class="auth-container mx-auto my-0">
-  <% if @preferred_auth_provider %>
-    <%= render :partial => "auth_providers" %>
-    <%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %>
+<% if @preferred_auth_provider %>
+  <%= render :partial => "auth_providers" %>
+  <%= render :partial => "shared/section_divider", :locals => { :text => t(".or") } %>

 <% end %>
 
 <% end %>
 

-  <%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
-    <%= hidden_field_tag("referer", h(params[:referer]), :autocomplete => "off") %>
+<%= bootstrap_form_tag(:action => "login", :html => { :id => "login_form" }) do |f| %>
+  <%= hidden_field_tag("referer", h(params[:referer]), :autocomplete => "off") %>

 
 

-    <%= f.text_field :username, :label => t(".email or username"), :autofocus => true, :tabindex => 1, :value => params[:username] %>
+  <%= f.text_field :username, :label => t(".email or username"), :autofocus => true, :tabindex => 1, :value => params[:username] %>

 
 

-    <div class="row">
-      <div class="col">
-        <%= f.label :password, t(".password"), :class => "form-label" %>
-      </div>
-      <div class="col text-end">
-        <small><%= link_to(t(".lost password link"), user_forgot_password_path) %></small>
-      </div>
-    </div>
-    <input class="form-control mb-3" type="password" name="password" id="password" tabindex="2" value="" autocomplete="on" />
+  <div class="d-flex flex-wrap column-gap-3 justify-content-between align-items-baseline mb-2">
+    <%= f.label :password, t(".password") %>
+    <small><%= link_to(t(".lost password link"), user_forgot_password_path) %></small>
+  </div>

 
 

-    <%= f.form_group do %>
-      <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "yes") }, "yes" %>
-    <% end %>
+  <%= f.password_field :password, :autocomplete => "on", :tabindex => 2, :value => "", :skip_label => true %>

 
 

-    <div class="mb-3">
-      <%= f.primary t(".login_button"), :tabindex => 4 %>
-    </div>
+  <%= f.form_group do %>
+    <%= f.check_box :remember_me, { :label => t(".remember"), :tabindex => 3, :checked => (params[:remember_me] == "true") }, "yes" %>

   <% end %>
 
   <% end %>
 

-  <% unless @preferred_auth_provider %>
-    <%= render :partial => "shared/section_divider", :locals => { :text => t(".with external") } %>
-    <%= render :partial => "auth_providers" %>
-  <% end %>
-</div>
+  <div class="mb-3">
+    <%= f.primary t(".login_button"), :tabindex => 4 %>
+  </div>
+<% end %>
+
+<% unless @preferred_auth_provider %>
+  <%= render :partial => "shared/section_divider", :locals => { :text => t(".with external") } %>
+  <%= render :partial => "auth_providers" %>
+<% end %>