aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-06-15 16:00:27 +0200
committermarijus <mario@mariovavti.com>2014-06-15 16:00:27 +0200
commit0b4e1715dec56a9129b1310482ac91a0e86ecc91 (patch)
treea1ea900fcef4bb74ef3cb03703f159366f5ccaf2 /view
parent2d6a1795b7ae1fc5652798347d958d7ae71cb763 (diff)
downloadvolse-hubzilla-0b4e1715dec56a9129b1310482ac91a0e86ecc91.tar.gz
volse-hubzilla-0b4e1715dec56a9129b1310482ac91a0e86ecc91.tar.bz2
volse-hubzilla-0b4e1715dec56a9129b1310482ac91a0e86ecc91.zip
move hide-comments to center and change its appearence a little
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css4
-rw-r--r--view/js/main.js2
-rw-r--r--view/theme/redbasic/css/style.css17
-rwxr-xr-xview/tpl/conv_item.tpl4
4 files changed, 19 insertions, 8 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index b32a08486..4653ede89 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -62,10 +62,6 @@
/* conv_item */
-.hide-comments-outer {
- padding: 10px 10px 10px 7px;
-}
-
.wall-item-info {
display: block;
float: left;
diff --git a/view/js/main.js b/view/js/main.js
index 19af9c2ff..267833ed8 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -136,10 +136,12 @@
if( $('#collapsed-comments-' + id).is(':visible')) {
$('#collapsed-comments-' + id).hide();
$('#hide-comments-' + id).html(aStr['showmore']);
+ $('#hide-comments-total-' + id).show();
}
else {
$('#collapsed-comments-' + id).show();
$('#hide-comments-' + id).html(aStr['showfewer']);
+ $('#hide-comments-total-' + id).hide();
}
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 41f48141d..80f6e9791 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1919,7 +1919,6 @@ img.mail-list-sender-photo {
padding-left: $comment_padding;
}
-.hide-comments-outer,
.wall-item-content-wrapper.comment {
background-color: $comment_item_colour;
border-left: $comment_border_left $comment_border_colour;
@@ -1929,6 +1928,20 @@ img.mail-list-sender-photo {
padding: 7px 10px 7px 7px;
}
+.hide-comments-outer {
+ background-color: $comment_item_colour;
+ border-left: $comment_border_left $comment_border_colour;
+ border-right: $comment_border_right $comment_border_colour;
+ border-bottom: $comment_border_bottom $comment_border_colour;
+ border-top: 1px dashed #ccc;
+ text-align: center;
+ border-radius: 0px;
+}
+
+.hide-comments-outer:hover {
+ border-top: 1px dashed #adadad;
+}
+
.wall-item-comment-wrapper {
padding: 7px 10px;
background-color: $item_colour;
@@ -2022,7 +2035,7 @@ img.mail-list-sender-photo {
}
.divgrow-showmore:hover {
- background-color: $editbuttons_bghover;
+ border-top: 1px dashed #adadad;
}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 828b47a05..d7ed7d0f4 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -1,6 +1,6 @@
{{if $item.comment_firstcollapsed}}
-<div class="hide-comments-outer">
- <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+ <span id="hide-comments-{{$item.id}}" class="hide-comments">{{$item.hide_text}}</span>&nbsp;<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
</div>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{/if}}