diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml index 19e54da98..b07f69c56 100644 --- a/app/views/comments/_comment.html.haml +++ b/app/views/comments/_comment.html.haml @@ -10,6 +10,8 @@ .content %span.from = person_link(comment.author, :class => "hovercardable") + %span.details + – %span{:class => direction_for(comment.text)} = markdownify(Diaspora::Taggable.format_tags(comment.text), :youtube_maps => comment.youtube_titles) diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml index bc075a6c9..eba6733b7 100644 --- a/app/views/shared/_stream_element.html.haml +++ b/app/views/shared/_stream_element.html.haml @@ -21,7 +21,7 @@ = person_link(post.author, :class => 'hovercardable') %time.time.timeago{:datetime => post.created_at, :integer => time_for_sort(post).to_i} %span.details - \- + – %span.timeago = link_to(how_long_ago(post), object_path(post)) diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml index eb43f7677..defca25ad 100644 --- a/app/views/status_messages/show.html.haml +++ b/app/views/status_messages/show.html.haml @@ -2,9 +2,10 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -.span-16.append-4.prepend-4.last - #main_stream.stream.status_message_show - = render 'shared/stream_element', :post => @status_message, :all_aspects => @status_message.aspects -%br -%br -%br +.span-20.append-2.prepend-2.last + .stream_container + #main_stream.stream.status_message_show + = render 'shared/stream_element', :post => @status_message, :all_aspects => @status_message.aspects + %br + %br + %br diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 4024f1a3c..92c3792a6 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -483,11 +483,12 @@ ul.dropdown :bottom 5px .post_initial_info - .details - :color #aaa :margin :bottom 5px +.details + :color #aaa + .post_scope :cursor default @@ -577,9 +578,10 @@ ul.show_comments, :position relative - textarea - :width 365px - :height 21px + form + textarea + :width 365px + :height 21px input :display none @@ -610,16 +612,13 @@ ul.show_comments, :width 400px .content - :color #666 :margin :top 0px :bottom -2px :padding :left 36px :right 10px - .from - a - :color rgb(85,80,80) + p :margin :bottom 0 @@ -2218,10 +2217,6 @@ ul.show_comments, :weight bold :color #999 - li - :border - :bottom 1px solid #ccc - img :position relative :top 3px