pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] base: flex for wkhtmltopdf

Browse Source 
Since the removing of the flex mixin in rev: https://github.com/odoo/odoo/commit/770aec399c4e6e29cfc5854318cbda19a605315d
The flex is bad rendered in pdf by wkhtmltopdf, because it uses
-webkit-box and not -webkit-flex. So we set it back through the post
processing regexp
This commit is contained in:
Pierre Masereel
2018-08-10 11:25:03 +02:00
parent 2633cb9eab
commit bf45668faf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
odoo/addons/base/models/assetsbundle.py
+2 -2
View File
@@ -452,9 +452,9 @@ class AssetsBundle(object):
# Post process the produced css to add required vendor prefixes here
compiled = re.sub(r'(appearance: (\w+);)', r'-webkit-appearance: \2; -moz-appearance: \2; \1', compiled);
compiled = re.sub(r'(display: ((?:inline-)?)flex((?: ?!important)?);)', r'display: -webkit-\2flex\3; \1', compiled) # For PhantomJS tests
compiled = re.sub(r'(display: ((?:inline-)?)flex((?: ?!important)?);)', r'display: -webkit-\2box\3; display: -webkit-\2flex\3; \1', compiled) # For PhantomJS tests and wkhtmltopdf
compiled = re.sub(r'(flex-flow: (\w+ \w+);)', r'-webkit-flex-flow: \2; \1', compiled) # For PhantomJS tests
compiled = re.sub(r'(flex: (\d+ \d+ (?:\d+|auto));)', r'-webkit-flex: \2; \1', compiled) # For PhantomJS tests
compiled = re.sub(r'(flex: ((\d)+ \d+ (?:\d+|auto));)', r'-webkit-box-flex: \3; -webkit-flex: \2; \1', compiled) # For PhantomJS tests and wkhtmltopdf
return compiled