diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/scripts/page.js | 2 | ||||
| -rw-r--r-- | lib/tpl/dokuwiki/script.js | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/scripts/page.js b/lib/scripts/page.js index 78943be7a..728887687 100644 --- a/lib/scripts/page.js +++ b/lib/scripts/page.js @@ -130,7 +130,7 @@ dw_page = { if(!state) state = 1; // Assert that content instantly takes the whole space - $content.css('height', $content.height()).show(); + $content.css('min-height', $content.height()).show(); // stop any running animation $child.stop(true, true); diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js index 677e2f53b..d858bda89 100644 --- a/lib/tpl/dokuwiki/script.js +++ b/lib/tpl/dokuwiki/script.js @@ -7,7 +7,7 @@ * - tablet 481 - 979 (ostensibly for tablets in portrait mode) * - phone <= 480 */ -var device_class = 'not yet known'; +var device_class = ''; // not yet known var device_classes = 'desktop mobile tablet phone'; function tpl_dokuwiki_mobile(){ @@ -67,9 +67,9 @@ jQuery(function(){ ); // increase sidebar length to match content (desktop mode only) - var $sb = jQuery('.desktop #dokuwiki__aside'); - if($sb.length) { - var $ct = jQuery('#dokuwiki__content div.page'); - if($sb.height() > $ct.height()) $ct.height($sb.height()); + var $sidebar = jQuery('.desktop #dokuwiki__aside'); + if($sidebar.length) { + var $content = jQuery('#dokuwiki__content div.page'); + $content.css('min-height', $sidebar.height()); } }); |