diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-02-02 12:40:40 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-02-02 12:40:40 +0100 |
| commit | f1245206ceadd60fec4bd00948c115f74ad6dbd7 (patch) | |
| tree | 3283f7764ab05e7f2cf00abaf712364a200832a6 | |
| parent | 7f453949a17f4d3cd755ab5fc96be21396c9cc91 (diff) | |
| download | volse-hubzilla-f1245206ceadd60fec4bd00948c115f74ad6dbd7.tar.gz volse-hubzilla-f1245206ceadd60fec4bd00948c115f74ad6dbd7.tar.bz2 volse-hubzilla-f1245206ceadd60fec4bd00948c115f74ad6dbd7.zip | |
change aside width to reflect recent widget style changes
| -rw-r--r-- | view/js/main.js | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/view/js/main.js b/view/js/main.js index 220898efd..2b13acc3d 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -640,7 +640,10 @@ function collapseHeight() { var orgHeight = parseInt($(this).css('height')); if(orgHeight > divmore_height) { if(! $(this).hasClass('divmore')) { - if($(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top) { + + var trigger = $(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top ? true : false; + + if(trigger) { $(this).readmore({ speed: 0, heightMargin: 50, diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 302efc365..38dc4d209 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -7,7 +7,7 @@ $(document).ready(function() { if( $('#css3-calc').width() == 10) { $(window).resize(function() { if($(window).width() < 767) { - $('main').css('width', $(window).width() + 285 ); + $('main').css('width', $(window).width() + 287 ); } else { $('main').css('width', '100%' ); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index a0da5e302..443ebb1fb 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - $aside_width = 285; + $aside_width = 287; // left aside and right aside are 285px + converse width if($align_left) { |