OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Move filtered notifications bar in scrollable area (#30996) 

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
pull/31030/head
David Roetzel 2024-07-15 15:42:47 +02:00 committed by GitHub
parent 0b97ec3f7b
commit 9d0bce4072
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/javascript/mastodon/features/notifications/index.jsx
View File

@ -223,6 +223,13 @@ class Notifications extends PureComponent {
let scrollContainer; let scrollContainer;
const prepend = (
<>
{needsNotificationPermission && <NotificationsPermissionBanner />}
<FilteredNotificationsBanner />
</>
);
if (signedIn) { if (signedIn) {
scrollContainer = ( scrollContainer = (
<ScrollableList <ScrollableList
@ -232,7 +239,7 @@ class Notifications extends PureComponent {
showLoading={isLoading && notifications.size === 0} showLoading={isLoading && notifications.size === 0}
hasMore={hasMore} hasMore={hasMore}
numPending={numPending} numPending={numPending}
prepend={needsNotificationPermission && <NotificationsPermissionBanner />} prepend={prepend}
alwaysPrepend alwaysPrepend
emptyMessage={emptyMessage} emptyMessage={emptyMessage}
onLoadMore={this.handleLoadOlder} onLoadMore={this.handleLoadOlder}
@ -282,8 +289,6 @@ class Notifications extends PureComponent {
{filterBarContainer} {filterBarContainer}
<FilteredNotificationsBanner />
{scrollContainer} {scrollContainer}
<Helmet> <Helmet>

3
app/javascript/styles/mastodon/components.scss
View File

@ -10192,8 +10192,7 @@ noscript {
.filtered-notifications-banner { .filtered-notifications-banner {
display: flex; display: flex;
align-items: center; align-items: center;
border: 1px solid var(--background-border-color); border-bottom: 1px solid var(--background-border-color);
border-top: 0;
padding: 24px 32px; padding: 24px 32px;
gap: 16px; gap: 16px;
color: $darker-text-color; color: $darker-text-color;