Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into pgp-improvements

Browse source
This commit is contained in:
Maarten 2025-06-16 17:28:39 +02:00 • committed by GitHub
commit 56409dcbb4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 303 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/Common/Html.js
View file

@ -308,6 +308,8 @@ export const
// Not supported by <template> element
// .replace(/<!doctype[^>]*>/gi, '')
// .replace(/<\?xml[^>]*\?>/gi, '')
// https://github.com/the-djmaze/snappymail/issues/1860
.replace(/<(\/?)x-html(\s[^>]*)?>/gi, '')
.replace(/<(\/?)head(\s[^>]*)?>/gi, '')
.replace(/<(\/?)body(\s[^>]*)?>/gi, '<$1div class="mail-body"$2>')
// .replace(/<\/?(html|head)[^>]*>/gi, '')

4
dev/Styles/User/FolderList.less
View file

@ -82,7 +82,7 @@
border-left: 3px solid transparent;
color: var(--folders-color, #333);
display: block;
line-height: 34px;
line-height: 2.2em;
padding: 0 2em 0 @folderItemPadding;
position: relative;
text-decoration: none;
@ -151,7 +151,7 @@
color: var(--unread-count-color, #fff);
font-size: 80%;
line-height: 1.5em;
margin-top: 7px;
margin-top: 0.5em;
min-width: 1.7em;
padding: 1px 4px;
text-align: center;

1
dev/View/Popup/Compose.js
View file

@ -863,6 +863,7 @@ export class ComposePopupView extends AbstractViewPopup {
case ComposeType.Forward:
case ComposeType.ForwardAsAttachment:
identity = findIdentity(oLastMessage.to.concat(oLastMessage.cc, oLastMessage.bcc))
|| findIdentity(oLastMessage.from)
/* || findIdentity(oLastMessage.deliveredTo)*/;
break;
case ComposeType.Draft: