diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-08 13:58:25 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-08 13:58:25 -0800 |
| commit | c8788204a9d1cc9c949927264d673d0dd9344b67 (patch) | |
| tree | 99219961e83ade132d7eddafe8f59e1f1554511d /view | |
| parent | be99c7fe12cc68bba1716a0b708bb171cfd223e6 (diff) | |
| parent | 48963f62f974ce4f2d8e26c344b65e87f704e4d6 (diff) | |
| download | volse-hubzilla-c8788204a9d1cc9c949927264d673d0dd9344b67.tar.gz volse-hubzilla-c8788204a9d1cc9c949927264d673d0dd9344b67.tar.bz2 volse-hubzilla-c8788204a9d1cc9c949927264d673d0dd9344b67.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/view/js/main.js b/view/js/main.js index 2b13acc3d..d1bf34699 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -641,7 +641,7 @@ function collapseHeight() { if(orgHeight > divmore_height) { if(! $(this).hasClass('divmore')) { - var trigger = $(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top ? true : false; + var trigger = $(window).scrollTop() < $(this).offset().top ? true : false; if(trigger) { $(this).readmore({ @@ -653,7 +653,7 @@ function collapseHeight() { beforeToggle: function(trigger, element, expanded) { if(expanded) { if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) { - $('html, body').animate( { scrollTop: $(window).scrollTop() - (orgHeight - divmore_height) }, {duration: 0 } ); + $(window).scrollTop($(window).scrollTop() - (orgHeight - divmore_height)); } } } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 443ebb1fb..0ca47b1fb 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -40,7 +40,6 @@ if(! $a->install) { $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); $top_photo=get_pconfig($uid,'redbasic','top_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); - } // Now load the scheme. If a value is changed above, we'll keep the settings |