diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 92e06a83f..715afaffe 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -26,7 +26,7 @@ .right ▼ .avatar - = owner_image_tag + = owner_image_tag(:thumb_small) = link_to current_user.name, '#' %li= link_to t('.view_profile'), current_user.person %li= link_to t('.edit_profile'), edit_person_path(current_user.person) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9d2e7b80e..50739b104 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -89,7 +89,7 @@ %footer .container - = image_tag 'powered_by_diaspora.png' + = image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px" %ul#footer_nav %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora" %li= link_to 'github', "https://github.com/diaspora/diaspora" diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 7615a63ac..45e4e6195 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -11,8 +11,6 @@ .right{:style => "top:0;"} %span.description = @person.diaspora_handle - /= info_text(t('aspects.index.handle_explanation')) - #person_nav_links = link_to t('layouts.header.view_profile'), person_path(@person) @@ -22,8 +20,13 @@ = render :partial => 'people/profile_sidebar', :locals => {:person => @person, :is_contact => @is_contact} .span-15.last - - if @contact || current_user.person == @person + %h4 + -if @post_type == :photos + Photos + - else + Recent Posts + - if @contact || current_user.person == @person - if @posts.count > 0 -if @post_type == :photos = render 'photos/index', :photos => @posts diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 9df98828b..441cf6a98 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -40,7 +40,7 @@ #original_post_info %h4{:style=>"position:relative;"} = t('.original_post') - = link_to t('.view'), @photo.status_message + = link_to "#{t('.view')} →", @photo.status_message %p = @photo.status_message.message diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml index b315b35e2..9c854f145 100644 --- a/app/views/status_messages/show.html.haml +++ b/app/views/status_messages/show.html.haml @@ -13,10 +13,13 @@ - for photo in @status_message.photos = link_to (image_tag photo.url(:thumb_small)), photo_path(photo) - .time + %p.time = how_long_ago(@status_message) - %p - =link_to "public permalink", post_path(@status_message) + + %hr + + = link_to "permalink", post_path(@status_message) + %br - if current_user.owns? @status_message = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 77d60c352..76f3db48e 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -7,7 +7,6 @@ body :padding 2em :margin 0 :background-color rgb(252,252,252) - :font-family Arial, sans-serif a :color #107FC9 :text @@ -23,6 +22,8 @@ p h1, h2, h3, h4 :color #444 :position relative + :font + :weight bold h4 :margin @@ -244,11 +245,6 @@ header :height 370px :width 500px - .avatar - :-webkit-border-radius 5px - :-moz-border-radius 5px - :border-radius 5px - img :-webkit-box-shadow 0 1px 2px #666 :-moz-box-shadow 0 1px 2px #666 @@ -258,8 +254,6 @@ header :border-radius 5px .from - :font - :family 'Helvetica neue', Arial, Helvetica, sans-serif :text :shadow 0 1px #fff @@ -300,7 +294,8 @@ header :bottom 12px img - :border-radius none + :position relative + :top 5px :display inline-block .from @@ -313,7 +308,6 @@ header :padding 0 h2 - :display inline :margin :bottom -2px @@ -328,10 +322,6 @@ header :margin :right 2em - .avatar - :-webkit-border-radius 5px - :-moz-border-radius 5px - :border-radius 5px li.message :position relative @@ -360,7 +350,7 @@ li.message p :margin - :bottom 0 + :bottom 6px .photo_attachments :margin @@ -532,7 +522,6 @@ li.message :border none .stream ul.comments - .avatar :width 35px :height 35px @@ -607,6 +596,7 @@ ul.comments img :height 300px :width 300px + :-webkit-box-shadow 0 2px 2px #333 #profile h3 @@ -817,15 +807,6 @@ label :border :bottom 2px #777 solid - .avatar - :position absolute - :margin - :right 15px - - :-webkit-border-radius 5px - :-moz-border-radius 5px - :border-radius 5px - &.closed &:hover :background @@ -936,8 +917,6 @@ label :margin :top 4px :color #000 - :font - :family 'Arial', 'Helvetica', sans-serif ul :margin 0 @@ -998,20 +977,22 @@ label input :display inline - :border none - :background-color #eee + :background-color #888 + :border + :top 1px solid #111 + :font :size 12px + :-webkit-box-shadow 0 1px 1px #666 :border 1px solid #000 - :opacity 0.5 - &:hover - :opacity 0.8 + :background-color #ccc &.active - :opacity 1 + :background-color #eee + input[type='search'] :width 200px