diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml index 244bb27505e5422da96d2dc3d0bf71a16ecbdee0..82e70877870c726c8bf813baeee6d10edeb21641 100644 --- a/app/views/shared/_stream_element.html.haml +++ b/app/views/shared/_stream_element.html.haml @@ -16,7 +16,7 @@ = person_image_link(post.author, :size => :thumb_small) .content - %div + %div.post_initial_info %span.from = person_link(post.author, :class => 'author') %time.time.timeago{:datetime => post.created_at, :integer => time_for_sort(post).to_i} diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js index 3543d980a3c222f5c38310b62c534b164257ed93..d4b6718e8610b3dbc35256e5fe0bb08a50ea7fbd 100644 --- a/public/javascripts/stream.js +++ b/public/javascripts/stream.js @@ -18,13 +18,21 @@ var Stream = { Stream.setUpAudioLinks(); //Stream.setUpImageLinks(); - // collapse long comments + // collapse long posts $(".content p", this.selector).expander({ slicePoint: 400, widow: 12, expandText: Diaspora.widgets.i18n.t("show_more"), userCollapse: false }); + + // collapse long comments + $(".comment .content span", this.selector).expander({ + slicePoint: 200, + widow: 12, + expandText: Diaspora.widgets.i18n.t("show_more"), + userCollapse: false + }); }, initializeLives: function(){ @@ -41,7 +49,6 @@ var Stream = { }); this.setUpComments(); - }, setUpComments: function(){ diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 0e5be741fd8baf53181b11f3d47c69fe01ad2e4f..aec2a7f6949b0e8fce9023146111a2f2dbb8c20b 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -477,8 +477,9 @@ ul.dropdown :bottom 5px -.details - :color #aaa +.post_initial_info + .details + :color #aaa .time, .timeago,