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

[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 33ca3a3e63e030531c0304cf934d74d8cd7e29ca..b3e42189be18ae6f6c155c85cd02a51bd4ce0c30 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -9,12 +9,12 @@
 
 <%= 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>
   <div class='standard-form-row horizontal-list clearfix'>
   <h4>
     <%= t ".heading_ct" %>
   </h4>
   <div class='standard-form-row horizontal-list clearfix'>

-    <p class="deemphasize"><%= t ".contributor_terms_explain" %></p>
+    <p class="text-muted"><%= t ".contributor_terms_explain" %></p>

     <label class="standard-label">
       <%= t ".legale_select" %>
     </label>
     <label class="standard-label">
       <%= t ".legale_select" %>
     </label>


@@ -23,7 +23,7 @@
       <div class="standard-form-row">
         <label for="legale_<%= legale %>">
           <%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
       <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) %>
+          <%= t(".legale_names.#{name}") %>

         </label>
       </div>
     <% end %>
         </label>
       </div>
     <% end %>


@@ -34,7 +34,7 @@
   </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" %>
       <%= t ".guidance_html",
             :summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
             :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>


@@ -50,7 +50,7 @@
   <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>
+  <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" %>
   <div class="standard-form-row">
     <label for="read_tou">
       <%= check_box_tag "read_tou" %>