Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.3-develop Minor Fixes
Browse files Browse the repository at this point in the history
Accepted Public Pull Requests:
 - #22621: Resolved Typo (by @UdgamN)
 - #22599: Correct spelling (by @ravi-chandra3197)
 - #22594: Fixed typo issue (by @AfreenScarlet)
 - #22569: 2.3 develop pr1 (by @abhinay111222)
 - #22561: [Catalog|Eav] Revert change of PR #13302 not included into revert commit (by @Den4ik)
 - #22423: Store view specific labels cut in left navigation menu #22406 (by @sudhanshu-bajaj)


Fixed GitHub Issues:
 - #22406: Store view specific labels cut in left navigation menu (reported by @abrarpathan19) has been fixed in #22423 by @sudhanshu-bajaj in 2.3-develop branch
   Related commits:
     1. 2b60b9f
  • Loading branch information
magento-engcom-team authored May 6, 2019
2 parents 19fcb92 + e4c9638 commit 6a9860f
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
use Magento\Catalog\Api\Data\ProductRenderInterface;

/**
* Composite, which holds collectors, that collect enought information for
* product render
* Composite, which holds collectors, that collect enough information for product render
*/
class ProductRenderCollectorComposite implements ProductRenderCollectorInterface
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand All @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
.store-scope {
.admin__legend {
.admin__field-tooltip {
margin-left: -@indent__base;
margin-left: 0;
margin-top: .5rem;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion lib/web/css/docs/source/_breadcrumbs.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//
// Breadcrumbs layout with links can be separated by any symbol, for example <code>></code> symbol.
//
// The following markup corresponds to the accesibility demands:
// The following markup corresponds to the accessibility demands:
// ```html
// <div class="example-breadcrumbs-1">
// <span class="label" id="breadcrumb-label">You are here:</span>
Expand Down
2 changes: 1 addition & 1 deletion lib/web/css/docs/source/_pages.less
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/web/css/docs/source/_popups.less
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
// <td>@popup-title-headings__level</td>
// <td class="vars_value">h3</td>
// <td class="vars_value">h1 | h2 | h3 | h4 | h5 | h6</td>
// <td>What heading style is applyed to the popup title</td>
// <td>What heading style is applied to the popup title</td>
// </tr>
// <tr>
// <th colspan="5" class="vars_section">Popup close button</th>
Expand Down
2 changes: 1 addition & 1 deletion lib/web/css/docs/source/_responsive.less
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 6a9860f

Please sign in to comment.