Merge branch 'master' of github.com:diaspora/diaspora_rails

app/views/friends/show.html.haml

@@ -1,5 +1,10 @@
-%h1= "#{@friend.real_name}"
 
+
+.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
@@ -15,6 +20,7 @@
   %br
   %br
 
+.span-15
   - if @friend.posts
     %h3 stream
     %ul#stream

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%; }

public/stylesheets/sass/application.sass

@@ -236,3 +236,6 @@ ul.comment_set
         :color #333
         :font
           :weight bold
+
+img#profile_picture
+  :width 100%