Merge pull request #347 from floreno/patch-3

min-height against height fix for ajax-changing-content
froxlor · Apr 12, 2016 · e8f5fc1 · e8f5fc1
2 parents a014b5c + d474f2e
commit e8f5fc1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/templates/Sparkle/assets/js/main.js b/templates/Sparkle/assets/js/main.js
@@ -70,7 +70,7 @@ $(document).ready(function() {
 	var snheight = $('#sidenavigation').height();
 	var mainheight = $('#maincontent').height();
 	if (snheight > mainheight && !$('#newsfeed').length) {
-		$('#maincontent').height(snheight);
+		$('#maincontent').css("min-height", snheight);
 	}
 	// this is necessary for the special setting feature (ref #1010)
 	$.getQueryVariable = function(key) {
@@ -219,4 +219,4 @@ $(document).ready(function() {
 	});
 
 	autosize($('textarea.shell'));
-});
+});