Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Don't show scrollbar in notifications with logout button

This commit is contained in:
Robin Ward 2015-09-01 16:18:12 -04:00
parent c36fdccab2
commit 88e44542f5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/components/menu-panel.js.es6
View File

@ -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 {

10
app/assets/javascripts/discourse/templates/components/user-menu.hbs
View File

@ -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}}