codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-17 04:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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) { if (contentHeight + (offsetTop - scrollTop) + PANEL_BODY_MARGIN > fullHeight) {
contentHeight = fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN; contentHeight = fullHeight - (offsetTop - scrollTop) - PANEL_BODY_MARGIN;
} }
console.log(contentHeight);
$panelBody.height(contentHeight); $panelBody.height(contentHeight);
$('body').addClass('drop-down-visible'); $('body').addClass('drop-down-visible');
} else { } else {

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

@ -33,10 +33,10 @@
</ul> </ul>
{{/if}} {{/if}}
{{/conditional-loading-spinner}} {{/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> </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}} {{/menu-panel}}