diff --git a/app/design/frontend/Magento/blank/web/css/source/_email-base.less b/app/design/frontend/Magento/blank/web/css/source/_email-base.less index 1cdae848ec318..3e679823f4feb 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_email-base.less +++ b/app/design/frontend/Magento/blank/web/css/source/_email-base.less @@ -26,11 +26,11 @@ // * attribute presence (a[title]) // * attribute value (a[title="example"]) // * attribute only ([title="example"]) -// -// Unsupported selectors (examples in parenthesis): // * first-child (div:first-child) // * last-child (div:last-child) // * nth-child (div:nth-child(3n+1)) +// +// Unsupported selectors (examples in parenthesis): // * universal (*) // * pseudo (a:hover, a:active, a:focus, span:before, span:after, etc) diff --git a/composer.json b/composer.json index 95a1ae33985da..be1a5381ca4a7 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,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": "3.0.0", "magento/magento-composer-installer": ">=0.1.11", "braintree/braintree_php": "3.22.0", diff --git a/composer.lock b/composer.lock index f4b32154e8370..614c2814a29f6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "54e536d6a16773c0efc4d6a7a6e668d4", - "content-hash": "83b07861c465af490d6cf0c75adc78fd", + "hash": "d81cc58f7a569523beaca7e18b4ba9d9", + "content-hash": "ea37f29bd186ab38ff5d84ce3e6f4f3f", "packages": [ { "name": "braintree/braintree_php", @@ -960,27 +960,31 @@ }, { "name": "pelago/emogrifier", - "version": "v0.1.1", + "version": "V1.2.0", "source": { "type": "git", "url": "https://github.com/jjriv/emogrifier.git", - "reference": "ed72bcd6a3c7014862ff86d026193667a172fedf" + "reference": "a1db453bb504597d821efcc04b21c79a6021e00c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jjriv/emogrifier/zipball/ed72bcd6a3c7014862ff86d026193667a172fedf", - "reference": "ed72bcd6a3c7014862ff86d026193667a172fedf", + "url": "https://api.github.com/repos/jjriv/emogrifier/zipball/a1db453bb504597d821efcc04b21c79a6021e00c", + "reference": "a1db453bb504597d821efcc04b21c79a6021e00c", "shasum": "" }, "require": { - "ext-mbstring": "*", - "php": ">=5.4.0" + "php": ">=5.4.0,<=7.1.99" }, "require-dev": { - "phpunit/phpunit": "~4.6.0", - "squizlabs/php_codesniffer": "~2.3.0" + "phpunit/phpunit": "4.8.27", + "squizlabs/php_codesniffer": "2.6.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, "autoload": { "psr-4": { "Pelago\\": "Classes/" @@ -1012,7 +1016,7 @@ ], "description": "Converts CSS styles into inline style attributes in your HTML code", "homepage": "http://www.pelagodesign.com/sidecar/emogrifier/", - "time": "2015-05-15 11:37:51" + "time": "2017-03-02 12:51:48" }, { "name": "phpseclib/phpseclib",