diff --git a/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js b/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js index 3ca98b952..17925c0f0 100644 --- a/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js +++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js @@ -1,5 +1,6 @@ app.views.SinglePostInteractions = app.views.Base.extend({ templateName: "single-post-viewer/single-post-interactions", + tooltipSelector: ".avatar.micro", subviews: { '#comments': 'commentStreamView' diff --git a/app/assets/stylesheets/entypo.css.scss b/app/assets/stylesheets/entypo.css.scss index bd1fc515e..648b7574b 100644 --- a/app/assets/stylesheets/entypo.css.scss +++ b/app/assets/stylesheets/entypo.css.scss @@ -35,4 +35,8 @@ &.large { font-size: 2.5em; } + + &.middle { + font-size: 1.5em; + } } diff --git a/app/assets/stylesheets/single-post-view.css.scss b/app/assets/stylesheets/single-post-view.css.scss index acf509d45..1f714bb0f 100644 --- a/app/assets/stylesheets/single-post-view.css.scss +++ b/app/assets/stylesheets/single-post-view.css.scss @@ -92,10 +92,7 @@ left: -1px; margin-left: 0; padding-left: 2.5%; - #likes, #reshares, #comments-meta { - padding-bottom: 5px; - } - .comment { + .comments .comment { border-bottom: solid 1px #cccccc; padding-top: 10px; padding-bottom: 10px; @@ -117,6 +114,20 @@ text-decoration: none; font-size: smaller; } + .count { + width: 12.8%; + text-align: right; + i { + display: inline-block; + text-align: center; + width: 25px; + vertical-align: middle; + } + } + #reshares .count i { text-align: left; } + .persons { + margin-left: 5px; + } } .comment { diff --git a/app/assets/templates/single-post-viewer/single-post-interactions_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-interactions_tpl.jst.hbs index a9f551507..6d92c58a7 100644 --- a/app/assets/templates/single-post-viewer/single-post-interactions_tpl.jst.hbs +++ b/app/assets/templates/single-post-viewer/single-post-interactions_tpl.jst.hbs @@ -1,31 +1,35 @@ {{#if resharesCount}} -
- - +
+
{{resharesCount}} - - {{#each reshares}} - {{{personImage author 'small' "micro"}}} - {{/each}} + +
+
+ {{#each reshares}} + {{{personImage author 'small' 'micro'}}} + {{/each}} +
{{/if}} {{#if likesCount}} -
-