diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-12-21 11:51:24 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-12-21 11:51:24 +0100 |
| commit | 04472bd730f464aaee1ef79cf67c8b4f79f85652 (patch) | |
| tree | a8f6c98d61adebcf22ed42911f9e96a2f87b457b | |
| parent | e91a4bebed7cfbbe644291b4e9bd9cb7f6bc230e (diff) | |
| download | volse-hubzilla-04472bd730f464aaee1ef79cf67c8b4f79f85652.tar.gz volse-hubzilla-04472bd730f464aaee1ef79cf67c8b4f79f85652.tar.bz2 volse-hubzilla-04472bd730f464aaee1ef79cf67c8b4f79f85652.zip | |
fix a glitch in sticky-kit and comment out alt_pager() in widget_conversations since it will not work there
| -rw-r--r-- | include/widgets.php | 2 | ||||
| -rw-r--r-- | library/sticky-kit/sticky-kit.js | 2 | ||||
| -rw-r--r-- | view/css/widgets.css | 3 | ||||
| -rw-r--r-- | view/php/theme_init.php | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/include/widgets.php b/include/widgets.php index ebdb47113..dde8e7cd0 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -778,7 +778,7 @@ function widget_conversations($arr) { '$messages' => $messages )); - $o .= alt_pager($a,count($r)); + //$o .= alt_pager($a,count($r)); } diff --git a/library/sticky-kit/sticky-kit.js b/library/sticky-kit/sticky-kit.js index 00b1ea2ff..eb2ea8a26 100644 --- a/library/sticky-kit/sticky-kit.js +++ b/library/sticky-kit/sticky-kit.js @@ -77,7 +77,7 @@ padding_top = parseInt(parent.css("padding-top"), 10); padding_bottom = parseInt(parent.css("padding-bottom"), 10); parent_top = parent.offset().top + border_top + padding_top; - parent_height = parent.height(); + parent_height = parent.outerHeight(true); if (fixed) { fixed = false; bottomed = false; diff --git a/view/css/widgets.css b/view/css/widgets.css index abaf03038..fcce30529 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -1,6 +1,5 @@ .widget { - margin-bottom: 10px; - padding: 10px; + padding: 10px 10px 20px 10px; } .widget h3 { diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 1fb07ae4f..85da4d782 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -26,7 +26,7 @@ head_add_js('library/jquery-textcomplete/jquery.textcomplete.js'); //head_add_js('library/colorbox/jquery.colorbox.js'); head_add_js('library/jquery.timeago.js'); head_add_js('library/readmore.js/readmore.js'); -head_add_js('library/sticky-kit/sticky-kit.min.js'); +head_add_js('library/sticky-kit/sticky-kit.js'); //head_add_js('library/jquery_ac/friendica.complete.js'); //head_add_js('library/tiptip/jquery.tipTip.minified.js'); head_add_js('library/jgrowl/jquery.jgrowl_minimized.js'); |