From 82fd7a10aca90135eb54b74d142c7139d8638d04 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 8 Jan 2020 17:04:53 +0100
Subject: [PATCH] Remove the custom layout css from the terms page

This uses bootstrap utilities where necessary. It also removes the
terms page from a padding override, which was then in turn overridden
by a padding class applied to the form!
---
 app/assets/stylesheets/common.scss |  3 +--
 app/views/users/terms.html.erb     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 018f36217..607ea4bf6 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1405,8 +1405,7 @@ tr.turn:hover {
 /* Overrides for pages that use new layout conventions */
 
 .users-new,
-.users-create,
-.users-terms {
+.users-create {
   .content-body .content-inner {
     padding: 0;
 
diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index 97c1c7bf7..243ce2863 100644
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -7,13 +7,13 @@
   <div class='header-illustration new-user-terms'></div>
 <% end %>
 
-<%= form_tag({ :action => "save" }, { :class => " inner22 standard-form fillL" }) do %>
+<%= form_tag({ :action => "save" }, { :class => "standard-form fillL" }) do %>
   <!-- legale is <%= @legale %> -->
   <p class="deemphasize"><%= t ".read and accept with tou" %></p>
-  <label class="standard-label">
+  <h4>
     <%= t ".heading_ct" %>
-  </label>
-  <div class='form-row horizontal-list'>
+  </h4>
+  <div class='form-row horizontal-list clearfix'>
     <p class="deemphasize"><%= t ".contributor_terms_explain" %></p>
     <label class="standard-label">
       <%= t ".legale_select" %>
@@ -29,7 +29,7 @@
     <% end %>
   </div>
 
-  <div id="contributorTerms" class="col12 legale">
+  <div id="contributorTerms" class="legale">
     <%= render :partial => "terms" %>
   </div>
 
@@ -47,9 +47,9 @@
     </label>
   </div>
 
-  <label class="standard-label">
+  <h4>
     <%= t "layouts.tou" %>
-  </label>
+  </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">
     <label for="read_tou">
@@ -59,7 +59,7 @@
 
     <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
 
-    <div class="buttons form-row inner20 clearfix">
+    <div class="buttons form-row py-3 clearfix">
       <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true) %>
       <%= submit_tag("Cancel", :name => "decline", :id => "decline") %>
     </div>
-- 
2.43.2