From: Saman Bemel-Benrud Date: Tue, 30 Jul 2013 21:36:36 +0000 (-0400) Subject: making sign-up page fun. X-Git-Tag: live~4796^2~31 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/007b985835a70ac37bbb68abe2eba126fe36cd64 making sign-up page fun. --- diff --git a/app/assets/images/sign-up-illustration-arm.png b/app/assets/images/sign-up-illustration-arm.png new file mode 100644 index 000000000..e33432773 Binary files /dev/null and b/app/assets/images/sign-up-illustration-arm.png differ diff --git a/app/assets/images/sign-up-illustration.png b/app/assets/images/sign-up-illustration.png new file mode 100644 index 000000000..8399067a2 Binary files /dev/null and b/app/assets/images/sign-up-illustration.png differ diff --git a/app/assets/images/sign-up-illustration.svg b/app/assets/images/sign-up-illustration.svg new file mode 100644 index 000000000..d335bdeba --- /dev/null +++ b/app/assets/images/sign-up-illustration.svg @@ -0,0 +1,812 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010000011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index 461bb7c78..b150bac12 100644 --- 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/saman/work_repos/openstreetmap-website/app/assets/images/sprite.png" + inkscape:export-filename="/Users/tmcw/src/openstreetmap-website/app/assets/images/sprite.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" sodipodi:docname="sprite.svg"> @@ -28,8 +28,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="200.95282" - inkscape:cy="275.08379" + inkscape:cx="205.4941" + inkscape:cy="191.63547" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -254,39 +254,8 @@ style="color:#000000;fill:#70cd8f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6591-2);enable-background:accumulate" /> - - - - - + d="M 185 6 L 183 8 L 183 12 L 185 14 L 187 14 L 185 12 L 185 8 L 190 8 L 190 11 L 192 11 L 192 8 L 190 6 L 187 6 L 185 6 z M 192 6 L 194 8 L 194 12 L 189 12 L 189 9 L 187 9 L 187 12 L 189 14 L 194 14 L 196 12 L 196 8 L 194 6 L 192 6 z " + transform="translate(0,852.36218)" + id="path4118" /> diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index db81669d1..09ef07373 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1058,6 +1058,32 @@ ul.results-list li { border-bottom: 1px solid #ccc; } height: 200px; } +.new-user-illustration { + background-position: 0 0; + background-repeat: no-repeat; + position: absolute; +} + +.new-user-illustration.new-user-main { + height: 200px; + width: 100%; + left: 0; + bottom: 0; + background-image: image-url("sign-up-illustration.png"); +} + +.new-user-illustration.new-user-arm { + height: 110px; + width: 130px; + left: 230px; + top: 160px; + background-image: image-url("sign-up-illustration-arm.png"); +} + +@media only screen and (max-width:770px) { + .new-user-illustration.new-user-arm { display: none;} +} + .wrapper { margin-left: 184px; border-left: 1px solid #ccc; @@ -1113,6 +1139,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; } position: relative; padding: $lineheight; background: $offwhite; + z-index: 2; h1, h2 { margin-bottom: $lineheight/2; line-height: 100%; diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index dbb5d6047..3707bb070 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -1,5 +1,7 @@ <% content_for :heading do %>

<%= t 'user.new.title' %>

+
+
<% end %> <%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper fillL col6 pad2' } do %>