Merge https://github.com/redmatrix/hubzilla into pending_merge

2015-10-13 16:19:33 -07:00 · 2015-10-13 16:19:33 -07:00 · 64cdbb8e3b
commit 64cdbb8e3b
parent edeba4ca34 61e3ef2552
1 changed files with 1 additions and 0 deletions
--- a/view/js/main.js
+++ b/view/js/main.js
@ -621,6 +621,7 @@ function collapseHeight() {
 			if(! $(this).hasClass('divmore')) {
 				$(this).readmore({
 					speed: 0,
+					heightMargin: 50,
 					collapsedHeight: divmore_height, 
 					moreLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowmore + '</a>',
 					lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>',