diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-05-31 09:56:35 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-05-31 09:56:35 +0200 |
| commit | 47d55694a4c84b6c12c0db61a69bcac8b671b20e (patch) | |
| tree | b15e96f4ea67e2214a66a9d28dafaf53d25b98ec /view/tpl/cover_photo_widget.tpl | |
| parent | 087f9784e3c5a860ed2b86e7f9e8e9f312038546 (diff) | |
| parent | f0e615dee529e031663576286345141ad2996974 (diff) | |
| download | volse-hubzilla-2.4.tar.gz volse-hubzilla-2.4.tar.bz2 volse-hubzilla-2.4.zip | |
Merge branch '2.4RC'2.4
Diffstat (limited to 'view/tpl/cover_photo_widget.tpl')
| -rwxr-xr-x | view/tpl/cover_photo_widget.tpl | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl index bc1f421bd..a9c384d2f 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; } @@ -82,11 +70,7 @@ <div id="cover-photo" title="{{$hovertitle}}"> {{$photo_html}} <div id="cover-photo-caption"> - <div class="cover-photo-title"> - {{$title}} - </div> - <div class="cover-photo-subtitle"> - {{$subtitle}} - </div> + <h1>{{$title}}</h1> + <h3>{{$subtitle}}</h3> </div> </div> |