UX: Align user page dismiss notifications btn with new navigation (#19235)
This change only affects the redesign user page navigation menu. The dismiss button was incorrectly positioned below the user notifications stream. A side effect of this is that it affected our infinite loading code for the notifications stream. No tests have been added in this commit as we have yet to quite figure out how we can reliabily test for behaviours which requires us to scroll the page.
This commit is contained in:
parent
6f0b9bb1c4
commit
8b2c2e5c34
|
@ -1,18 +1,19 @@
|
|||
{{#if this.currentUser.redesigned_user_page_nav_enabled}}
|
||||
<DSection @pageClass="user-notifications" />
|
||||
|
||||
<div class="user-navigation user-navigation-secondary">
|
||||
<HorizontalOverflowNav>
|
||||
<UserNav::NotificationsNav
|
||||
@model={{this.model}}
|
||||
@siteSettings={{this.siteSettings}}/>
|
||||
</HorizontalOverflowNav>
|
||||
</div>
|
||||
{{#if this.model}}
|
||||
<div class="navigation-controls">
|
||||
<DButton @title="user.dismiss_notifications_tooltip" @class="btn btn-default dismiss-notifications" @action={{action "resetNew"}} @label="user.dismiss_notifications" @icon="check" @disabled={{this.allNotificationsRead}} />
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if this.model}}
|
||||
<div class="navigation-controls">
|
||||
<DButton @title="user.dismiss_notifications_tooltip" @class="btn btn-default dismiss-notifications" @action={{action "resetNew"}} @label="user.dismiss_notifications" @icon="check" @disabled={{this.allNotificationsRead}} />
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{else}}
|
||||
<DSection @pageClass="user-notifications" @class="user-secondary-navigation">
|
||||
<MobileNav @class="notifications-nav" @desktopClass="notification-list action-list nav-stacked">
|
||||
|
|
Loading…
Reference in New Issue