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

reworking new page.

Browse source
This commit is contained in:
Saman Bemel-Benrud 2013-07-30 15:34:44 -04:00 • committed by John Firebaugh
parent 1ba4fdd3e1
commit c031ceb340
4 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/assets/images/sprite.svg
View file

@ -14,7 +14,7 @@
id="svg2" id="svg2"
version="1.1" version="1.1"
inkscape:version="0.48.4 r9939" 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-xdpi="90"
inkscape:export-ydpi="90" inkscape:export-ydpi="90"
sodipodi:docname="sprite.svg"> sodipodi:docname="sprite.svg">
@ -27,9 +27,9 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="1.4142136" inkscape:zoom="1"
inkscape:cx="82.865988" inkscape:cx="200.95282"
inkscape:cy="195.08379" inkscape:cy="275.08379"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="false" showgrid="false"

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

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

@ -73,10 +73,24 @@ abbr, acronym {
.col11 { float:left; width:91.6666%; } .col11 { float:left; width:91.6666%; }
.col12 { width:100%; } .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; } .pad1 { padding: $lineheight/2; }
.pad2 { padding: $lineheight; } .pad2 { padding: $lineheight; }
.fillL { background-color: white; }
/* Default rules for the body of every page */ /* 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; border-left: 1px solid #ccc;
} }
/* Overrides for pages that use new layout conventions */
.site-copyright, .site-copyright,
.site-welcome, .site-welcome,
.user-new { .user-new {
.content-heading { #content.pad2 {
padding: 0;
} }
}
#content { .user-new .content-heading {
} height: 200px;
} }
.wrapper { .wrapper {
@ -1454,7 +1471,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
float: left; float: left;
} }
/* Rules for the login page */ /* Rules for the log in page */
#login_openid_buttons { #login_openid_buttons {
margin-bottom: 0; margin-bottom: 0;

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

@ -2,7 +2,7 @@
<h1><%= t 'user.new.title' %></h1> <h1><%= t 'user.new.title' %></h1>
<% end %> <% 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' %> <%= error_messages_for 'user' %>
<%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %> <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
@ -70,8 +70,8 @@
</div> </div>
<% end %> <% end %>
<div class='col6 pad2'> <div class='col6 deemphasize pad2'>
<h3><%= t 'user.new.about.header' %></h3> <h4><%= t 'user.new.about.header' %></h4>
<%= t 'user.new.about.html' %> <%= t 'user.new.about.html' %>
</div> </div>

2
config/locales/en.yml
View file

@ -1706,7 +1706,7 @@ en:
header: Free and editable header: Free and editable
html: | html: |
<p>Unlike other maps, OpenStreetMap is completely created by people like you, <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> <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>.' 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:" email address: "Email Address:"