From 3dcff72fc01f39c9aa98665875911aa9aa92ebd8 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 18 Feb 2014 18:17:16 +0000 Subject: [PATCH] Use iframe height from jdots to fix iframe height in pixelegg --- pixelegg/css/pixelegg.css | 3 +++ pixelegg/js/slider.js | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 68bdb1eef2..f048736f19 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -39,6 +39,9 @@ */ /*@import (less) "../../etemplate/templates/default/etemplate2.css";*/ @media all { + html { + height: 99% !important; + } /** * Top level */ diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index ea33736406..8c284844d1 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -140,9 +140,6 @@ egw_LAB.wait(function() { - $header.outerHeight() - $j(this.tabsUi.contHeaderDiv).outerHeight() - (content.outerHeight(true) - content.height()) // Not sure where this comes from... + 5; - // can only avoid scrollbar for iframe, if I add here 120px - if (iframe) height += 120; - //console.log("getIFrameHeight("+iframe+") returning "+height+(iframe?' (iframe)':'')); return height; };