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

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Benjamin Neff 2016-09-12 00:39:40 +02:00
commit 838982e92c
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -26,6 +26,7 @@
* Fix tags URLs in hovercards [#7075](https://github.com/diaspora/diaspora/pull/7075) * Fix tags URLs in hovercards [#7075](https://github.com/diaspora/diaspora/pull/7075)
* Fix 500 in html requests for post interactions [#7085](https://github.com/diaspora/diaspora/pull/7085) * Fix 500 in html requests for post interactions [#7085](https://github.com/diaspora/diaspora/pull/7085)
* Remove whitespaces next to like link in stream [#7088](https://github.com/diaspora/diaspora/pull/7088) * Remove whitespaces next to like link in stream [#7088](https://github.com/diaspora/diaspora/pull/7088)
* Prevent overflow of interaction avatars in the single post view [#7070](https://github.com/diaspora/diaspora/pull/7070)
## Features ## Features
* Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045) * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)

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

@ -147,4 +147,8 @@
.interaction-avatars { .interaction-avatars {
line-height: 25px; line-height: 25px;
} }
.interaction-avatars {
overflow: hidden;
}
} }

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

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