aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-05-27 19:51:01 -0700
committerfriendica <info@friendica.com>2013-05-27 19:51:01 -0700
commitcfac8d986c50715ee48f0d23592ffae3307b6a81 (patch)
tree3d45e9646be88f379db745679cc82f99055810bc
parentad0c5e3c68202ace86be221756a4be57c23e5630 (diff)
parentb7270cad2b57a5aa6ff0a4d20ae26a9bbc705893 (diff)
downloadvolse-hubzilla-cfac8d986c50715ee48f0d23592ffae3307b6a81.tar.gz
volse-hubzilla-cfac8d986c50715ee48f0d23592ffae3307b6a81.tar.bz2
volse-hubzilla-cfac8d986c50715ee48f0d23592ffae3307b6a81.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--view/theme/redbasic/css/style.css4
-rwxr-xr-xview/tpl/conv_item.tpl6
2 files changed, 8 insertions, 2 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c2caedd08..60f4e3fe2 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1128,6 +1128,10 @@ footer {
margin-top: 10px;
}
+.wall-item-body.divmore {
+ padding-bottom: 15px;
+}
+
.wall-item-tools {
clear: both;
padding: 5px 10px;
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 91a4bd35d..e4178eb39 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -97,11 +97,13 @@
</div>
{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
<div class="wall-item-delete-end"></div>
+ <div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div>
+ <div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div>
+
</div>
</div>
+
<div class="wall-item-wrapper-end"></div>
- <div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div>
- <div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div>
<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
</div>