cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the custom layout css from the terms page

Browse source 
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!
This commit is contained in:
Andy Allan 2020-01-08 17:04:53 +01:00
parent f0ee117cff
commit 82fd7a10ac
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/common.scss
View file

@ -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;

16
app/views/users/terms.html.erb
View file

@ -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>