aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-08-24 22:39:30 +0200
committerMario Vavti <mario@mariovavti.com>2016-08-24 22:39:30 +0200
commitaa0384bcece9ebf0a014c5387a91bb3f0d564301 (patch)
treebbd687e56ad66b822ef6c65341dff9a8d3023143 /view
parentdd654b976691d5091070631c5e64979cd2772a6f (diff)
downloadvolse-hubzilla-aa0384bcece9ebf0a014c5387a91bb3f0d564301.tar.gz
volse-hubzilla-aa0384bcece9ebf0a014c5387a91bb3f0d564301.tar.bz2
volse-hubzilla-aa0384bcece9ebf0a014c5387a91bb3f0d564301.zip
Revert "revert cover photo changes"
This reverts commit 4c840d70a494dae62a856ed91f9039eb16bc51ee.
Diffstat (limited to 'view')
-rwxr-xr-xview/tpl/cover_photo_widget.tpl28
1 files changed, 20 insertions, 8 deletions
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 4e210a300..91f304ccb 100755
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -1,9 +1,12 @@
<script>
var aside_padding_top;
var section_padding_top;
+ var coverSlid = false;
$(document).ready(function() {
+ $('body').on('click',slideUpCover);
+
aside_padding_top = parseInt($('aside').css('padding-top'));
section_padding_top = parseInt($('section').css('padding-top'));
@@ -12,7 +15,7 @@
$('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');
- $('main').css('opacity', 0);
+ $('main').css('opacity', 0.5);
$('header').hide();
}
else {
@@ -21,15 +24,16 @@
});
$(window).scroll(function () {
- if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
+ if((! coverSlid) && $('#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');
+ $('#cover-photo').css('padding-top', $('nav').outerHeight());
$(window).scrollTop($(window).scrollTop() - $('#cover-photo').height())
- $('.navbar-fixed-top').css('position', 'fixed');
+ $('.navbar-fixed-top').css({ 'position' : 'fixed', 'top' : 0});
$('main').css('margin-top', '');
- $('#cover-photo').remove();
+ coverSlid = true;
}
if($('#cover-photo').length) {
$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
@@ -39,20 +43,28 @@
$(window).resize(function () {
if($('#cover-photo').length && $(window).width() < 755) {
$('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', 'fixed');
+ $('aside').css('padding-top', aside_padding_top + $('nav').outerHeight() + 20 + 'px');
+ $('section').css('padding-top', section_padding_top + $('nav').outerHeight() + 20 + 'px');
+ $('.navbar-fixed-top').css({ 'position' : 'fixed', 'top' : 0 });
$('#cover-photo').remove();
}
});
function slideUpCover() {
+ if(coverSlid)
+ return;
$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
+ $('#cover-photo').css({ 'position' : 'relative' , 'top' : $('nav').outerHeight() });
+ $('.navbar-fixed-top').css({ 'position' : 'fixed', 'top' : 0});
+ $('aside').css('padding-top', aside_padding_top + 'px');
+ $('section').css('padding-top', section_padding_top + 'px');
+ $('main').css('margin-top', '');
+ coverSlid = true;
}
</script>
-<div id="cover-photo" onclick="slideUpCover();" title="{{$hovertitle}}">
+<div id="cover-photo" title="{{$hovertitle}}">
{{$photo_html}}
<div id="cover-photo-caption">
<div class="cover-photo-title">