diff --git a/app/views/friends/show.html.haml b/app/views/friends/show.html.haml index 5e91a295d..88159f685 100644 --- a/app/views/friends/show.html.haml +++ b/app/views/friends/show.html.haml @@ -1,24 +1,30 @@ -%h1= "#{@friend.real_name}" -- if @friend_profile - %p - %b First Name - %p - = @friend_profile.first_name - %p - %b Last Name - %p - = @friend_profile.last_name -%br -%br -%br -%br +.span-15 + .span-4.append-1.last + %img{:src => "/images/user_picture.jpg", :id => "profile_picture"} + .span-10.last + %h1= "#{@friend.real_name}" + - if @friend_profile + %p + %b First Name + %p + = @friend_profile.first_name + %p + %b Last Name + %p + = @friend_profile.last_name -- if @friend.posts - %h3 stream - %ul#stream - - for post in @friend_posts - = render type_partial(post), :post => post -- else - %h3 no posts to display! + %br + %br + %br + %br + +.span-15 + - if @friend.posts + %h3 stream + %ul#stream + - for post in @friend_posts + = render type_partial(post), :post => post + - else + %h3 no posts to display! diff --git a/public/images/user_picture.jpg b/public/images/user_picture.jpg new file mode 100644 index 000000000..3cecbc150 Binary files /dev/null and b/public/images/user_picture.jpg differ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 42a32ad8f..a2e61aa18 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -200,3 +200,6 @@ ul.comment_set { ul.comment_set li.comment .from a { color: #333333; font-weight: bold; } + +img#profile_picture { + width: 100%; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 0ab58d373..bf9fef9d7 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -236,3 +236,6 @@ ul.comment_set :color #333 :font :weight bold + +img#profile_picture + :width 100%