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

[rails.git] / app / views / users / terms.html.erb

diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index 243ce2863042040d306de0ca8867fcda1deecd58..bc8b86ef2256a269e25b0a6f8401fb419d3ea166 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -9,18 +9,18 @@
 
 <%= form_tag({ :action => "save" }, { :class => "standard-form fillL" }) do %>
   <!-- legale is <%= @legale %> -->
 
 <%= form_tag({ :action => "save" }, { :class => "standard-form fillL" }) do %>
   <!-- legale is <%= @legale %> -->

-  <p class="deemphasize"><%= t ".read and accept with tou" %></p>
+  <p class="text-muted"><%= t ".read and accept with tou" %></p>

   <h4>
     <%= t ".heading_ct" %>
   </h4>
   <h4>
     <%= t ".heading_ct" %>
   </h4>

-  <div class='form-row horizontal-list clearfix'>
-    <p class="deemphasize"><%= t ".contributor_terms_explain" %></p>
+  <div class='standard-form-row horizontal-list clearfix'>
+    <p class="text-muted"><%= t ".contributor_terms_explain" %></p>

     <label class="standard-label">
       <%= t ".legale_select" %>
     </label>
 
     <% [%w[france FR], %w[italy IT], %w[rest_of_world GB]].each do |name, legale| %>
     <label class="standard-label">
       <%= t ".legale_select" %>
     </label>
 
     <% [%w[france FR], %w[italy IT], %w[rest_of_world GB]].each do |name, legale| %>

-      <div class="form-row">
+      <div class="standard-form-row">

         <label for="legale_<%= legale %>">
           <%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
           <%= t(".legale_names." + name) %>
         <label for="legale_<%= legale %>">
           <%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
           <%= t(".legale_names." + name) %>


@@ -34,13 +34,13 @@
   </div>
 
   <div>
   </div>
 
   <div>

-    <p id="contributorGuidance" class="deemphasize">
+    <p id="contributorGuidance" class="text-muted">

       <%= t ".guidance_html",
             :summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
             :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
     </p>
   </div>
       <%= t ".guidance_html",
             :summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
             :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>
     </p>
   </div>

-  <div class="form-row">
+  <div class="standard-form-row">

     <label for="read_ct">
       <%= check_box_tag "read_ct" %>
       <%= t ".read_ct" %>
     <label for="read_ct">
       <%= check_box_tag "read_ct" %>
       <%= t ".read_ct" %>


@@ -50,8 +50,8 @@
   <h4>
     <%= t "layouts.tou" %>
   </h4>
   <h4>
     <%= t "layouts.tou" %>
   </h4>

-  <p class="deemphasize"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
-  <div class="form-row">
+  <p class="text-muted"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
+  <div class="standard-form-row">

     <label for="read_tou">
       <%= check_box_tag "read_tou" %>
       <%= t ".read_tou" %>
     <label for="read_tou">
       <%= check_box_tag "read_tou" %>
       <%= t ".read_tou" %>


@@ -59,7 +59,7 @@
 
     <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
 
 
     <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
 

-    <div class="buttons form-row py-3 clearfix">
+    <div class="buttons standard-form-row py-3 clearfix">

       <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true) %>
       <%= submit_tag("Cancel", :name => "decline", :id => "decline") %>
     </div>
       <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true) %>
       <%= submit_tag("Cancel", :name => "decline", :id => "decline") %>
     </div>