repositioning layout on getting started

This commit is contained in:
danielvincent 2010-10-20 16:41:38 -07:00
parent 69b1b71a5d
commit dd4f46c8b0
4 changed files with 67 additions and 63 deletions

View file

@ -3,18 +3,19 @@
-# the COPYRIGHT file. -# 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 %h3{:style => "text-align:right;"}
= "Welcome, #{current_user.real_name}!" = link_to "Edit your profile", getting_started_path(1)
.description %br
Do the stuff below to further complete some things. = link_to "Define your aspects", getting_started_path(2)
%br
= link_to "Find your friends", getting_started_path(3)
%h2 .span-15.last
%u = render 'users/profile'
Edit your profile
Define your aspects ➔
Find your friends
= render 'users/profile'

View file

@ -3,33 +3,34 @@
-# the COPYRIGHT file. -# 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 %h3{:style => "text-align:right;"}
= "Welcome, #{current_user.real_name}!" = link_to "Edit your profile", getting_started_path(1)
.description %br
Do the stuff below to further complete some things. = link_to "Define your aspects", getting_started_path(2)
%br
= link_to "Find your friends", getting_started_path(3)
%h2 .span-15.last
Edit your profile ➔ %h3
%u Your aspects
Define your aspects .description
These will be blah blah blah blah and some stuff.
Find your friends
%h3 %h4
Your aspects Aspect name
.description = text_field_tag :aspect_name, nil, :placeholder => "New aspect"
These will be blah blah blah blah and some stuff.
%h4 %ul.aspects
Aspect name - for aspect in @aspects
= text_field_tag :aspect_name, nil, :placeholder => "New aspect" %li
= aspect
%ul.aspects .friend_pictures.horizontal
- for aspect in @aspects - for friend in @friends
%li = person_image_link(friend)
= aspect
.friend_pictures.horizontal
- for friend in @friends
= person_image_link(friend)

View file

@ -4,33 +4,36 @@
%h1 .span-8.append-1.last
= "Welcome, #{current_user.real_name}!" %h1{:style => "text-align:right;"}
.description = "Welcome!"
Do the stuff below to further complete some things. .description
Do the stuff below to further complete some things.
%h2 %h3{:style => "text-align:right;"}
Edit your profile ➔ = link_to "Edit your profile", getting_started_path(1)
Define your aspects ➔ %br
%u = link_to "Define your aspects", getting_started_path(2)
Find your friends %br
= link_to "Find your friends", getting_started_path(3)
%h3 .span-15.last
Your friends %h3
.description Your friends
Find your friends on Diaspora, Facebook, or send them an invite via email. .description
Find your friends on Diaspora, Facebook, or send them an invite via email.
.span-5 .span-5.last
%h4 %h4
On Diaspora On Diaspora
= text_field_tag :diaspora_handle, nil, :placeholder => "Diaspora handle" = text_field_tag :diaspora_handle, nil, :placeholder => "Diaspora handle"
.span-5 .span-5.last
%h4 %h4
On Facebook On Facebook
= text_field_tag :facebook_handle, nil, :placeholder => "Name" = text_field_tag :facebook_handle, nil, :placeholder => "Name"
.span-5 .span-5.last
%h4 %h4
Invite Invite
= text_field_tag :email, nil, :placeholder => "Email", :type => "email" = text_field_tag :email, nil, :placeholder => "Email", :type => "email"

View file

@ -1259,7 +1259,6 @@ ul.aspects
:margin 0 :margin 0
:padding 0 :padding 0
:list-style none :list-style none
:width 67%
:color #999 :color #999
:font :font
:size 24px :size 24px