harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-06-15 18:58:26 -07:00
commit 0e4a28678d
6 changed files with 6435 additions and 6220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/css/conversation.css
View File

@ -62,10 +62,6 @@
/* conv_item */ /* conv_item */
.hide-comments-outer {
padding: 10px 10px 10px 7px;
}
.wall-item-info { .wall-item-info {
display: block; display: block;
float: left; float: left;

10182
view/it/messages.po
View File

File diff suppressed because it is too large Load Diff

2446
view/it/strings.php
View File

File diff suppressed because it is too large Load Diff

2
view/js/main.js
View File

@ -136,10 +136,12 @@
if( $('#collapsed-comments-' + id).is(':visible')) { if( $('#collapsed-comments-' + id).is(':visible')) {
$('#collapsed-comments-' + id).hide(); $('#collapsed-comments-' + id).hide();
$('#hide-comments-' + id).html(aStr['showmore']); $('#hide-comments-' + id).html(aStr['showmore']);
$('#hide-comments-total-' + id).show();
} }
else { else {
$('#collapsed-comments-' + id).show(); $('#collapsed-comments-' + id).show();
$('#hide-comments-' + id).html(aStr['showfewer']); $('#hide-comments-' + id).html(aStr['showfewer']);
$('#hide-comments-total-' + id).hide();
} }
} }

17
view/theme/redbasic/css/style.css
View File

@ -1919,7 +1919,6 @@ img.mail-list-sender-photo {
padding-left: $comment_padding; padding-left: $comment_padding;
} }
.hide-comments-outer,
.wall-item-content-wrapper.comment { .wall-item-content-wrapper.comment {
background-color: $comment_item_colour; background-color: $comment_item_colour;
border-left: $comment_border_left $comment_border_colour; border-left: $comment_border_left $comment_border_colour;
@ -1929,6 +1928,20 @@ img.mail-list-sender-photo {
padding: 7px 10px 7px 7px; 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 { .wall-item-comment-wrapper {
padding: 7px 10px; padding: 7px 10px;
background-color: $item_colour; background-color: $item_colour;
@ -2022,7 +2035,7 @@ img.mail-list-sender-photo {
} }
.divgrow-showmore:hover { .divgrow-showmore:hover {
background-color: $editbuttons_bghover; border-top: 1px dashed #adadad;
} }

4
view/tpl/conv_item.tpl
View File

@ -1,6 +1,6 @@
{{if $item.comment_firstcollapsed}} {{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer"> <div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
<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> <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>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{/if}} {{/if}}