diff --git a/app/views/shared/_author_info.html.haml b/app/views/shared/_author_info.html.haml index ec7e11457341bef054cf72ce9453b41699f6e7f1..7205012c56aef6588d2cd861e1173dcb1b67d219 100644 --- a/app/views/shared/_author_info.html.haml +++ b/app/views/shared/_author_info.html.haml @@ -1,4 +1,4 @@ -#author_info +#author_info.show = person_image_link(person) .from %h4 diff --git a/app/views/shared/_stream_element.haml b/app/views/shared/_stream_element.haml index f0cc6127838a2f9918919f0720e46adf51b97c9d..05f394bd991a83ac72fca5fa5c6492bc8bf1998f 100644 --- a/app/views/shared/_stream_element.haml +++ b/app/views/shared/_stream_element.haml @@ -31,7 +31,7 @@ = render 'status_messages/status_message', :post => post, :photos => photos .info - %span.time= link_to(how_long_ago(post), status_message_path(post)) + %span.timeago= link_to(how_long_ago(post), status_message_path(post)) = link_to t('comments.new_comment.comment').downcase, '#', :class => 'focus_comment_textarea' = render "comments/comments", :post_id => post.id, :comment_hashes => comments, :condensed => true, :commenting_disabled => defined?(@commenting_disabled) diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index b2170036f52330cc730b00e96197e73cd6774317..e410b2820532bf11bcc54925ab16c207749976f1 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -292,9 +292,18 @@ header .from :padding 0 - h3 + h3, + h4 :display inline-block + &.show + a + :margin + :right 1em + h4 + :margin 0 + :padding 0 + .stream_element :position relative :word-wrap break-word @@ -374,14 +383,19 @@ header :color #22AAE0 &:active :color #005D9C -.time +.time, +.timeago a :color #bbb :font :weight bold :margin :right 5px - :font-size small + :font + :size smaller + :text + :decoration none + :border none .right .reshare_pane .reshare_button a.inactive :color #ccc