maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #347 from floreno/patch-3

Browse Source 
min-height against height fix for ajax-changing-content
This commit is contained in:
Michael Kaufmann
2016-04-12 07:36:37 +02:00
parent a014b5cc2b d474f2ec8f
commit e8f5fc1a8a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/Sparkle/assets/js/main.js vendored
View File

@@ -70,7 +70,7 @@ $(document).ready(function() {
var snheight = $('#sidenavigation').height(); var snheight = $('#sidenavigation').height();
var mainheight = $('#maincontent').height(); var mainheight = $('#maincontent').height();
if (snheight > mainheight && !$('#newsfeed').length) { if (snheight > mainheight && !$('#newsfeed').length) {
$('#maincontent').height(snheight); $('#maincontent').css("min-height", snheight);
} }
// this is necessary for the special setting feature (ref #1010) // this is necessary for the special setting feature (ref #1010)
$.getQueryVariable = function(key) { $.getQueryVariable = function(key) {
@@ -219,4 +219,4 @@ $(document).ready(function() {
}); });
autosize($('textarea.shell')); autosize($('textarea.shell'));
}); });