Skip to content

Commit 8ce6ab7

Browse files
MAGETWO-71896: Static versioning and styles minification break email fonts styles #8241 #10638
- Merge Pull Request #10638 from xmav/magento2:8241 - Merged commits: 1. 9f71bed 2. 795b6b8
2 parents 6c5ba1f + 795b6b8 commit 8ce6ab7

File tree

3 files changed

+130
-125
lines changed

3 files changed

+130
-125
lines changed

app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ public function applyInlineCssDataProvider()
359359
'<html><head><style type="text/css">div { color: #111; }</style></head><p></p></html>',
360360
'p { color: #000 }',
361361
[
362-
'<head><style type="text/css">div { color: #111; }</style></head>',
362+
'<style type="text/css">div { color: #111; }</style>',
363363
'<p style="color: #000;"></p>',
364364
],
365365
],

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"composer/composer": "1.4.1",
4444
"monolog/monolog": "^1.17",
4545
"oyejorge/less.php": "~1.7.0",
46-
"pelago/emogrifier": "0.1.1",
46+
"pelago/emogrifier": "1.2.0",
4747
"tubalmartin/cssmin": "4.1.0",
4848
"magento/magento-composer-installer": ">=0.1.11",
4949
"braintree/braintree_php": "3.22.0",

0 commit comments

Comments
 (0)