From 88e44542f5dfab59ad6eb09f3b1086372a5f2fc1 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 1 Sep 2015 16:18:12 -0400
Subject: [PATCH] FIX: Don't show scrollbar in notifications with logout button

---
 .../javascripts/discourse/components/menu-panel.js.es6 |  1 +
 .../discourse/templates/components/user-menu.hbs       | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6
index 6d1edefb2..feccd23f8 100644
--- a/app/assets/javascripts/discourse/components/menu-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6
@@ -42,6 +42,7 @@ export default Ember.Component.extend({
       if (contentHeight + (offsetTop - scrollTop) + PANEL_BODY_MARGIN > fullHeight) {
         contentHeight = fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN;
       }
+      console.log(contentHeight);
       $panelBody.height(contentHeight);
       $('body').addClass('drop-down-visible');
     } else {
diff --git a/app/assets/javascripts/discourse/templates/components/user-menu.hbs b/app/assets/javascripts/discourse/templates/components/user-menu.hbs
index acdd90aaa..213366641 100644
--- a/app/assets/javascripts/discourse/templates/components/user-menu.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-menu.hbs
@@ -33,10 +33,10 @@
         </ul>
       {{/if}}
     {{/conditional-loading-spinner}}
-    {{#if siteSettings.show_logout_in_header}}
-      <hr>
-      {{d-link action="logout" class="logout" icon="sign-out" label="user.log_out"}}
-    {{/if}}
-    {{plugin-outlet "user-menu-bottom"}}
   </div>
+  {{plugin-outlet "user-menu-bottom"}}
+  {{#if siteSettings.show_logout_in_header}}
+    <hr>
+    {{d-link action="logout" class="logout" icon="sign-out" label="user.log_out"}}
+  {{/if}}
 {{/menu-panel}}