minute changes

This commit is contained in:
danielvincent 2010-07-28 00:04:43 -07:00
parent d710ff6f4a
commit e2b5af35c1
12 changed files with 30 additions and 22 deletions

View file

@ -4,7 +4,7 @@
= link_to post.name, object_path(post)
%div.time
by:
by
= album_person(post)
%br
= link_to(how_long_ago(post), object_path(post))

View file

@ -1,16 +1,18 @@
%h1.big_text
.back
= link_to "⇧ home", root_path
%ul.button_set
%li.selected= friends_albums_link
%li= your_albums_link
Albums
.button.right#add_album_button
= link_to 'New Album', "#"
#add_album_box.contextual_pane
= render "albums/new_album"
.sub_header
%ul.button_set
%li.selected= friends_albums_link
%li= your_albums_link
%ul#stream
- for album in @albums
= render "album", :post => album

View file

@ -12,7 +12,7 @@
= render "photos/new_photo", :photo => @photo, :album => @album
.sub_header
="last updated: #{how_long_ago(@album)}"
="updated #{how_long_ago(@album)}"
-unless mine? @album
%h4= "by #{@album.person.real_name}"

View file

@ -2,8 +2,8 @@
%h1#user_name
= link_to current_user.real_name, root_path
%span= title_for_page
%h3
#latest_message= my_latest_message
%h3#latest_message
= my_latest_message
= render "shared/publisher"
%ul#stream
- for post in @posts

View file

@ -52,9 +52,9 @@
.container
.span-24.last
.span-19.append-1.last
.span-20.append-1.last
= yield
.span-4.last
.span-3.last
= link_to(person_image_tag(current_user), root_path)
%br
= link_to "Edit your profile", edit_user_path(current_user)

View file

@ -1,4 +1,9 @@
- title "People"
%h1.big_text
.back
= link_to '⇧ home', root_path
Friends
.button.right
= link_to 'Add Friend', requests_path
%table
%tr

View file

@ -1,7 +1,7 @@
%h1.big_text
.back
= link_to "⇧ home", root_path
requests
Requests
= render "requests/new_request", :request => @request

View file

@ -1,6 +1,4 @@
#publisher
%sp
POST:
%ul#publisher_content_pickers
%li{ :class => "status_message selected" }= link_to "status message", "#"
%li{ :class => "bookmark" }= link_to "bookmark", "#"

View file

@ -172,6 +172,9 @@ form {
color: #dddddd;
float: right; }
#latest_message {
font-weight: normal; }
#stream div.comments {
display: none; }
@ -282,9 +285,6 @@ label {
color: #999999;
padding: 20px 1em;
padding-top: 10px; }
#publisher sp {
font-family: "BrandonGrotesqueLightRegular";
font-size: large; }
#new_blog,
#new_bookmark {

View file

@ -202,6 +202,10 @@ form
:size 30%
:color #dddddd
:float right
#latest_message
:font
:weight normal
#stream div.comments
@ -337,11 +341,6 @@ label
:color #999
:padding 20px 1em
:top 10px
sp
:font
:family 'BrandonGrotesqueLightRegular'
:font-size large
#new_blog,
#new_bookmark
@ -473,3 +472,5 @@ h1.big_text
:top -5px
:bottom 20px
:color #999

View file

@ -1,6 +1,7 @@
.button, .button_set
:font
:family "Lucida Grande", sans-serif
:style normal
:display inline

View file

@ -1,5 +1,6 @@
.button, .button_set {
font-family: "Lucida Grande", sans-serif;
font-style: normal;
display: inline;
color: #777777;
font-size: 12px;