harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/hubzilla into pending_merge

Browse Source
This commit is contained in:
redmatrix 2016-02-08 13:58:25 -08:00
commit c8788204a9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/js/main.js
View File

@ -641,7 +641,7 @@ function collapseHeight() {
if(orgHeight > divmore_height) { if(orgHeight > divmore_height) {
if(! $(this).hasClass('divmore')) { 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) { if(trigger) {
$(this).readmore({ $(this).readmore({
@ -653,7 +653,7 @@ function collapseHeight() {
beforeToggle: function(trigger, element, expanded) { beforeToggle: function(trigger, element, expanded) {
if(expanded) { if(expanded) {
if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) { 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));
} }
} }
} }

1
view/theme/redbasic/php/style.php
View File

@ -40,7 +40,6 @@ if(! $a->install) {
$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
$top_photo=get_pconfig($uid,'redbasic','top_photo'); $top_photo=get_pconfig($uid,'redbasic','top_photo');
$reply_photo=get_pconfig($uid,'redbasic','reply_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo');
} }
// Now load the scheme. If a value is changed above, we'll keep the settings // Now load the scheme. If a value is changed above, we'll keep the settings