From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 22 May 2024 11:32:38 +0000 (+0100)
Subject: Merge pull request #4756 from tomhughes/text-muted
X-Git-Tag: live~557
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/532dd10b18fd66e239aadc8a72170d05fa8cba93?ds=sidebyside;hp=-c

Merge pull request #4756 from tomhughes/text-muted

Replace deprecated text-muted class with text-body-secondary
---

532dd10b18fd66e239aadc8a72170d05fa8cba93
diff --combined app/views/sessions/new.html.erb
index ac1d8ed6e,39c5e9032..89d747ebc
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@@ -7,7 -7,7 +7,7 @@@
  
  <% content_for :heading do %>
    <% if @client_app_name %>
-     <p class="text-center text-muted fs-6 py-2 mb-0 bg-body"><%= t(".login_to_authorize_html", :client_app_name => @client_app_name) %></p>
+     <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">
@@@ -16,7 -16,7 +16,7 @@@
          <%= link_to t("sessions.new.tab_title"), "#", :class => "nav-link active" %>
        </li>
        <li class="nav-item">
 -        <%= link_to t("users.new.tab_title"), url_for(:action => :new, :controller => :users), :class => "nav-link" %>
 +        <%= link_to t("users.new.tab_title"), url_for(:action => :new, :controller => :users, :referer => params[:referer]), :class => "nav-link" %>
        </li>
      </ul>
    </div>
@@@ -35,7 -35,7 +35,7 @@@
    <%= 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"), :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">
diff --combined app/views/users/new.html.erb
index 5ab9edb3f,a705ddf30..ae4483757
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@@ -7,13 -7,13 +7,13 @@@
  
  <% content_for :heading do %>
    <% if @client_app_name %>
-     <p class="text-center text-muted fs-6 py-2 mb-0 bg-body"><%= t(".signup_to_authorize_html", :client_app_name => @client_app_name) %></p>
+     <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">
      <ul class="nav nav-tabs position-absolute bottom-0 px-3 fs-6 w-100">
        <li class="nav-item">
 -        <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions), :class => "nav-link" %>
 +        <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions, :referer => @referer), :class => "nav-link" %>
        </li>
        <li class="nav-item">
          <%= link_to t("users.new.tab_title"), "#", :class => "nav-link active" %>
@@@ -24,7 -24,7 +24,7 @@@
  
  <div class="auth-container mx-auto my-0">
    <% if current_user.auth_uid.nil? %>
-     <div class="text-muted fs-6">
+     <div class="text-body-secondary fs-6">
        <p><strong><%= t ".about.header" %></strong> <%= t ".about.paragraph_1" %></p>
        <p><%= t ".about.paragraph_2" %></p>
      </div>
@@@ -53,7 -53,6 +53,7 @@@
                                                                             t(".privacy_policy_url"),
                                                                             :title => t(".privacy_policy_title"),
                                                                             :target => :new)),
 +                                :autofocus => true,
                                  :tabindex => 1 %>
      <% else %>
        <%= f.hidden_field :email %>
@@@ -72,17 -71,17 +72,17 @@@
        </div>
      <% end %>
  
-     <p class="mb-3 text-muted fs-6"><%= t(".by_signing_up_html",
-                                           :tou_link => link_to(t("layouts.tou"),
-                                                                "https://wiki.osmfoundation.org/wiki/Terms_of_Use",
-                                                                :target => :new),
-                                           :privacy_policy_link => link_to(t(".privacy_policy"),
-                                                                           t(".privacy_policy_url"),
-                                                                           :title => t(".privacy_policy_title"),
-                                                                           :target => :new),
-                                           :contributor_terms_link => link_to(t(".contributor_terms"),
-                                                                              t(".contributor_terms_url"),
-                                                                              :target => :new)) %></p>
+     <p class="mb-3 text-body-secondary fs-6"><%= t(".by_signing_up_html",
+                                                    :tou_link => link_to(t("layouts.tou"),
+                                                                         "https://wiki.osmfoundation.org/wiki/Terms_of_Use",
+                                                                         :target => :new),
+                                                    :privacy_policy_link => link_to(t(".privacy_policy"),
+                                                                                    t(".privacy_policy_url"),
+                                                                                    :title => t(".privacy_policy_title"),
+                                                                                    :target => :new),
+                                                    :contributor_terms_link => link_to(t(".contributor_terms"),
+                                                                                       t(".contributor_terms_url"),
+                                                                                       :target => :new)) %></p>
      <%= f.form_group do %>
        <%= f.check_box :consider_pd,
                        :tabindex => 5,