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

Fix small-screen layout issues

Browse source
This commit is contained in:
John Firebaugh 2013-08-12 14:19:26 -07:00
parent b825f4826a
commit 039bfc728e
4 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/assets/stylesheets/common.css.scss
View file

@ -1102,7 +1102,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
} }
} }
@media only screen and (max-width:770px) { @media only screen and (max-width:900px) {
.header-illustration.new-user-arm { display: none;} .header-illustration.new-user-arm { display: none;}
} }
@ -1561,6 +1561,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
background: darken($lightblue, $hovercolor); background: darken($lightblue, $hovercolor);
} }
} }
.form-row {
margin: auto;
max-width: 370px;
}
} }
/* Rules for the account settings page */ /* Rules for the account settings page */

13
app/assets/stylesheets/small.css.scss
View file

@ -255,3 +255,16 @@ p.search_results_entry {
#message_title, #message_body { #message_title, #message_body {
width: 100% !important; width: 100% !important;
} }
/* Rules for the sign-up page */
.user-new,
.user-create {
.col6 {
width: 100%;
}
.aside {
display: none;
}
}

2
app/views/user/new.html.erb
View file

@ -71,7 +71,7 @@
<%= submit_tag t('user.new.continue'), :tabindex => 6 %> <%= submit_tag t('user.new.continue'), :tabindex => 6 %>
<% end %> <% end %>
<div class='col6 deemphasize inner22'> <div class='aside col6 deemphasize inner22'>
<h4><%= t 'user.new.about.header' %></h4> <h4><%= t 'user.new.about.header' %></h4>
<%= t 'user.new.about.html' %> <%= t 'user.new.about.html' %>
</div> </div>

30
app/views/user/terms.html.erb
View file

@ -5,7 +5,7 @@
<%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %> <%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %>
<!-- legale is <%= @legale %> --> <!-- legale is <%= @legale %> -->
<div class='margin3 col6 horizontal-list'> <div class='form-row horizontal-list'>
<label class="standard-label"> <label class="standard-label">
<%= t 'user.terms.legale_select' %> <%= t 'user.terms.legale_select' %>
</label> </label>
@ -30,12 +30,12 @@
<%= render :partial => "terms" %> <%= render :partial => "terms" %>
</div> </div>
<div class="form-row margin3 col6"> <div class="form-row">
<label for="user_consider_pd"> <label for="user_consider_pd">
<%= check_box('user', 'consider_pd') %> <%= check_box('user', 'consider_pd') %>
<%= t 'user.terms.consider_pd' %> <%= t 'user.terms.consider_pd' %>
</label> </label>
<span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span> <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
@ -44,13 +44,13 @@
<%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %> <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
<%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
</div> </div>
<% end %>
<div class="deemphasize"> <div class="deemphasize">
<p id="contributorGuidance"> <p id="contributorGuidance">
<%= raw t 'user.terms.guidance', <%= raw t 'user.terms.guidance',
:summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
:translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %> :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
</p> </p>
</div>
</div> </div>
</div> <% end %>