aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-12-21 11:51:24 +0100
committerMario Vavti <mario@mariovavti.com>2016-12-21 11:53:20 +0100
commit0c23cd62dbd737d9f1869dc5265440c227b667be (patch)
tree2cedf4bbfbb663865c5605e8fd9ff702bf8690fe
parentc1f1d4e2ce545cae0b1968489d9887842112e11b (diff)
downloadvolse-hubzilla-0c23cd62dbd737d9f1869dc5265440c227b667be.tar.gz
volse-hubzilla-0c23cd62dbd737d9f1869dc5265440c227b667be.tar.bz2
volse-hubzilla-0c23cd62dbd737d9f1869dc5265440c227b667be.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.php2
-rw-r--r--library/sticky-kit/sticky-kit.js2
-rw-r--r--view/css/widgets.css3
-rw-r--r--view/php/theme_init.php2
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');