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

Conflicts: util/messages.po
2015-09-18 22:46:21 -07:00
parent 43251ed8ce 7c8706757d
commit 74827133b2
8 changed files with 21 additions and 14 deletions
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -615,7 +615,7 @@ function updateConvItems(mode,data) {


 function collapseHeight() {
-	$(".wall-item-body, .directory-collapse").each(function() {
+	$(".wall-item-content, .directory-collapse").each(function() {
 		var orgHeight = $(this).height();
 		if(orgHeight > divmore_height + 10) {
 			if(! $(this).hasClass('divmore')) {