reworking new page.

diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg
index dea2cccc1bd234c0820121c5c3614a1c8e27fa63..461bb7c78e7bfaf76e7b92c5d4e7973e939c8f54 100644 (file)
--- a/app/assets/images/sprite.svg
+++ b/app/assets/images/sprite.svg
@@ -14,7 +14,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   inkscape:export-filename="/Users/tmcw/src/openstreetmap-website/app/assets/images/sprite.png"
+   inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/sprite.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    sodipodi:docname="sprite.svg">
@@ -27,9 +27,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="82.865988"
-     inkscape:cy="195.08379"
+     inkscape:zoom="1"
+     inkscape:cx="200.95282"
+     inkscape:cy="275.08379"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index edf6eb85f2deccb7793904ce2ad529ae3ab20263..db81669d127d895bf1d805e597ef79b9edbf4840 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -73,10 +73,24 @@ abbr, acronym {
 .col11   { float:left; width:91.6666%; }
 .col12   { width:100%; }
 
+.margin0  { margin-left:04.1666%; }
+.margin1  { margin-left:08.3333%; }
+.margin2  { margin-left:16.6666%; }
+.margin3  { margin-left:25.0000%; }
+.margin4  { margin-left:33.3333%; }
+.margin5  { margin-left:41.6666%; }
+.margin6  { margin-left:50.0000%; }
+.margin7  { margin-left:58.3333%; }
+.margin8  { margin-left:66.6666%; }
+.margin9  { margin-left:75.0000%; }
+.margin10 { margin-left:83.3333%; }
+.margin11 { margin-left:91.6666%; }
+.margin12 { margin-left:100.0000%; }
 
 .pad1 { padding: $lineheight/2; }
 .pad2 { padding: $lineheight; }
 
+.fillL { background-color: white; }
 /* Default rules for the body of every page */
 
 * {
@@ -1031,14 +1045,17 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   border-left: 1px solid #ccc;
 }
 
+/* Overrides for pages that use new layout conventions */
 .site-copyright,
 .site-welcome,
 .user-new {
-  .content-heading {
+  #content.pad2 {
+    padding: 0;
   }
+}
 
-  #content {
-  }
+.user-new .content-heading {
+  height: 200px;  
 }
 
 .wrapper {
@@ -1454,7 +1471,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   float: left;
 }
 
-/* Rules for the login page */
+/* Rules for the log in page */
 
 #login_openid_buttons {
   margin-bottom: 0;

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 1368dfe19ddec28e093b8307f3954315f01b22fc..dbb5d6047461a99dbb8daa4425f8b27d497d66af 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -2,7 +2,7 @@
   <h1><%= t 'user.new.title' %></h1>
 <% end %>
 
-<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'col6 pad2' } do %>
+<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper fillL col6 pad2' } do %>
   <%= error_messages_for 'user' %>
 
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
@@ -70,8 +70,8 @@
   </div>
 <% end %>
 
-<div class='col6 pad2'>
-  <h3><%= t 'user.new.about.header' %></h3>
+<div class='col6 deemphasize pad2'>
+  <h4><%= t 'user.new.about.header' %></h4>
   <%= t 'user.new.about.html' %>
 </div>
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 063057d62c0362eef842370770c77d2ddf1a8bb9..6ad207999eb430251f22ef13091cb8451e096665 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1706,7 +1706,7 @@ en:
         header: Free and editable
         html: |
           <p>Unlike other maps, OpenStreetMap is completely created by people like you,
-          and free for anyone to fix, update, download and use.</p>
+          and it's free for anyone to fix, update, download and use.</p>
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
       email address: "Email Address:"