Skip to content

Commit

Permalink
MAGETWO-71896: Static versioning and styles minification break email …
Browse files Browse the repository at this point in the history
…fonts styles #8241 #10638

 - Merge Pull Request #10638 from xmav/magento2:8241
 - Merged commits:
   1. 9f71bed
   2. 795b6b8
  • Loading branch information
miguelbalparda committed Aug 23, 2017
2 parents 6c5ba1f + 795b6b8 commit 8ce6ab7
Show file tree
Hide file tree
Showing 3 changed files with 130 additions and 125 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public function applyInlineCssDataProvider()
'<html><head><style type="text/css">div { color: #111; }</style></head><p></p></html>',
'p { color: #000 }',
[
'<head><style type="text/css">div { color: #111; }</style></head>',
'<style type="text/css">div { color: #111; }</style>',
'<p style="color: #000;"></p>',
],
],
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"composer/composer": "1.4.1",
"monolog/monolog": "^1.17",
"oyejorge/less.php": "~1.7.0",
"pelago/emogrifier": "0.1.1",
"pelago/emogrifier": "1.2.0",
"tubalmartin/cssmin": "4.1.0",
"magento/magento-composer-installer": ">=0.1.11",
"braintree/braintree_php": "3.22.0",
Expand Down
Loading

0 comments on commit 8ce6ab7

Please sign in to comment.