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 @@ {{/if}} {{/conditional-loading-spinner}} - {{#if siteSettings.show_logout_in_header}} -
- {{d-link action="logout" class="logout" icon="sign-out" label="user.log_out"}} - {{/if}} - {{plugin-outlet "user-menu-bottom"}} + {{plugin-outlet "user-menu-bottom"}} + {{#if siteSettings.show_logout_in_header}} +
+ {{d-link action="logout" class="logout" icon="sign-out" label="user.log_out"}} + {{/if}} {{/menu-panel}}