vendor/assets/javascripts/uikit/components/sticky.js in uikit2-rails-0.1.6 vs vendor/assets/javascripts/uikit/components/sticky.js in uikit2-rails-0.1.7

- old
+ new

@@ -1,6 +1,6 @@ -/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */ +/*! UIkit 2.26.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */ (function(addon) { var component; if (window.UIkit) { @@ -288,10 +288,10 @@ var bTop = sticky.boundary.offset().top; if (sticky.boundtoparent) { containerBottom = documentHeight - (bTop + sticky.boundary.outerHeight()) + parseInt(sticky.boundary.css('padding-bottom')); } else { - containerBottom = documentHeight - bTop - parseInt(sticky.boundary.css('margin-top')); + containerBottom = documentHeight - bTop; } newTop = (scrollTop + stickyHeight) > (documentHeight - containerBottom - (sticky.top < 0 ? 0 : sticky.top)) ? (documentHeight - containerBottom) - (scrollTop + stickyHeight) : newTop; }