Fix small-screen layout issues

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index d1983fb8aa1996e52d6bffc04666d540a556de0b..0e03da6de7d3c9870f6412be2db9cb8b1e4870f3 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -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 */

diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index 65cefa76d1eb312214218872a09c86c424453e64..3f90883117b69373cc75a631cb3e1c3eaeef9f82 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -255,3 +255,16 @@ p.search_results_entry {
 #message_title, #message_body {
   width: 100% !important;
 }
 #message_title, #message_body {
   width: 100% !important;
 }

+
+/* Rules for the sign-up page */
+
+.user-new,
+.user-create {
+  .col6 {
+    width: 100%;
+  }
+
+  .aside {
+    display: none;
+  }
+}
\ No newline at end of file

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 45c33aaeff5225ee47e44876e79226b495ef850f..d1772f996d99453c42febd457b7e583ef282098d 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -71,7 +71,7 @@
   <%= submit_tag t('user.new.continue'), :tabindex => 6 %>
 <% end %>
 
   <%= submit_tag t('user.new.continue'), :tabindex => 6 %>
 <% end %>
 

-<div class='col6 deemphasize inner22'>
+<div class='aside col6 deemphasize inner22'>

   <h4><%= t 'user.new.about.header' %></h4>
   <%= t 'user.new.about.html' %>
 </div>
   <h4><%= t 'user.new.about.header' %></h4>
   <%= t 'user.new.about.html' %>
 </div>

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index 525e0cc81591c56accfb09552e8f3c323f760f18..47e2f8b54e7004ec274a41be1dcd1ff1c045e40d 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -5,7 +5,7 @@
 
 <%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %>
   <!-- legale is <%= @legale %> -->
 
 <%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %>
   <!-- legale is <%= @legale %> -->

-  <div class='margin3 col6 horizontal-list'>
+  <div class='form-row horizontal-list'>

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


@@ -30,12 +30,12 @@
     <%= render :partial => "terms" %>
   </div>
 
     <%= render :partial => "terms" %>
   </div>
 

-    <div class="form-row margin3 col6">
-      <label for="user_consider_pd">
-        <%= check_box('user', 'consider_pd') %>
-        <%= t 'user.terms.consider_pd' %>
-      </label>
-      <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
+  <div class="form-row">
+    <label for="user_consider_pd">
+      <%= check_box('user', 'consider_pd') %>
+      <%= t 'user.terms.consider_pd' %>
+    </label>
+    <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.decline'), :name => "decline", :id => "decline") %>
     </div>
       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
     </div>

-  <% end %>

 
 

-  <div class="deemphasize">
-    <p id="contributorGuidance">
-      <%= raw t 'user.terms.guidance',
-                :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
-                :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
-    </p>
+    <div class="deemphasize">
+      <p id="contributorGuidance">
+        <%= raw t 'user.terms.guidance',
+                  :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
+                  :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
+      </p>
+    </div>

   </div>
   </div>

-</div>
+<% end %>