From 1b5da13e8a1d4b2244e22e95f831c51e384e44bf Mon Sep 17 00:00:00 2001 From: Robert Korulczyk Date: Mon, 17 Apr 2023 10:07:00 +0200 Subject: [PATCH] fix: infinite scroll not initialized for notifications on big screens (#3733) --- framework/core/js/src/forum/states/NotificationListState.ts | 2 +- framework/core/less/forum/NotificationsDropdown.less | 2 +- .../core/src/Api/Controller/ListNotificationsController.php | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/framework/core/js/src/forum/states/NotificationListState.ts b/framework/core/js/src/forum/states/NotificationListState.ts index 2b54c76a7..7c47cbf96 100644 --- a/framework/core/js/src/forum/states/NotificationListState.ts +++ b/framework/core/js/src/forum/states/NotificationListState.ts @@ -4,7 +4,7 @@ import Notification from '../../common/models/Notification'; export default class NotificationListState extends PaginatedListState { constructor() { - super({}, 1, 10); + super({}, 1, 20); } get type(): string { diff --git a/framework/core/less/forum/NotificationsDropdown.less b/framework/core/less/forum/NotificationsDropdown.less index ad66c57d2..75dd1eb6d 100644 --- a/framework/core/less/forum/NotificationsDropdown.less +++ b/framework/core/less/forum/NotificationsDropdown.less @@ -3,7 +3,7 @@ padding: 0; .NotificationList-content { - max-height: 70vh; + max-height: ~"min(70vh, 800px)"; overflow: auto; } } diff --git a/framework/core/src/Api/Controller/ListNotificationsController.php b/framework/core/src/Api/Controller/ListNotificationsController.php index 517dd854a..2ad3bb634 100644 --- a/framework/core/src/Api/Controller/ListNotificationsController.php +++ b/framework/core/src/Api/Controller/ListNotificationsController.php @@ -33,11 +33,6 @@ class ListNotificationsController extends AbstractListController 'subject.discussion' ]; - /** - * {@inheritdoc} - */ - public $limit = 10; - /** * @var NotificationRepository */