fa2bi fixes

6 files changed, 9 insertions, 18 deletions

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index bca5aa047..ae3422526 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -573,7 +573,7 @@ class ThreadItem {
 			if(($nb_children > $visible_comments) || ($thread_level > 1)) {
 				$result['children'][0]['comment_firstcollapsed'] = true;
 				$result['children'][0]['num_comments'] = $comment_count_txt['label'];
-				$result['children'][0]['hide_text'] = sprintf( t('%s show all'), '<i class="bi bi-chevron-down"></i>');
+				$result['children'][0]['hide_text'] = sprintf( t('%s show all'), '<i class="bi bi-chevron-down align-middle"></i>');
 				if($thread_level > 1) {
 					$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
 				}
diff --git a/include/js_strings.php b/include/js_strings.php
index 6226b51c6..cbc94bb08 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -5,10 +5,10 @@ function js_strings() {
 		'$delitem'     => t('Delete this item?'),
 		'$itemdel'     => t('Item deleted'),
 		'$comment'     => t('Comment'),
-		'$showmore'    => sprintf( t('%s show all'), '<i class=\'bi bi-chevron-down\'></i>'),
-		'$showfewer'   => sprintf( t('%s show less'), '<i class=\'bi bi-chevron-up\'></i>'),
-		'$divgrowmore' => sprintf( t('%s expand'), '<i class=\'bi bi-chevron-down\'></i>'),
-		'$divgrowless' => sprintf( t('%s collapse'),'<i class=\'bi bi-chevron-up\'></i>'),
+		'$showmore'    => sprintf( t('%s show all'), '<i class=\'bi bi-chevron-down align-middle\'></i>'),
+		'$showfewer'   => sprintf( t('%s show less'), '<i class=\'bi bi-chevron-up align-middle\'></i>'),
+		'$divgrowmore' => sprintf( t('%s expand'), '<i class=\'bi bi-chevron-down align-middle\'></i>'),
+		'$divgrowless' => sprintf( t('%s collapse'),'<i class=\'bi bi-chevron-up align-middle\'></i>'),
 		'$pwshort'     => t("Password too short"),
 		'$pwnomatch'   => t("Passwords do not match"),
 		'$everybody'   => t('everybody'),
diff --git a/view/js/main.js b/view/js/main.js
index ee07e2733..ab87b4bda 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -868,8 +868,8 @@ function collapseHeight() {
 					startOpen: open,
 					heightMargin: 50,
 					collapsedHeight: divmore_height,
-					moreLink: '<a href="#" class="divgrow-showmore fakelink">' + aStr.divgrowmore + '</a>',
-					lessLink: '<a href="#" class="divgrow-showmore fakelink">' + aStr.divgrowless + '</a>',
+					moreLink: '<a href="#" class="divgrow-showmore fakelink small">' + aStr.divgrowmore + '</a>',
+					lessLink: '<a href="#" class="divgrow-showmore fakelink small">' + aStr.divgrowless + '</a>',
 					beforeToggle: function(trigger, element, expanded) {
 						if(expanded) {
 							if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) {
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index ccbd89ffa..b0077e09b 100644
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -1,5 +1,5 @@
 {{if $item.comment_firstcollapsed}}
-<div id="hide-comments-outer-{{$item.parent}}" class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+<div id="hide-comments-outer-{{$item.parent}}" class="hide-comments-outer fakelink small" 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;">
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 8bcc71ecd..3188433d3 100644
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -1,9 +1,3 @@
-{{if $item.comment_firstcollapsed}}
-<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}}
 	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}}" data-b64mids='{{$item.mids}}'>
 		<a name="item_{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
@@ -255,6 +249,3 @@
 			</div>
 		</div>
 	</div>
-{{if $item.comment_lastcollapsed}}
-</div>
-{{/if}}
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 18007600c..79d66d3aa 100644
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -14,7 +14,7 @@
 			<a class="btn btn-success btn-sm" href="{{$entry.connect}}"><i class="bi bi-plus-lg connect-icon"></i> {{$entry.conn_label}}</a>
 			{{/if}}
 		</div>
-		<h3>{{if $entry.public_forum}}<i class="bi fa-comments-o" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="bi fa-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
+		<h3>{{if $entry.public_forum}}<i class="bi bi-chat-quote" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="bi fa-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
 	</div>
 	<div class="section-content-tools-wrapper directory-collapse">
 		<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" >