diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 736d8b587..2b1c00c47 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -7,7 +7,7 @@ %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/ = stylesheet_link_tag "blueprint/screen", :media => 'screen' - = stylesheet_link_tag "application", "ui" + = stylesheet_link_tag "application", "ui", 'bubble' /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" = javascript_include_tag 'jquery142', 'rails', 'google' = javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel' diff --git a/app/views/people/_sidebar.html.haml b/app/views/people/_sidebar.html.haml index 438da560e..cd0f3ab62 100644 --- a/app/views/people/_sidebar.html.haml +++ b/app/views/people/_sidebar.html.haml @@ -1,5 +1,4 @@ %ul#friend_stream.nav - %h3 friends - for friend in @friends = person_image_link(friend) diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index d8a5e783e..93a3fdebf 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -1,24 +1,30 @@ .span-20.last #profile.span-19.last - %h1 + .profile_photo = person_image_link(@person) - = "#{@person.real_name}" - .button.right - = link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete - %h4{:style => "font-size:small"} - %ul{:style => "list-style-type: none"} - %li - %i= "last seen: #{how_long_ago(@person_posts.first)}" - %li - %i= "friends since: #{how_long_ago(@person)}" + %ul + %li + %h1 + = @person.real_name + .button.right + = link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete + + %li + %i= "last seen: #{how_long_ago(@person_posts.first)}" + %li + %i= "friends since: #{how_long_ago(@person)}" + %li + url: + = @person.url - %h1 - #latest_message= "\"#{@latest_status_message.message}\"" - - %p - %b url: - = @person.url + + %h1.pinched + %span + = "\"#{@latest_status_message.message}\"" + + %h5="posted: #{how_long_ago(@latest_status_message)}" + .span-20.last - if @person.posts diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 707746327..a1c86786d 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1,4 +1,4 @@ -@font-face { +q@font-face { font-family: "BrandonGrotesqueLightRegular"; src: url("brandongrotesque_light/Brandon_light-webfont.eot"); src: local("☺"), url("brandongrotesque_light/Brandon_light-webfont.woff") format("woff"), url("brandongrotesque_light/Brandon_light-webfont.ttf") format("truetype"), url("brandongrotesque_light/Brandon_light-webfont.svg#webfont") format("svg"); @@ -201,7 +201,14 @@ ul.comment_set { margin-top: -5px; padding-bottom: 8px; } -#stream img.person_picture, #profile img.person_picture { +.profile_photo { + float: left; + margin-right: 10px; } + +#profile ul { + list-style-type: none; } + +#stream img.person_picture { border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index a13516de9..e711d119c 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -243,7 +243,14 @@ ul.comment_set :padding :bottom 8px -#stream, #profile +.profile_photo + :float left + :margin-right 10px +#profile + ul + :list-style-type none + +#stream img.person_picture :border-radius 3px :-webkit-border-radius 3px