nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6712 from svbergerem/spv-avatar-alignment

Browse source 
Improve interaction avatar alignment for SPV
This commit is contained in:
Dennis Schubert 2016-02-25 09:24:28 +01:00
commit de37bbbed0
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/single-post-view.scss
View file

@ -114,6 +114,7 @@
color: $blue; color: $blue;
} }
.count { .count {
float: left;
i { i {
display: inline-block; display: inline-block;
text-align: center; text-align: center;
@ -137,4 +138,9 @@
.comment.new-comment-form-wrapper { .comment.new-comment-form-wrapper {
padding: 10px; padding: 10px;
} }
.count,
.interaction-avatars {
line-height: 25px;
}
} }

12
app/assets/templates/single-post-viewer/single-post-interactions_tpl.jst.hbs
View file

@ -1,10 +1,10 @@
{{#if resharesCount}} {{#if resharesCount}}
<div id='reshares'> <div id="reshares" class="clearfix">
<span class="count"> <span class="count">
<i class="entypo-reshare middle gray"></i> <i class="entypo-reshare middle gray"></i>
<span>{{resharesCount}}</span> <span>{{resharesCount}}</span>
</span> </span>
<span> <span class="interaction-avatars">
{{#each reshares}} {{#each reshares}}
{{#linkToAuthor author}} {{#linkToAuthor author}}
{{{personImage this 'small' 'micro'}}} {{{personImage this 'small' 'micro'}}}
@ -14,12 +14,12 @@
</div> </div>
{{/if}} {{/if}}
{{#if likesCount}} {{#if likesCount}}
<div id='likes'> <div id="likes" class="clearfix">
<span class="count"> <span class="count">
<i class="entypo-heart middle gray"></i> <i class="entypo-heart middle gray"></i>
<span>{{likesCount}}</span> <span>{{likesCount}}</span>
</span> </span>
<span> <span class="interaction-avatars">
{{#each likes}} {{#each likes}}
{{#linkToAuthor author}} {{#linkToAuthor author}}
{{{personImage this 'small' 'micro'}}} {{{personImage this 'small' 'micro'}}}
@ -29,8 +29,8 @@
</div> </div>
{{/if}} {{/if}}
{{#if commentsCount}} {{#if commentsCount}}
<div id='comments-meta'> <div id="comments-meta" class="clearfix">
<span class='count'> <span class="count">
<i class="entypo-comment middle gray"></i> <i class="entypo-comment middle gray"></i>
<span>{{commentsCount}}</span> <span>{{commentsCount}}</span>
</span> </span>