Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteffen van Bergerem <svbergerem@online.de>2016-09-06 13:33:23 +0300
committerBenjamin Neff <benjamin@coding4coffee.ch>2016-09-12 01:39:28 +0300
commit16af93f8a240228d339c8479cc16d86570c067e4 (patch)
treeee727e172bb58bb41ab06d11cc8ea9168c2444a8 /app/assets
parent521468986f8527b49f082c87ce3bbe06eaadc2df (diff)
Prevent overflow of interaction avatars in the single post view
closes #7070
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/single-post-view.scss4
-rw-r--r--app/assets/templates/single-post-viewer/single-post-interactions_tpl.jst.hbs20
2 files changed, 14 insertions, 10 deletions
diff --git a/app/assets/stylesheets/single-post-view.scss b/app/assets/stylesheets/single-post-view.scss
index e0cb2894e..9aee28749 100644
--- a/app/assets/stylesheets/single-post-view.scss
+++ b/app/assets/stylesheets/single-post-view.scss
@@ -147,4 +147,8 @@
.interaction-avatars {
line-height: 25px;
}
+
+ .interaction-avatars {
+ overflow: hidden;
+ }
}
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 a8acd4b38..0e9fa60a8 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,39 +1,39 @@
{{#if resharesCount}}
<div id="reshares" class="clearfix">
- <span class="count">
+ <div class="count">
<i class="entypo-reshare middle gray"></i>
<span>{{resharesCount}}</span>
- </span>
- <span class="interaction-avatars">
+ </div>
+ <div class="interaction-avatars">
{{#each reshares}}
{{#linkToAuthor author}}
{{{personImage this 'small' 'micro'}}}
{{/linkToAuthor}}
{{/each}}
- </span>
+ </div>
</div>
{{/if}}
{{#if likesCount}}
<div id="likes" class="clearfix">
- <span class="count">
+ <div class="count">
<i class="entypo-heart middle gray"></i>
<span>{{likesCount}}</span>
- </span>
- <span class="interaction-avatars">
+ </div>
+ <div class="interaction-avatars">
{{#each likes}}
{{#linkToAuthor author}}
{{{personImage this 'small' 'micro'}}}
{{/linkToAuthor}}
{{/each}}
- </span>
+ </div>
</div>
{{/if}}
{{#if commentsCount}}
<div id="comments-meta" class="clearfix">
- <span class="count">
+ <div class="count">
<i class="entypo-comment middle gray"></i>
<span>{{commentsCount}}</span>
- </span>
+ </div>
</div>
{{else}}
<div class="no-comments">