nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Substantially rework email HTML sanitising and styling.

Browse source 
* src/client/conversation-viewer/conversation-message.vala
  (ConversationMessage::clean_html_markup): Ensure all displayed message
  bodies have at least a HTML element, so that the style in
  conversation-web-view.css has something to work on. Load application
  style when sanitising the HTML rather than when the web view has
  loaded.

* src/client/conversation-viewer/conversation-web-view.vala
  (ConversationWebView): Just set user style using WebKit.WebSettings,
  don't try to set application CSS, and remove all associated code.

* ui/conversation-web-view.css: Only trigger CSS 2.1 § 10.6.7 on the HTML
  element, so BODY can be styled as normal by email CSS.
This commit is contained in:
Michael James Gratton 2016-08-10 01:16:37 +10:00
parent c75719cfe7
commit 7581f16320
3 changed files with 100 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

37
ui/conversation-web-view.css
View file

@ -7,37 +7,30 @@
*/
html {
/* Disallow changes to HTML style using !important since this it is
needed for sizing the ConversationWebView. */
left: 0 !important;
width: 100% !important;
margin: 0 !important;
border: 0 !important;
padding: 0 !important;
}
html, body {
/* Trigger CSS 2.1 § 10.6.7 to get a shrink-wrapped height.
See also ConversationWebView.get_preferred_height */
/* Trigger CSS 2.1 § 10.6.7 to get a shrink-wrapped height. */
position: absolute !important;
top: 0 !important;
left: 0 !important;
bottom: auto !important;
width: 100% !important;
height: auto !important;
/* Disable viewport scrollbbars */
overflow: hidden !important;
/* Lock down the box enough so we don't get an incrementally
expanding web view */
box-sizing: border-box !important;
margin: 0 !important;
border: 0 !important;
padding: 0;
/* Never show scroll bars */
overflow: hidden;
}
body {
/* Allow email style to change the body however. */
left: 0;
right: 0;
margin: 12px;
margin: 0;
border: 0;
padding: 0;
color: black;
background-color: white;
overflow-wrap: break-word;
padding: 12px;
overflow-wrap: break-word !important;
}
/* By default, tables reset the font properties to "normal" */