From 2b60b9fad8d06b47ef0dca54fa321cb35aab2f42 Mon Sep 17 00:00:00 2001 From: Sudhanshu Bajaj Date: Fri, 19 Apr 2019 15:47:42 +0800 Subject: [PATCH 1/8] Store view specific labels cut in left navigation menu #22406 --- .../web/css/source/module/main/_store-scope.less | 2 +- app/design/adminhtml/Magento/backend/web/css/styles-old.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less index 05e6350c88d8e..cd73d4955d176 100644 --- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less +++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_store-scope.less @@ -37,7 +37,7 @@ .store-scope { .admin__legend { .admin__field-tooltip { - margin-left: -@indent__base; + margin-left: 0; margin-top: .5rem; } } diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less index 2dbe68ef96eec..50dd5c3a859e7 100644 --- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less +++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less @@ -1366,7 +1366,7 @@ font-size: 14px; font-weight: 600; line-height: 3.2rem; - padding: 0 30px 0 0; + padding: 0 30px 0 30px; white-space: nowrap; word-wrap: break-word; From 2d3760edbbf40d26f47ce66c69e89fd2bd4eb3ad Mon Sep 17 00:00:00 2001 From: Denis Kopylov Date: Tue, 30 Apr 2019 18:35:55 +0300 Subject: [PATCH 2/8] [Catalog|Eav] Revert change of PR magento/magento2#13302 not included into revert commit https://github.com/magento/magento2/commit/06019a6215ea31982494708d55745ae0b9622696 --- .../Catalog/Model/ResourceModel/Product/Collection.php | 1 - .../Model/Entity/Collection/AbstractCollectionTest.php | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php index 0cdf8b39f7d52..76e65400721d9 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php @@ -19,7 +19,6 @@ use Magento\Framework\DB\Select; use Magento\Framework\EntityManager\MetadataPool; use Magento\Framework\Indexer\DimensionFactory; -use Magento\Framework\Model\ResourceModel\ResourceModelPoolInterface; use Magento\Store\Model\Indexer\WebsiteDimensionProvider; use Magento\Store\Model\Store; diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/AbstractCollectionTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/AbstractCollectionTest.php index ab5b40c56685c..bc4ed7d4bd9e4 100644 --- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/AbstractCollectionTest.php +++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/AbstractCollectionTest.php @@ -5,9 +5,6 @@ */ namespace Magento\Eav\Test\Unit\Model\Entity\Collection; -use Magento\Framework\Data\Collection\Db\FetchStrategyInterface; -use Magento\Framework\Model\ResourceModel\ResourceModelPoolInterface; - /** * AbstractCollection test * @@ -31,7 +28,7 @@ class AbstractCollectionTest extends \PHPUnit\Framework\TestCase protected $loggerMock; /** - * @var FetchStrategyInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\Data\Collection\Db\FetchStrategyInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $fetchStrategyMock; @@ -61,7 +58,7 @@ class AbstractCollectionTest extends \PHPUnit\Framework\TestCase protected $resourceHelperMock; /** - * @var ResourceModelPoolInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\Validator\UniversalFactory|\PHPUnit_Framework_MockObject_MockObject */ protected $validatorFactoryMock; From 020578721d825e1ed2b6c8ba804f857e98a13346 Mon Sep 17 00:00:00 2001 From: Abhinay Pratap Singh <32534204+abhinay111222@users.noreply.github.com> Date: Wed, 1 May 2019 16:39:20 +0530 Subject: [PATCH 3/8] Resolved typo error Resolved typo error --- lib/web/css/docs/source/_pages.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/css/docs/source/_pages.less b/lib/web/css/docs/source/_pages.less index 6b01fa7549e92..59eb121112d28 100644 --- a/lib/web/css/docs/source/_pages.less +++ b/lib/web/css/docs/source/_pages.less @@ -4,7 +4,7 @@ // */ // # Pagination HTML markup -// Pagination is used to display numbers of pages in case content exceeds page limits. The markup corresponds to accesibility demands. +// Pagination is used to display numbers of pages in case content exceeds page limits. The markup corresponds to accessibility demands. // // Required HTML markup: // ```html From 54063286858824c4f8b492d22672008864d87b81 Mon Sep 17 00:00:00 2001 From: Abhinay Pratap Singh <32534204+abhinay111222@users.noreply.github.com> Date: Wed, 1 May 2019 16:44:56 +0530 Subject: [PATCH 4/8] fixed typo error fixed typo error --- lib/web/css/docs/source/_popups.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/css/docs/source/_popups.less b/lib/web/css/docs/source/_popups.less index b192219b6438f..7251cde45bc3c 100644 --- a/lib/web/css/docs/source/_popups.less +++ b/lib/web/css/docs/source/_popups.less @@ -245,7 +245,7 @@ // @popup-title-headings__level // h3 // h1 | h2 | h3 | h4 | h5 | h6 -// What heading style is applyed to the popup title +// What heading style is applied to the popup title // // // Popup close button From b96c2d8a44a54fce04c2b20c52f8477965a828a2 Mon Sep 17 00:00:00 2001 From: Ravi Chandra Date: Thu, 2 May 2019 09:51:08 +0530 Subject: [PATCH 5/8] Correct spelling --- .../Ui/DataProvider/Product/ProductRenderCollectorComposite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php index 359b1a1a948f8..a4b3f231cfb9c 100644 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php @@ -9,7 +9,7 @@ use Magento\Catalog\Api\Data\ProductRenderInterface; /** - * Composite, which holds collectors, that collect enought information for + * Composite, which holds collectors, that collect enough information for * product render */ class ProductRenderCollectorComposite implements ProductRenderCollectorInterface From 183e0620a53083aca08d2fbdb373f0041847278e Mon Sep 17 00:00:00 2001 From: Afreen Sheikh Date: Thu, 2 May 2019 18:07:14 +0530 Subject: [PATCH 6/8] fixed typo issue fixed typo issue --- lib/web/css/docs/source/_responsive.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/css/docs/source/_responsive.less b/lib/web/css/docs/source/_responsive.less index 46c19bc23a66c..8e7397d6ad6f3 100644 --- a/lib/web/css/docs/source/_responsive.less +++ b/lib/web/css/docs/source/_responsive.less @@ -81,7 +81,7 @@ // // ## Gathering // -// Everything that you include in collector mixins above will go in place where they declarated. +// Everything that you include in collector mixins above will go in place where they declared. // As example all // ```css // .media-width(@extremum, @break) { From 509cded0ce0cf3bd23dc1cf0b7c442483c9d1dd9 Mon Sep 17 00:00:00 2001 From: Nazarn96 Date: Fri, 3 May 2019 14:34:10 +0300 Subject: [PATCH 7/8] magento/magento2#22599 static-test-fix --- .../DataProvider/Product/ProductRenderCollectorComposite.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php index a4b3f231cfb9c..7edf25ff20cc1 100644 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php @@ -9,8 +9,7 @@ use Magento\Catalog\Api\Data\ProductRenderInterface; /** - * Composite, which holds collectors, that collect enough information for - * product render + * Composite, which holds collectors, that collect enough information for product render */ class ProductRenderCollectorComposite implements ProductRenderCollectorInterface { From 5f5a2618d218a31705c472167654e4db25dcdc51 Mon Sep 17 00:00:00 2001 From: UdgamN Date: Fri, 3 May 2019 18:18:36 +0530 Subject: [PATCH 8/8] Resolved Typo Updated and corrected the spelling of 'accesibility' to accessiblity --- lib/web/css/docs/source/_breadcrumbs.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/css/docs/source/_breadcrumbs.less b/lib/web/css/docs/source/_breadcrumbs.less index 848af20c0728e..5b5df991e3cdc 100644 --- a/lib/web/css/docs/source/_breadcrumbs.less +++ b/lib/web/css/docs/source/_breadcrumbs.less @@ -8,7 +8,7 @@ // // Breadcrumbs layout with links can be separated by any symbol, for example > symbol. // -// The following markup corresponds to the accesibility demands: +// The following markup corresponds to the accessibility demands: // ```html //
// You are here: