diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-25 14:40:31 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-25 14:40:31 -0700 |
| commit | e5e0a6b31f7870a46766c1e8ff87886fdb14b6de (patch) | |
| tree | 7035d84f2edbc6b6efa435527ffdc3cd38b8027a /view/tpl/cover_photo_widget.tpl | |
| parent | 5c63f7dd58c5b3b88efcc47120c791f92527f720 (diff) | |
| parent | 2115eb26a7fd2ca937286bd4e98ab74c7d6e9525 (diff) | |
| download | volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.tar.gz volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.tar.bz2 volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl/cover_photo_widget.tpl')
| -rwxr-xr-x | view/tpl/cover_photo_widget.tpl | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index bc1f421bd..806866212 100755 --- a/view/tpl/cover_photo_widget.tpl +++ b/view/tpl/cover_photo_widget.tpl @@ -12,12 +12,9 @@ if($('#cover-photo').length && $(window).width() > 755) { if($(window).scrollTop() < $('#cover-photo').height()) { + $('.navbar').removeClass('fixed-top'); $('main').css('margin-top', - $('nav').outerHeight(true) + 'px'); - $('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px'); - $('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px'); - $('.navbar-fixed-top').css('position', 'relative'); $('main').css('opacity', 0); - $('header').hide(); } } else { @@ -28,12 +25,9 @@ $(window).scroll(function () { if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) { - $('header').fadeIn(); - $('main').css('opacity', 1); - $('aside').css('padding-top', aside_padding_top + 'px'); - $('section').css('padding-top', section_padding_top + 'px'); - $('.navbar-fixed-top').css('position', ''); + $('.navbar').addClass('fixed-top'); $('main').css('margin-top', ''); + $('main').css('opacity', 1); coverSlid = true; } else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){ @@ -43,13 +37,9 @@ } else { if($(window).scrollTop() < $('#cover-photo').height()) { + $('.navbar').removeClass('fixed-top'); $('main').css('margin-top', - $('nav').outerHeight(true) + 'px'); - $('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px'); - $('section').css('padding-top', section_padding_top - $('nav').outerHeight() + 'px'); - - $('.navbar-fixed-top').css('position', 'relative'); $('main').css('opacity', 0); - $('header').hide(); } } } @@ -61,10 +51,8 @@ $(window).resize(function () { if($('#cover-photo').length && $(window).width() < 755) { $('#cover-photo').remove(); + $('.navbar').addClass('fixed-top'); $('main').css('opacity', 1); - $('aside').css('padding-top', aside_padding_top + 'px'); - $('section').css('padding-top', section_padding_top + 'px'); - $('.navbar-fixed-top').css('position', ''); coverSlid = true; } |