Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.1-develop
Browse files Browse the repository at this point in the history
Accepted Public Pull Requests:
 - #16825: [Backport] Fixed type hints and docs for Downloadable Samples block (by @ronak2ram)
 - #16836: [Backport] Fixed typo in SynonymGroupRepositoryInterface (by @mage2pratik)
 - #16755: [backport] #16716 fix _utilities.less font-size issue (by @Karlasa)
  • Loading branch information
VladimirZaets authored Jul 15, 2018
2 parents 7d62c64 + 50980b1 commit 73ed076
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

namespace Magento\Downloadable\Block\Catalog\Product;

use Magento\Downloadable\Model\ResourceModel\Sample;
use Magento\Downloadable\Model\ResourceModel\Sample\Collection as SampleCollection;
use Magento\Downloadable\Api\Data\SampleInterface;

/**
* Downloadable Product Samples part block
Expand All @@ -30,15 +31,15 @@ public function hasSamples()
/**
* Get downloadable product samples
*
* @return array
* @return SampleCollection
*/
public function getSamples()
{
return $this->getProduct()->getTypeInstance()->getSamples($this->getProduct());
}

/**
* @param Sample $sample
* @param SampleInterface $sample
* @return string
*/
public function getSampleUrl($sample)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function save(\Magento\Search\Api\Data\SynonymGroupInterface $synonymGrou
public function delete(\Magento\Search\Api\Data\SynonymGroupInterface $synonymGroup);

/**
* Return a paritcular synonym group interface instance based on passed in synonym group id
* Return a particular synonym group interface instance based on passed in synonym group id
*
* @param int $synonymGroupId
* @return \Magento\Search\Api\Data\SynonymGroupInterface
Expand Down
3 changes: 1 addition & 2 deletions lib/web/css/source/lib/_utilities.less
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,8 @@
@_line-height: normal
) {
.lib-font-size(@_font-size);
font-size: @_font-size;
.lib-line-height(@_line-height);
letter-spacing: normal;
line-height: @_line-height;
}

//
Expand Down

0 comments on commit 73ed076

Please sign in to comment.