From 4d3d9b73a1350210b4f17652a6fa6aca96bd59df Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Thu, 5 Mar 2015 12:34:42 +1030
Subject: [PATCH] Fix scrubber height adjustment

---
 .../core/ember/app/components/discussion/stream-scrubber.js     | 2 +-
 framework/core/ember/app/styles/flarum/layout.less              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/core/ember/app/components/discussion/stream-scrubber.js b/framework/core/ember/app/components/discussion/stream-scrubber.js
index f58286088..e9dd1b2a7 100644
--- a/framework/core/ember/app/components/discussion/stream-scrubber.js
+++ b/framework/core/ember/app/components/discussion/stream-scrubber.js
@@ -167,7 +167,7 @@ export default Ember.Component.extend({
     // Adjust the height of the scrollbar so that it fills the height of
     // the sidebar and doesn't overlap the footer.
     var scrollbar = view.$('.scrubber-scrollbar');
-    scrollbar.css('max-height', $(window).height() - scrollbar.offset().top + $(window).scrollTop() - $('#footer').outerHeight(true));
+    scrollbar.css('max-height', $(window).height() - scrollbar.offset().top + $(window).scrollTop() - parseInt($('#page').css('padding-bottom')));
   },
 
   windowWasScrolled: function(event) {
diff --git a/framework/core/ember/app/styles/flarum/layout.less b/framework/core/ember/app/styles/flarum/layout.less
index 2e79d771f..d1b71acd8 100644
--- a/framework/core/ember/app/styles/flarum/layout.less
+++ b/framework/core/ember/app/styles/flarum/layout.less
@@ -384,7 +384,7 @@ body {
 // right.
 @media @tablet, @desktop, @desktop-hd {
   .global-page {
-    padding-bottom: 150px;
+    padding-bottom: 100px;
     position: relative;
   }
   .global-footer {