From bf45668faf29c5d93e9d0a2daf42defaba15ddb3 Mon Sep 17 00:00:00 2001 From: Pierre Masereel Date: Wed, 8 Aug 2018 13:47:43 +0200 Subject: [PATCH] [FIX] base: flex for wkhtmltopdf 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 --- odoo/addons/base/models/assetsbundle.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/odoo/addons/base/models/assetsbundle.py b/odoo/addons/base/models/assetsbundle.py index 345ab279e32..eaaaa2f54a0 100644 --- a/odoo/addons/base/models/assetsbundle.py +++ b/odoo/addons/base/models/assetsbundle.py @@ -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