From 9e7b3107b5737624eb60606e8436cbda67de04a5 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Tue, 26 Aug 2014 13:49:04 +0000 Subject: [PATCH] Backport commit r48262, committed by Nathan Gray. Fix sub-templates missing proper height in idots framework --- addressbook/templates/default/app.css | 2 +- phpgwapi/templates/idots/js/idots.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css index 1b27697820..7601a3c081 100644 --- a/addressbook/templates/default/app.css +++ b/addressbook/templates/default/app.css @@ -14,7 +14,7 @@ td.addressbook_sidebox_header { vertical-align: bottom; } div#addressbook-view.et2_container { - height: 0; + height: 0 !important; } td.addressbook_sidebox_toolbar { vertical-align: bottom; diff --git a/phpgwapi/templates/idots/js/idots.js b/phpgwapi/templates/idots/js/idots.js index bbfe7a895d..2418354878 100644 --- a/phpgwapi/templates/idots/js/idots.js +++ b/phpgwapi/templates/idots/js/idots.js @@ -76,7 +76,7 @@ egw_LAB.wait(function() { $j('#divStatusBar').height()-$j('#divAppboxHeader').height()-$j('#divPoweredBy').height()-20; //console.log('setting height of '+appbox_height); $j('#divAppbox').css('min-height', appbox_height+'px'); - $j('.et2_container').last().height(appbox_height-7); + $j('.et2_container').height(appbox_height-7); }); $j(window).resize(); $j(window).load(function(){ // fixes sometimes not called resize, probably due to timing issues