From cb787b99bdb7dbf54b3d036838dee867cfa98352 Mon Sep 17 00:00:00 2001 From: scossar Date: Tue, 8 Sep 2015 14:37:07 -0700 Subject: [PATCH] use outerHeight to calculate menu height --- app/assets/javascripts/discourse/components/menu-panel.js.es6 | 2 +- app/assets/javascripts/discourse/views/header.js.es6 | 2 +- 2 files changed, 2 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 13330f21a4..8961e9f931 100644 --- a/app/assets/javascripts/discourse/components/menu-panel.js.es6 +++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6 @@ -56,7 +56,7 @@ export default Ember.Component.extend({ } $panelBody.height('100%'); - this.$().css({ left: "auto", top: (menuTop - 2) + "px", height }); + this.$().css({ left: "auto", top: (menuTop) + "px", height }); $('body').removeClass('drop-down-visible'); } diff --git a/app/assets/javascripts/discourse/views/header.js.es6 b/app/assets/javascripts/discourse/views/header.js.es6 index 17062acde2..add2ce107e 100644 --- a/app/assets/javascripts/discourse/views/header.js.es6 +++ b/app/assets/javascripts/discourse/views/header.js.es6 @@ -51,5 +51,5 @@ export function headerHeight() { const $header = $('header.d-header'); const headerOffset = $header.offset(); const headerOffsetTop = (headerOffset) ? headerOffset.top : 0; - return parseInt($header.height() + headerOffsetTop - $(window).scrollTop() + 5); + return parseInt($header.outerHeight() + headerOffsetTop - $(window).scrollTop()); }