diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less index aa934282ad7b6..a9a29964a9735 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_extends.less +++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less @@ -1219,7 +1219,7 @@ & when (@media-common = true) { .abs-field-date-input { margin-right: @indent__s; - width: calc(~'100% -' @icon-calendar__font-size + @indent__s); + width: calc(~'100% -' @icon-calendar__font-size - @indent__s); } } @@ -1234,7 +1234,7 @@ input { margin-right: @indent__s; - width: calc(~'100% -' @checkout-tooltip-icon__font-size + @indent__s + @indent__xs); + width: calc(~'100% -' @checkout-tooltip-icon__font-size - @indent__s - @indent__xs); } } } diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less index 86364f9d2c68e..f0fdfc1d7c426 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_extends.less +++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less @@ -1639,7 +1639,7 @@ & when (@media-common = true) { .abs-field-date-input { .lib-css(margin-right, @indent__s); - width: calc(~'100% -' @icon-calendar__font-size + @indent__s); + width: calc(~'100% -' @icon-calendar__font-size - @indent__s); } } @@ -1654,7 +1654,7 @@ input { .lib-css(margin-right, @indent__s); - width: calc(~'100% -' @checkout-tooltip-icon__font-size + @indent__s + @indent__xs); + width: calc(~'100% -' @checkout-tooltip-icon__font-size - @indent__s - @indent__xs); } } } diff --git a/composer.json b/composer.json index 7722f3a0f2cc4..c44002f77dec0 100644 --- a/composer.json +++ b/composer.json @@ -89,7 +89,7 @@ "tubalmartin/cssmin": "^4.1", "web-token/jwt-framework": "^3.1", "webonyx/graphql-php": "^15.0", - "wikimedia/less.php": "^3.2" + "wikimedia/less.php": "^3.2 || ^4.2.1" }, "require-dev": { "allure-framework/allure-phpunit": "^2", diff --git a/composer.lock b/composer.lock index 248e16238c774..64aa12f054441 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a76964f28e6affcccf75e2a6a329147b", + "content-hash": "c6deb58553a83377df05f987cd608168", "packages": [ { "name": "aws/aws-crt-php", @@ -8660,28 +8660,28 @@ }, { "name": "wikimedia/less.php", - "version": "v3.2.1", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/wikimedia/less.php.git", - "reference": "0d5b30ba792bdbf8991a646fc9c30561b38a5559" + "reference": "9bdb3fda0452a05769e51d9941f2cfc0871d5fc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/less.php/zipball/0d5b30ba792bdbf8991a646fc9c30561b38a5559", - "reference": "0d5b30ba792bdbf8991a646fc9c30561b38a5559", + "url": "https://api.github.com/repos/wikimedia/less.php/zipball/9bdb3fda0452a05769e51d9941f2cfc0871d5fc0", + "reference": "9bdb3fda0452a05769e51d9941f2cfc0871d5fc0", "shasum": "" }, "require": { - "php": ">=7.2.9" + "php": ">=7.4.3" }, "require-dev": { - "mediawiki/mediawiki-codesniffer": "40.0.1", - "mediawiki/mediawiki-phan-config": "0.12.0", + "mediawiki/mediawiki-codesniffer": "43.0.0", + "mediawiki/mediawiki-phan-config": "0.14.0", "mediawiki/minus-x": "1.1.1", "php-parallel-lint/php-console-highlighter": "1.0.0", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "9.6.16" }, "bin": [ "bin/lessc" @@ -8729,9 +8729,9 @@ ], "support": { "issues": "https://github.com/wikimedia/less.php/issues", - "source": "https://github.com/wikimedia/less.php/tree/v3.2.1" + "source": "https://github.com/wikimedia/less.php/tree/v4.2.1" }, - "time": "2023-02-03T06:43:41+00:00" + "time": "2024-02-25T01:55:00+00:00" } ], "packages-dev": [ diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 5ea10d096ab2e..44958863911df 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -51,7 +51,7 @@ "symfony/process": "^6.4", "tedivm/jshrink": "^1.4", "webonyx/graphql-php": "^15.0", - "wikimedia/less.php": "^3.2" + "wikimedia/less.php": "^3.2 || ^4.2.1" }, "archive": { "exclude": [