From 3ed9cbc04007ea99d8667df0f0cbd9038d9456da Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 9 Jan 2018 17:48:52 -0500 Subject: [PATCH] UX: Put the HR in the correct place --- app/assets/javascripts/discourse/widgets/user-menu.js.es6 | 4 ++++ .../javascripts/discourse/widgets/user-notifications.js.es6 | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 b/app/assets/javascripts/discourse/widgets/user-menu.js.es6 index c1480d2073f..115c3deb34c 100644 --- a/app/assets/javascripts/discourse/widgets/user-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/user-menu.js.es6 @@ -131,6 +131,10 @@ export default createWidget('user-menu', { this.attach('user-notifications', { path }) ]; + if (this.settings.showLogoutButton || this.state.hasUnread) { + result.push(h('hr.bottom-area')); + } + if (this.settings.showLogoutButton) { result.push( h('div.logout-link', [ diff --git a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 index 17701b7748d..2082b53fcc5 100644 --- a/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/widgets/user-notifications.js.es6 @@ -86,8 +86,7 @@ export default createWidget('user-notifications', { icon: 'chevron-down', action: 'showAllNotifications', className: 'btn' - })), - h('hr') + })) ); }