From 4c84c6cdfc21213e7d9989c6f9c9a554c159ebb3 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Sun, 11 Feb 2024 20:48:03 +0100 Subject: [PATCH] Resolve #1427 --- dev/Model/FolderCollection.js | 4 ++-- dev/Styles/User/FolderList.less | 7 +++++-- dev/View/User/MailBox/FolderList.js | 2 ++ .../v/0.0.0/app/templates/Views/User/MailFolderList.html | 6 +++++- .../0.0.0/app/templates/Views/User/MailFolderListItem.html | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js index 65fe71446..d7d51b413 100644 --- a/dev/Model/FolderCollection.js +++ b/dev/Model/FolderCollection.js @@ -21,7 +21,7 @@ import { AbstractModel } from 'Knoin/AbstractModel'; import { /*koComputable,*/ addObservablesTo } from 'External/ko'; -//import { mailBox } from 'Common/Links'; +import { mailBox } from 'Common/Links'; import Remote from 'Remote/User/Fetch'; @@ -476,7 +476,7 @@ export class FolderModel extends AbstractModel { folder => folder.unreadCount() | folder.hasSubscribedUnreadMessagesSubfolders() ).length */ -// ,href: () => this.canBeSelected() && mailBox(this.fullNameHash) + ,href: () => this.canBeSelected() && mailBox(this.fullNameHash) }); } diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less index 26aa11e1b..f1e5b243a 100644 --- a/dev/Styles/User/FolderList.less +++ b/dev/Styles/User/FolderList.less @@ -17,11 +17,14 @@ width: 100%; } -/* https://github.com/the-djmaze/snappymail/issues/1427 +/* https://github.com/the-djmaze/snappymail/issues/1427 */ +#V-MailFolderList .e-checkbox { + margin: 0 4px; + width: calc(100% - 8px); +} #V-MailFolderList .unreadOnly li a:not(.unread-sub):not([data-unread]) { display:none; } -*/ .b-folders { display: flex; diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js index 802aa9ce4..ef2ec7354 100644 --- a/dev/View/User/MailBox/FolderList.js +++ b/dev/View/User/MailBox/FolderList.js @@ -39,6 +39,8 @@ export class MailFolderList extends AbstractViewLeft { this.foldersFilter = foldersFilter; + this.filterUnseen = ko.observable(false); + addComputablesTo(this, { foldersFilterVisible: () => 20 < FolderUserStore.folderList().CountRec, diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html index ce39809e8..920f8bc3b 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html @@ -24,7 +24,11 @@ ✕ -