From e3e0474be2a8b2c45e340229864833395530adbe Mon Sep 17 00:00:00 2001 From: djmaze Date: Mon, 8 Feb 2021 14:03:54 +0100 Subject: [PATCH] Bugfix and cleanup CSS even more --- dev/Model/FolderCollection.js | 6 +- dev/Settings/User/Folders.js | 17 +---- dev/Styles/Admin.less | 8 -- dev/Styles/AdminDomains.less | 4 - dev/Styles/AdminPackages.less | 4 - dev/Styles/AdminPlugins.less | 4 - dev/Styles/FolderList.less | 3 - dev/Styles/Settings.less | 8 -- dev/Styles/SettingsAccounts.less | 10 --- dev/Styles/SettingsFilters.less | 5 -- dev/Styles/SettingsFolders.less | 54 ++++---------- dev/Styles/SettingsOpenPGP.less | 2 - dev/Styles/SettingsTemplates.less | 6 -- dev/Styles/Ui.less | 19 +++-- dev/Styles/_BootstrapFix.less | 5 -- dev/Styles/_FontasticToBoot.less | 1 - .../Views/User/MailFolderListItem.html | 2 +- .../Views/User/PopupsSieveScript.html | 2 +- .../Views/User/SettingsAccounts.html | 4 +- .../templates/Views/User/SettingsFilters.html | 2 +- .../Views/User/SettingsFolderItem.html | 35 ++++----- .../templates/Views/User/SettingsFolders.html | 73 +++++++++---------- .../templates/Views/User/SettingsOpenPGP.html | 4 +- .../Views/User/SettingsTemplates.html | 2 +- 24 files changed, 88 insertions(+), 192 deletions(-) diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js index 0c07101f2..ebc58aa6a 100644 --- a/dev/Model/FolderCollection.js +++ b/dev/Model/FolderCollection.js @@ -301,11 +301,9 @@ export class FolderModel extends AbstractModel { canBeDeleted: () => !folder.isSystemFolder() && !folder.subFolders.length, - selectableForFolderList: () => !folder.isSystemFolder() && folder.selectable, + canBeSubscribed: () => !folder.isSystemFolder() && folder.selectable && rl.settings.app('useImapSubscribe'), - canBeSubscribed: () => !folder.isSystemFolder() && folder.selectable, - - canBeChecked: () => !folder.isSystemFolder() && folder.selectable, + canBeSelected: () => !folder.isSystemFolder() && folder.selectable, localName: () => { let name = folder.name(); diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js index b10c160ad..95a2ffd00 100644 --- a/dev/Settings/User/Folders.js +++ b/dev/Settings/User/Folders.js @@ -2,7 +2,7 @@ import ko from 'ko'; import { Notification } from 'Common/Enums'; import { ClientSideKeyName } from 'Common/EnumsUser'; -import { getNotification, i18n } from 'Common/Translator'; +import { getNotification } from 'Common/Translator'; import { removeFolderFromCacheList } from 'Common/Cache'; @@ -24,8 +24,6 @@ export class FoldersUserSettings { this.folderListOptimized = FolderStore.folderListOptimized; this.folderListError = FolderStore.folderListError; - this.folderListHelp = ko.observable('').extend({ throttle: 100 }); - this.loading = ko.computed(() => { const loading = FolderStore.foldersLoading(), creating = FolderStore.foldersCreating(), @@ -38,8 +36,6 @@ export class FoldersUserSettings { this.folderForDeletion = ko.observable(null).deleteAccessHelper(); this.folderForEdit = ko.observable(null).extend({ toggleSubscribeProperty: [this, 'edited'] }); - - this.useImapSubscribe = !!rl.settings.app('useImapSubscribe'); } folderEditOnEnter(folder) { @@ -70,17 +66,10 @@ export class FoldersUserSettings { onShow() { FolderStore.folderListError(''); } - +/* onBuild(oDom) { - oDom.addEventListener('mouseover', event => { - const eqs = s => event.target.closestWithin(s, oDom); - eqs('.delete-folder-parent') && this.folderListHelp(i18n('SETTINGS_FOLDERS/HELP_DELETE_FOLDER')); - eqs('.subscribe-folder-parent') && this.folderListHelp(i18n('SETTINGS_FOLDERS/HELP_SHOW_HIDE_FOLDER')); - eqs('.check-folder-parent') && this.folderListHelp(i18n('SETTINGS_FOLDERS/HELP_CHECK_FOR_NEW_MESSAGES')); - }); - oDom.addEventListener('mouseout', () => this.folderListHelp('')); } - +*/ createFolder() { showScreenPopup(FolderCreatePopupView); } diff --git a/dev/Styles/Admin.less b/dev/Styles/Admin.less index 2697280b4..f7d33f3ed 100644 --- a/dev/Styles/Admin.less +++ b/dev/Styles/Admin.less @@ -104,13 +104,5 @@ .b-settings-content { padding: 20px; padding-left: 30px; - - .legend { - width: 670px; - } - - .nav-tabs { - width: 670px; - } } } diff --git a/dev/Styles/AdminDomains.less b/dev/Styles/AdminDomains.less index 1fae6b1e9..626286056 100644 --- a/dev/Styles/AdminDomains.less +++ b/dev/Styles/AdminDomains.less @@ -5,10 +5,6 @@ .e-item { - .e-action { - cursor: pointer; - } - .domain-name { display: inline-block; word-break: break-all; diff --git a/dev/Styles/AdminPackages.less b/dev/Styles/AdminPackages.less index 6239f544e..8111c1a61 100644 --- a/dev/Styles/AdminPackages.less +++ b/dev/Styles/AdminPackages.less @@ -26,10 +26,6 @@ font-size: 12px; } - .e-action { - cursor: pointer; - } - .package-release-parent, .package-actions-parent { text-align: center; } diff --git a/dev/Styles/AdminPlugins.less b/dev/Styles/AdminPlugins.less index 67056ba54..73e11f9f9 100644 --- a/dev/Styles/AdminPlugins.less +++ b/dev/Styles/AdminPlugins.less @@ -7,10 +7,6 @@ } .e-item { - .e-action { - cursor: pointer; - } - .plugin-img { font-size: 12px; margin-right: 2px; diff --git a/dev/Styles/FolderList.less b/dev/Styles/FolderList.less index bcf7938e4..62cd8063c 100644 --- a/dev/Styles/FolderList.less +++ b/dev/Styles/FolderList.less @@ -19,9 +19,6 @@ transparent 75%, transparent); } - &.focused .b-content { - } - .b-folders-user { .e-link.print-count.system .badge { display: none !important; diff --git a/dev/Styles/Settings.less b/dev/Styles/Settings.less index 5906e1ab9..9a9d16963 100644 --- a/dev/Styles/Settings.less +++ b/dev/Styles/Settings.less @@ -112,10 +112,6 @@ .b-settings-content { padding: 20px; padding-left: 30px; - - .legend { - width: 600px; - } } td { @@ -127,7 +123,3 @@ html.rl-mobile .rl-settings-view-model { margin-right: 15px; } - -html.rl-mobile .b-settings-content .legend { - width: auto; -} diff --git a/dev/Styles/SettingsAccounts.less b/dev/Styles/SettingsAccounts.less index 88d5538ca..1a4b69975 100644 --- a/dev/Styles/SettingsAccounts.less +++ b/dev/Styles/SettingsAccounts.less @@ -3,8 +3,6 @@ .list-table { - width: 600px; - .account-img, .identity-img { font-size: 12px; margin-right: 5px; @@ -41,10 +39,6 @@ white-space: nowrap; - .e-action { - cursor: pointer; - } - .delete-account { cursor: pointer; opacity: 0.5; @@ -55,10 +49,6 @@ white-space: nowrap; - .e-action { - cursor: pointer; - } - .delete-identity { cursor: pointer; opacity: 0.5; diff --git a/dev/Styles/SettingsFilters.less b/dev/Styles/SettingsFilters.less index 78b3726a1..9597896fd 100644 --- a/dev/Styles/SettingsFilters.less +++ b/dev/Styles/SettingsFilters.less @@ -13,11 +13,6 @@ white-space: nowrap; } -.b-filter-script .e-action, -.b-settings-filters .e-action { - cursor: pointer; -} - .filter-item .delete-filter { cursor: pointer; opacity: 0.5; diff --git a/dev/Styles/SettingsFolders.less b/dev/Styles/SettingsFolders.less index d7e826dd1..1d6705afe 100644 --- a/dev/Styles/SettingsFolders.less +++ b/dev/Styles/SettingsFolders.less @@ -1,24 +1,12 @@ .b-settings-folders { - &.ignore-folder-subscribe { - .subscribe-folder, .unsubscribe-folder { - display: none; - } - } - .folders-list-error { - width: 550px; margin: 10px 0; } .list-table { - - width: 600px; - - .e-action { - cursor: pointer; - } + margin-top: 40px; .folder-padding { display: inline-block; @@ -31,27 +19,17 @@ white-space: pre-wrap; box-sizing: border-box; margin-left: 7px; - line-height: 22px; - cursor: default; } .folder-system-name { display: inline-block; - line-height: 22px; - color: #999; - cursor: default; + opacity: 0.6; } .folder-name.can-be-edited:hover { - border-bottom: 1px dashed #333; + text-decoration-style: dashed; cursor: pointer; } - - .folder-name-input { - border-width: 1px; - margin-bottom: 0; - margin-left: -4px; - } } .folder-item { @@ -60,6 +38,11 @@ font-weight: bold; } + input { + border-width: 1px; + margin-bottom: 0; + } + .button-delete { margin-right: 15px; margin-top: 5px; @@ -67,33 +50,24 @@ opacity: 0; } - .delete-folder, .subscribe-folder, .unsubscribe-folder, .check-folder, .uncheck-folder { - cursor: pointer; - opacity: 0.6; - } - - .unsubscribe-folder { - opacity: 0.2; - } - - .uncheck-folder { + .unsubscribed-folder, .unchecked-folder { opacity: 0.2; } } .folder-padding.deep-1 { - width: 15px * 1 + 10px; + width: 25px; } .folder-padding.deep-2 { - width: 15px * 2 + 10px; + width: 40px; } .folder-padding.deep-3 { - width: 15px * 3 + 10px; + width: 55px; } .folder-padding.deep-4 { - width: 15px * 4 + 10px; + width: 70px; } .folder-padding.deep-5 { - width: 15px * 5 + 10px; + width: 85px; } } diff --git a/dev/Styles/SettingsOpenPGP.less b/dev/Styles/SettingsOpenPGP.less index 6ba0e43e5..b483b56af 100644 --- a/dev/Styles/SettingsOpenPGP.less +++ b/dev/Styles/SettingsOpenPGP.less @@ -3,8 +3,6 @@ .list-table { - width: 750px; - .open-pgp-key-img { margin-right: 10px; vertical-align: top; diff --git a/dev/Styles/SettingsTemplates.less b/dev/Styles/SettingsTemplates.less index 24a116aa0..74d02182f 100644 --- a/dev/Styles/SettingsTemplates.less +++ b/dev/Styles/SettingsTemplates.less @@ -3,8 +3,6 @@ .list-table { - width: 600px; - .template-img { font-size: 12px; margin-right: 5px; @@ -26,10 +24,6 @@ .template-item { - .e-action { - cursor: pointer; - } - .delete-template { cursor: pointer; opacity: 0.5; diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less index 1bab8d0b2..1947529cf 100644 --- a/dev/Styles/Ui.less +++ b/dev/Styles/Ui.less @@ -1,10 +1,11 @@ - +/* .g-ui-user-select-none { -// webkit-touch-callout: none; -// user-select: none; -// standard-user-select: none; -// touch-callout: none; + webkit-touch-callout: none; + user-select: none; + standard-user-select: none; + touch-callout: none; } +*/ .g-ui-link { color: #369; @@ -155,6 +156,14 @@ } } +.e-action { + cursor: pointer; +} + +.list-table { + max-width: 800px; +} + html.mobile .hide-mobile { display:none; } diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index 6a8b698cb..0aa03e82c 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -278,11 +278,6 @@ select { padding-left: 20px; } - .list-table { - width: 100%; - max-width: 100%; - } - .form-horizontal { .control-group { .control-label { diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less index 2eeab00bd..a8094657b 100644 --- a/dev/Styles/_FontasticToBoot.less +++ b/dev/Styles/_FontasticToBoot.less @@ -23,7 +23,6 @@ font-size: 18px; margin-top: -1px; margin-left: -1px; - width: 17px; } .iconsize24 { diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html index 237e975aa..25d2b72ef 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html @@ -1,6 +1,6 @@
+ css: { 'i-am-inbox': isInbox, 'selected': selected() && !isSystemFolder(), 'selectable': canBeSelected, 'hidden' : hidden, 'print-count': hasUnreadMessages, 'unread-sub': hasSubscribedUnreadMessagesSubfolders, 'system': isSystemFolder, 'anim-action-class': actionBlink }"> diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html index bc0049609..06a62aa35 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsSieveScript.html @@ -75,7 +75,7 @@ - + diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html index 991ec500b..97672b119 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html @@ -33,7 +33,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html index f6a5924ff..665e094c2 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFilters.html @@ -35,7 +35,7 @@ - + diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html index 34f86da4d..82a0d7144 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html @@ -1,35 +1,28 @@ -   - -   - - + + - +   + - + - - - 🗑 - + + 🗑 - - - 👁 - - + + 👁 + 👁 - - + + - + diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html index e8aad9875..37b2bde02 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html @@ -1,45 +1,38 @@ -
-
-
-
- -     - -
+
+
+
+ +     +
- - -    - - +
+ +    - - 🔧 -    - - -
- -
- -
-
- - -
- - - - - - - - -
+ + +    + + 🔧 +    + + +
+ +
+
-
-
- -
+
+ +
+ + + + + + + + +
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html index a41c86389..aacf26735 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html @@ -48,7 +48,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html index 33964980f..dc906cb7e 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsTemplates.html @@ -32,7 +32,7 @@ - +