amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-24 22:39:31 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): remove negative margin from mail

Browse Source
This commit is contained in:
Hivert Quentin
2026-04-23 16:39:22 +02:00
parent 0ddc4281b8
commit 6119d6cf23
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
UI/MailPartViewers/UIxMailPartHTMLViewer.m
View File

@@ -938,7 +938,11 @@ static NSString *_sanitizeHtmlForDisplay(NSString *content)
- (NSString *) cssContent
{
NSString *cssContent, *css;
NSString *cssContent, *css, *newResult;
NSRegularExpression *regex;
NSError *error;
error = nil;
if (!handler)
[self _parseContent];
@@ -950,6 +954,16 @@ static NSString *_sanitizeHtmlForDisplay(NSString *content)
[handler css]];
else
cssContent = @"";
regex = [NSRegularExpression regularExpressionWithPattern:@"margin-left\\s*:\\s*-[^;]+(\\s*!important)?"
options: NSRegularExpressionCaseInsensitive error:&error];
newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-left: 0 !important"];
cssContent = [NSString stringWithString: newResult];
regex = [NSRegularExpression regularExpressionWithPattern:@"margin-right\\s*:\\s*-[^;]+(\\s*!important)?"
options: NSRegularExpressionCaseInsensitive error:&error];
newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-right: 0 !important"];
cssContent = [NSString stringWithString: newResult];
return cssContent;
}
@@ -1093,7 +1107,11 @@ static NSString *_sanitizeHtmlForDisplay(NSString *content)
- (NSString *) cssContent
{
NSString *cssContent, *css;
NSString *cssContent, *css, *newResult;
NSRegularExpression *regex;
NSError *error;
error = nil;
if (!handler)
[self _parseContent];
@@ -1105,6 +1123,16 @@ static NSString *_sanitizeHtmlForDisplay(NSString *content)
[handler css]];
else
cssContent = @"";
regex = [NSRegularExpression regularExpressionWithPattern:@"margin-(?:left|right)\\s*:\\s*-[^;]+(\\s*!important)?"
options: NSRegularExpressionCaseInsensitive error:&error];
newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-left: 0 !important"];
cssContent = [NSString stringWithString: newResult];
regex = [NSRegularExpression regularExpressionWithPattern:@"margin-right\\s*:\\s*-[^;]+(\\s*!important)?"
options: NSRegularExpressionCaseInsensitive error:&error];
newResult = [regex stringByReplacingMatchesInString:cssContent options:0 range:NSMakeRange(0, [cssContent length]) withTemplate:@"margin-right: 0 !important"];
cssContent = [NSString stringWithString: newResult];
return cssContent;
}