diff options
author | Mario Vavti <mario@mariovavti.com> | 2016-04-21 23:03:09 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2016-04-21 23:03:09 +0200 |
commit | d7f4bfedd5164596504d17b1ef4b8597a1304d98 (patch) | |
tree | ac790232f1816b74d510c5da2483b8f196386e25 /view/tpl/nav_header.tpl | |
parent | 391ed8655ebf25c2feb6cef59970778b99351df8 (diff) | |
download | volse-hubzilla-d7f4bfedd5164596504d17b1ef4b8597a1304d98.tar.gz volse-hubzilla-d7f4bfedd5164596504d17b1ef4b8597a1304d98.tar.bz2 volse-hubzilla-d7f4bfedd5164596504d17b1ef4b8597a1304d98.zip |
some fixes for contextual help and disable transition animation for now - it looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.
Diffstat (limited to 'view/tpl/nav_header.tpl')
-rw-r--r-- | view/tpl/nav_header.tpl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/view/tpl/nav_header.tpl b/view/tpl/nav_header.tpl index 5fce26317..be990765c 100644 --- a/view/tpl/nav_header.tpl +++ b/view/tpl/nav_header.tpl @@ -18,18 +18,18 @@ )) { container.removeClass('help-content-open'); $('main').removeClass('help-content-open'); - $('main').css('top', 'auto') + $('main').css('top', '') } else if (($('#help_nav_btn').is(e.target) || $('#help_nav_btn').has(e.target).length !== 0) && !container.hasClass('help-content-open')) { $('#help-content').addClass('help-content-open'); $('main').removeClass('help-content-open'); var mainTop = $('#navbar-collapse-1').height(); - if ($('#navbar-collapse-1').height() < $('#help-content').height()) { - mainTop = $('#help-content').height(); + if ($('#navbar-collapse-1').outerHeight(true) < $('#help-content').height()) { + mainTop = $('#help-content').outerHeight(true); } - $('main').css('top', +mainTop + +50 + 'px'); + $('main').css('top', mainTop + 'px'); } }); @@ -46,4 +46,4 @@ $(target).fadeTo('slow', 0.1).fadeTo('slow', 1.0); } } -</script>
\ No newline at end of file +</script> |