extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-03-01 08:41:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use iframe height from jdots to fix iframe height in pixelegg

Browse Source
This commit is contained in:
Nathan Gray 2014-02-18 18:17:16 +00:00
parent af2ed240ff
commit 3dcff72fc0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pixelegg/css/pixelegg.css
View File

@ -39,6 +39,9 @@
*/ */
/*@import (less) "../../etemplate/templates/default/etemplate2.css";*/ /*@import (less) "../../etemplate/templates/default/etemplate2.css";*/
@media all { @media all {
html {
height: 99% !important;
}
/** /**
* Top level * Top level
*/ */

3
pixelegg/js/slider.js
View File

@ -140,9 +140,6 @@ egw_LAB.wait(function() {
- $header.outerHeight() - $j(this.tabsUi.contHeaderDiv).outerHeight() - (content.outerHeight(true) - content.height()) - $header.outerHeight() - $j(this.tabsUi.contHeaderDiv).outerHeight() - (content.outerHeight(true) - content.height())
// Not sure where this comes from... // Not sure where this comes from...
+ 5; + 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; return height;
}; };