From dd4f46c8b0cf83e76a7e172fa759f10f621ef3bb Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Wed, 20 Oct 2010 16:41:38 -0700
Subject: [PATCH] repositioning layout on getting started
---
app/views/users/getting_started/1.html.haml | 25 ++++----
app/views/users/getting_started/2.html.haml | 59 +++++++++----------
app/views/users/getting_started/3.html.haml | 63 +++++++++++----------
public/stylesheets/sass/application.sass | 1 -
4 files changed, 76 insertions(+), 72 deletions(-)
diff --git a/app/views/users/getting_started/1.html.haml b/app/views/users/getting_started/1.html.haml
index 51cc5ee071..41e2c3aaf9 100644
--- a/app/views/users/getting_started/1.html.haml
+++ b/app/views/users/getting_started/1.html.haml
@@ -3,18 +3,19 @@
-# the COPYRIGHT file.
+.span-8.append-1.last
+ %h1{:style => "text-align:right;"}
+ = "Welcome!"
+ .description
+ Do the stuff below to further complete some things.
-%h1
- = "Welcome, #{current_user.real_name}!"
- .description
- Do the stuff below to further complete some things.
+ %h3{:style => "text-align:right;"}
+ = link_to "Edit your profile", getting_started_path(1)
+ %br
+ = link_to "Define your aspects", getting_started_path(2)
+ %br
+ = link_to "Find your friends", getting_started_path(3)
-%h2
- %u
- Edit your profile
- âž”
- Define your aspects âž”
- Find your friends
-
-= render 'users/profile'
+.span-15.last
+ = render 'users/profile'
diff --git a/app/views/users/getting_started/2.html.haml b/app/views/users/getting_started/2.html.haml
index de532553ef..d7ec9baeb3 100644
--- a/app/views/users/getting_started/2.html.haml
+++ b/app/views/users/getting_started/2.html.haml
@@ -3,33 +3,34 @@
-# the COPYRIGHT file.
-
-%h1
- = "Welcome, #{current_user.real_name}!"
- .description
- Do the stuff below to further complete some things.
-
-%h2
- Edit your profile âž”
- %u
- Define your aspects
- âž”
- Find your friends
-
-%h3
- Your aspects
- .description
- These will be blah blah blah blah and some stuff.
-
-%h4
- Aspect name
- = text_field_tag :aspect_name, nil, :placeholder => "New aspect"
-
-%ul.aspects
- - for aspect in @aspects
- %li
- = aspect
- .friend_pictures.horizontal
- - for friend in @friends
- = person_image_link(friend)
+.span-8.append-1.last
+ %h1{:style => "text-align:right;"}
+ = "Welcome!"
+ .description
+ Do the stuff below to further complete some things.
+
+ %h3{:style => "text-align:right;"}
+ = link_to "Edit your profile", getting_started_path(1)
+ %br
+ = link_to "Define your aspects", getting_started_path(2)
+ %br
+ = link_to "Find your friends", getting_started_path(3)
+
+.span-15.last
+ %h3
+ Your aspects
+ .description
+ These will be blah blah blah blah and some stuff.
+
+ %h4
+ Aspect name
+ = text_field_tag :aspect_name, nil, :placeholder => "New aspect"
+
+ %ul.aspects
+ - for aspect in @aspects
+ %li
+ = aspect
+ .friend_pictures.horizontal
+ - for friend in @friends
+ = person_image_link(friend)
diff --git a/app/views/users/getting_started/3.html.haml b/app/views/users/getting_started/3.html.haml
index e6c6fcd24c..f5136aeafc 100644
--- a/app/views/users/getting_started/3.html.haml
+++ b/app/views/users/getting_started/3.html.haml
@@ -4,33 +4,36 @@
-%h1
- = "Welcome, #{current_user.real_name}!"
- .description
- Do the stuff below to further complete some things.
-
-%h2
- Edit your profile âž”
- Define your aspects âž”
- %u
- Find your friends
-
-%h3
- Your friends
- .description
- Find your friends on Diaspora, Facebook, or send them an invite via email.
-
-.span-5
- %h4
- On Diaspora
- = text_field_tag :diaspora_handle, nil, :placeholder => "Diaspora handle"
-
-.span-5
- %h4
- On Facebook
- = text_field_tag :facebook_handle, nil, :placeholder => "Name"
-
-.span-5
- %h4
- Invite
- = text_field_tag :email, nil, :placeholder => "Email", :type => "email"
+.span-8.append-1.last
+ %h1{:style => "text-align:right;"}
+ = "Welcome!"
+ .description
+ Do the stuff below to further complete some things.
+
+ %h3{:style => "text-align:right;"}
+ = link_to "Edit your profile", getting_started_path(1)
+ %br
+ = link_to "Define your aspects", getting_started_path(2)
+ %br
+ = link_to "Find your friends", getting_started_path(3)
+
+.span-15.last
+ %h3
+ Your friends
+ .description
+ Find your friends on Diaspora, Facebook, or send them an invite via email.
+
+ .span-5.last
+ %h4
+ On Diaspora
+ = text_field_tag :diaspora_handle, nil, :placeholder => "Diaspora handle"
+
+ .span-5.last
+ %h4
+ On Facebook
+ = text_field_tag :facebook_handle, nil, :placeholder => "Name"
+
+ .span-5.last
+ %h4
+ Invite
+ = text_field_tag :email, nil, :placeholder => "Email", :type => "email"
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 824cc7ff68..3912b1cc02 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1259,7 +1259,6 @@ ul.aspects
:margin 0
:padding 0
:list-style none
- :width 67%
:color #999
:font
:size 24px
--
GitLab