From 97b608f0909c8e92c6b02d029c53d9049e6674d5 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 16 Sep 2015 15:30:40 -0400 Subject: [PATCH] FIX: Allow desktop chrome to scroll to bottom of menu panel --- .../javascripts/discourse/components/menu-panel.js.es6 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6 index 41b40512bb4..bae297d2e2f 100644 --- a/app/assets/javascripts/discourse/components/menu-panel.js.es6 +++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6 @@ -46,10 +46,11 @@ export default Ember.Component.extend({ const menuTop = headerHeight(); let height; - if ((menuTop + contentHeight) < ($(window).height() - 20)) { + const winHeight = $(window).height() - 16; + if ((menuTop + contentHeight) < winHeight) { height = contentHeight + "px"; } else { - height = $(window).height() - menuTop; + height = winHeight - menuTop; } $panelBody.height('100%');