diff --git a/dev/Component/EmailAddresses.js b/dev/Component/EmailAddresses.js index 99bf6d3ee..ca9fbb7f4 100644 --- a/dev/Component/EmailAddresses.js +++ b/dev/Component/EmailAddresses.js @@ -1,7 +1,8 @@ import { doc, createElement } from 'Common/Globals'; import { EmailModel } from 'Model/Email'; -const contentType = 'snappymail/emailaddress'; +const contentType = 'snappymail/emailaddress', + getAddressKey = li => li && li.emailaddress && li.emailaddress.key; let dragAddress, datalist; @@ -165,7 +166,7 @@ export class EmailAddressesComponent { _editTag(ev) { var li = ev.target.closest('li'), - tagKey = li && li.emailaddress.key; + tagKey = getAddressKey(li); if (!tagKey) { return true; @@ -344,7 +345,7 @@ export class EmailAddressesComponent { _removeTag(ev, li) { ev.preventDefault(); - var key = li.emailaddress.key, + var key = getAddressKey(li), self = this, indexFound = self._chosenValues.findIndex(v => key === v.key); @@ -358,7 +359,7 @@ export class EmailAddressesComponent { _removeDraggedTag(li) { var - key = li.emailaddress.key, + key = getAddressKey(li), self = this, indexFound = self._chosenValues.findIndex(v => key === v.key) ; @@ -380,7 +381,7 @@ export class EmailAddressesComponent { _focus(ev) { var li = ev.target.closest('li'); - if (li && li.emailaddress.key) { + if (getAddressKey(li)) { li.querySelector('a').focus(); } else { this.focus(); diff --git a/dev/Styles/Attachmnets.less b/dev/Styles/Attachmnets.less index acd0f50d7..f8ec13afd 100644 --- a/dev/Styles/Attachmnets.less +++ b/dev/Styles/Attachmnets.less @@ -28,13 +28,14 @@ box-shadow: 0 0 0 1px rgba(0, 0, 255, 0.1), 0 1px 5px rgba(0, 0, 255, 0.2); } - .checkedParent { + .checkboxAttachment { position: absolute; top: 0; right: 0; padding: 1px 4px 0 5px; background: #FAFAFA; border: 0 solid #CCC; + cursor: pointer; } .attachmentSize { diff --git a/dev/Styles/Contacts.less b/dev/Styles/Contacts.less index 103f6bf4b..afac0e6df 100644 --- a/dev/Styles/Contacts.less +++ b/dev/Styles/Contacts.less @@ -111,7 +111,7 @@ } &.hideContactListCheckbox { - .checkedParent, .checkboxCkeckAll { + .checkboxItem { display: none !important; } .sidebarParent { @@ -165,10 +165,11 @@ border-color: transparent !important; } - .checkedParent { + .checkboxItem { display: inline-block; float: left; padding: 0 8px 0 6px; + line-height: 45px; } .nameParent { diff --git a/dev/Styles/EmailAddresses.less b/dev/Styles/EmailAddresses.less index ab084bc4a..f40e3f39a 100644 --- a/dev/Styles/EmailAddresses.less +++ b/dev/Styles/EmailAddresses.less @@ -65,12 +65,13 @@ padding: 0; } -.emailaddresses input[type="text"], -.emailaddresses input[type="text"]:focus, -.emailaddresses input[type="text"]:hover { +#rl-app .emailaddresses input[type="text"], +#rl-app .emailaddresses input[type="text"]:focus, +#rl-app .emailaddresses input[type="text"]:hover { border: 0; box-shadow: none; - height: 24px; + height: auto; + line-height: inherit; margin: 0; outline: 0; padding: 0; diff --git a/dev/Styles/MessageList.less b/dev/Styles/MessageList.less index 2573f18d1..a3e6a94f9 100644 --- a/dev/Styles/MessageList.less +++ b/dev/Styles/MessageList.less @@ -86,7 +86,7 @@ html.rl-no-preview-pane { border-top-left-radius: @rlMainBorderRadius; border-bottom: 1px solid #bbb; - .checkboxCkeckAll { + .checkboxCheckAll { margin: 5px 0; } } @@ -558,7 +558,7 @@ html.rl-no-preview-pane { } &.hideMessageListCheckbox { - .checkboxMessage, .checkboxCkeckAll { + .checkboxMessage, .checkboxCheckAll { display: none !important; } .sidebarParent { diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less index 3f87d4f81..685cb4014 100644 --- a/dev/Styles/MessageView.less +++ b/dev/Styles/MessageView.less @@ -247,7 +247,7 @@ html.rl-no-preview-pane { border-radius: @rlLowBorderRadius; scroll-behavior: smooth; - .buttonUp, .buttonUnFull, .buttonFull { + .buttonUnFull, .buttonFull { display: inline-block; position: fixed; right: 25px; @@ -274,12 +274,7 @@ html.rl-no-preview-pane { } } - .buttonUp { - right: 65px; - z-index: 0; - } - - .buttonUp, .buttonUnFull { + .buttonUnFull { display: none; } @@ -326,12 +321,12 @@ html.rl-no-preview-pane { margin: 0; } - .checkedParent { + .checkboxAttachment { display: none; } &.selection-mode { - .checkedParent { + .checkboxAttachment { display: inline-block; } } @@ -656,14 +651,8 @@ html.rl-message-fullscreen { } } -html .messageItem { - .buttonUp, .buttonUp { - display: none !important; - } -} - html:not(.rl-mobile) .messageItem { - .buttonUp, .buttonFull { + .buttonFull { display: none !important; } } @@ -675,7 +664,4 @@ html.rl-message-fullscreen .messageItem { .buttonFull { display: none !important; } - .buttonUp { - display: none !important; - } } diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index 8d93e281b..ff525f591 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -34,7 +34,6 @@ label.inline, span.inline { } .btn-small.btn-small-small { - padding: 3px 9px; font-size: 11px; line-height: 11px; } diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less index f7830804f..d079e284d 100644 --- a/dev/Styles/_FontasticToBoot.less +++ b/dev/Styles/_FontasticToBoot.less @@ -1,5 +1,4 @@ -.fontastic, [class^="icon-"], [class*=" icon-"] { display: inline-block; @@ -25,7 +24,7 @@ } } -.icon-folder, .icon-folder-add, .icon-list { +.icon-folder, .icon-folder-add { font-size: 18px; margin-top: -1px; margin-left: -1px; @@ -55,22 +54,6 @@ background-image: none !important; } -.icon-checkbox-checked, .icon-checkbox-unchecked, .icon-checkbox-partial, .icon-radio-checked, .icon-radio-unchecked { - cursor: pointer; - &:hover, &:active { - filter: brightness(0.5); - } -} - -.icon-white { - &.icon-checkbox-checked, &.icon-checkbox-unchecked, &.icon-checkbox-partial, &.icon-radio-checked, &.icon-radio-unchecked { - color: #eee; - &:hover, &:active { - color: #fff; - } - } -} - .iconcolor-display-none { display: none; } diff --git a/dev/View/Popup/MessageOpenPgp.js b/dev/View/Popup/MessageOpenPgp.js index 18d9048e5..a0a4e65af 100644 --- a/dev/View/Popup/MessageOpenPgp.js +++ b/dev/View/Popup/MessageOpenPgp.js @@ -89,10 +89,9 @@ class MessageOpenPgpPopupView extends AbstractViewPopup { oDom.addEventListener('click', event => { const el = event.target.closestWithin('.key-list__item', oDom); if (el) { - oDom.querySelectorAll('.key-list__item .key-list__item__radio').forEach(node => { - node.classList.toggle('icon-radio-unchecked', el !== node); - node.classList.toggle('icon-radio-checked', el === node); - }); + oDom.querySelectorAll('.key-list__item .key-list__item__radio').forEach(node => + node.textContent = el === node ? '⦿' : '○' + ); self.selectedKey(ko.dataFor(el)); // eslint-disable-line no-invalid-this diff --git a/dev/View/Popup/NewOpenPgpKey.js b/dev/View/Popup/NewOpenPgpKey.js index 1268f1383..069d14789 100644 --- a/dev/View/Popup/NewOpenPgpKey.js +++ b/dev/View/Popup/NewOpenPgpKey.js @@ -16,7 +16,7 @@ class NewOpenPgpKeyPopupView extends AbstractViewPopup { name: '', password: '', - keyBitLength: 2048, + keyBitLength: 4096, submitRequest: false, submitError: '' @@ -90,7 +90,7 @@ class NewOpenPgpKeyPopupView extends AbstractViewPopup { this.email(''); this.emailError(false); - this.keyBitLength(2048); + this.keyBitLength(4096); this.submitError(''); } diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index 9ed4f6fe6..22da0ba04 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -411,14 +411,6 @@ class MessageListMailBoxUserView extends AbstractViewRight { this.inputMessageListSearchFocus(false); } - /** - * @returns {string} - */ - printableMessageCountForDeletion() { - const cnt = this.messageListCheckedOrSelectedUidsWithSubMails().length; - return 1 < cnt ? ' (' + (100 > cnt ? cnt : '99+') + ')' : ''; // eslint-disable-line no-magic-numbers - } - cancelSearch() { this.mainMessageListSearch(''); this.inputMessageListSearchFocus(false); @@ -694,7 +686,7 @@ class MessageListMailBoxUserView extends AbstractViewRight { let el = eqs(event, '.e-paginator .e-page'); el && this.gotoPage(ko.dataFor(el)); - eqs(event, '.messageList .checkboxCkeckAll') && this.checkAll(!this.checkAll()); + eqs(event, '.messageList .checkboxCheckAll') && this.checkAll(!this.checkAll()); el = eqs(event, '.messageList .messageListItem .flagParent'); el && this.flagMessages(ko.dataFor(el)); diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomainListItem.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomainListItem.html index 292499e25..7fa55f0f4 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomainListItem.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomainListItem.html @@ -14,8 +14,6 @@ - - - + diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginListItem.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginListItem.html index a83b1a492..7c1e64685 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginListItem.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPluginListItem.html @@ -4,8 +4,6 @@ - - - + - \ No newline at end of file + diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html index 4d16811a8..2f98156de 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html +++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html @@ -132,7 +132,7 @@
- + ⬅   @@ -233,7 +233,7 @@ - + ⬅ diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html index c7e6caaa3..41a93e366 100644 --- a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html +++ b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html @@ -1,8 +1,5 @@ - + 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 afc0c46ad..e0aad4864 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 @@ -4,9 +4,7 @@ - - - + 📇
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html index 4bf2d9bf1..af505cfb1 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -46,24 +46,16 @@ data-bind="visible: isArchiveVisible, command: archiveCommand, tooltip: 'GLOBAL/TO_ARCHIVE'"> - - ⚠ - + ⚠ - - 🗑 - - + 🗑
- - - + ☰
- + ⬅
- + ⬇
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html index 358fef8be..f060c75a3 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html @@ -16,15 +16,11 @@ - - ⚠ - + ⚠ - - 🗑 - + 🗑
@@ -265,9 +261,6 @@
- - - @@ -333,11 +326,9 @@  
-
- -
+
⚙ diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html index 58a61b095..90e2bedf4 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html @@ -46,25 +46,23 @@
- - - + ☰
 
- - - + 📇
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html index a1e289dfa..fa9fea7f0 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html @@ -26,8 +26,7 @@
- + ☰
-
- -
+
  @@ -158,9 +155,7 @@
- +
@@ -189,9 +184,7 @@
- +
@@ -205,9 +198,7 @@
- +
@@ -220,9 +211,7 @@
- +
@@ -241,12 +230,9 @@
- - - - +
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html index d458be0ef..de317446b 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsMessageOpenPgp.html @@ -16,7 +16,7 @@
- + ○
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 201c68dee..28deafef6 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 @@ -57,14 +57,12 @@ - + - - - + - + ⬍ 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 41841efbd..f8e1b579f 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 @@ -26,7 +26,7 @@ - + ⬍ @@ -70,7 +70,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 61cc3952a..1ae0d875d 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 @@ -27,9 +27,7 @@ - - - + diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html index a0bfce200..9d69f47bb 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html @@ -12,7 +12,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 f18dce24c..59421ea83 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 @@ -25,7 +25,7 @@ 👤 - + ⬍ diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html index 4b3550384..9a0c5d3ed 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/SystemDropDown.html @@ -48,7 +48,7 @@ diff --git a/vendors/bootstrap/less/tables.less b/vendors/bootstrap/less/tables.less index 68ce8d186..cd57bca27 100644 --- a/vendors/bootstrap/less/tables.less +++ b/vendors/bootstrap/less/tables.less @@ -26,7 +26,7 @@ padding: 8px; line-height: @baseLineHeight; text-align: left; - vertical-align: top; + vertical-align: text-top; border-top: 1px solid @tableBorder; } th { diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff index b9e52d2c8..f6128771e 100644 Binary files a/vendors/fontastic/fonts/snappymail.woff and b/vendors/fontastic/fonts/snappymail.woff differ diff --git a/vendors/fontastic/fonts/snappymail.woff2 b/vendors/fontastic/fonts/snappymail.woff2 index 7ea08b35a..0ef17f6fb 100644 Binary files a/vendors/fontastic/fonts/snappymail.woff2 and b/vendors/fontastic/fonts/snappymail.woff2 differ diff --git a/vendors/fontastic/styles.css b/vendors/fontastic/styles.css index d1bc03cad..45794384e 100644 --- a/vendors/fontastic/styles.css +++ b/vendors/fontastic/styles.css @@ -17,20 +17,21 @@ font-variant: normal !important; text-transform: none !important; speak: never; - line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +[class^="icon-"]::before, +[class*=" icon-"]::before { + line-height: 1; +} + .icon-arrows-in::before { content: "\e000"; } .icon-arrows-out::before { content: "\e001"; } -.icon-list::before { - content: "☰"; -} .icon-user-add::before { content: "\e005"; } @@ -43,21 +44,12 @@ .icon-right-dir::before { content: "\e00c"; /* ▶ */ } -.icon-left::before { - content: "⬅"; -} -.icon-down::before { - content: "⬇"; -} .icon-right-mini::before { content: "\e01e"; /* › */ } .icon-down-mini::before { content: "\e01f"; /* › rotate 90 */ } -.icon-up::before { - content: "⬆"; -} .icon-star-empty::before { content: "☆"; } @@ -129,36 +121,15 @@ .icon-popup::before { content: "\e045"; } -.icon-telephone::before { - content: "📞"; /* ℡ ✆ ☎ ☏ */ -} .icon-left-middle::before { content: "\e04b"; /* ❮ */ } .icon-right-middle::before { content: "\e04c"; /* ❯ */ } -.icon-address-book::before { - content: "\e051"; -} .icon-mail::before { content: "✉"; } -.icon-checkbox-checked::before { - content: "☑"; -} -.icon-checkbox-unchecked::before { - content: "☐"; -} -.icon-checkbox-partial::before { - content: "▣"; -} -.icon-radio-checked::before { - content: "\e05b"; -} -.icon-radio-unchecked::before { - content: "\e05c"; -} .icon-archive::before { content: "\e05f"; } @@ -186,13 +157,46 @@ .icon-resize-out::before { content: "⤢"; } -.icon-braille::before { - content: "\e06e"; /* ⸭ ⠿ ⁞⁞ */ -} .icon-check-mark-circle-two::before { content: "\e073"; } /* +.icon-radio-checked::before { + content: "⦿"; +} +.icon-radio-unchecked::before { + content: "○"; +} +.icon-address-book::before { + content: "📇"; +} +.icon-list::before { + content: "☰"; +} +.icon-telephone::before { + content: "📞"; +} +.icon-braille::before { + content: "⬍"; +} +.icon-checkbox-checked::before { + content: "☑"; +} +.icon-checkbox-unchecked::before { + content: "☐"; +} +.icon-checkbox-partial::before { + content: "▣"; +} +.icon-left::before { + content: "⬅"; +} +.icon-up::before { + content: "⬆"; +} +.icon-down::before { + content: "⬇"; +} .icon-image::before { content: "🖼"; }