Skip to content

MC-37941: There is no space between rating stars and a review text in the case of long rating name #31892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 10, 2021
Merged

MC-37941: There is no space between rating stars and a review text in the case of long rating name #31892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
636ee98
MC-37941: There is no space between rating stars and a review text in…
viktorpetryk Jan 29, 2021
461c887
Merge remote-tracking branch 'origin/2.4-develop' into MC-37941
viktorpetryk Jan 31, 2021
d32d9dc
Merge remote-tracking branch 'origin/2.4-develop' into MC-37941
viktorpetryk Jan 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 93 additions & 68 deletions app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,79 +4,104 @@
* See COPYING.txt for license details.
*/

/** @var Magento\Review\Block\Product\View\ListView $block */
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
use Magento\Framework\Escaper;
use Magento\Framework\View\Helper\SecureHtmlRenderer;
use Magento\Review\Block\Product\View\ListView;

/**
* @var ListView $block
* @var SecureHtmlRenderer $secureRenderer
* @var Escaper $escaper
*/

$_items = $block->getReviewsCollection()->getItems();
$format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
?>
<?php if (count($_items)): ?>
<div class="block review-list" id="customer-reviews">
<?php if (!$block->getHideTitle()): ?>
<div class="block-title">
<strong><?= $block->escapeHtml(__('Customer Reviews')) ?></strong>
</div>
<?php endif ?>
<div class="block-content">
<div class="toolbar review-toolbar">
<?= $block->getChildHtml('toolbar') ?>
</div>
<ol class="items review-items">
<?php foreach ($_items as $_review): ?>
<li class="item review-item" itemscope itemprop="review" itemtype="http://schema.org/Review">
<div class="review-title" itemprop="name"><?= $block->escapeHtml($_review->getTitle()) ?></div>
<?php if (count($_review->getRatingVotes())): ?>
<div class="review-ratings">
<?php foreach ($_review->getRatingVotes() as $_vote): ?>
<div class="rating-summary item"
itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating">
<span class="label rating-label">
<span><?= $block->escapeHtml($_vote->getRatingCode()) ?></span>
</span>
<div class="rating-result"
id="review_<?= /* @noEscape */ $_review->getReviewId()
?>_vote_<?= /* @noEscape */ $_vote->getVoteId() ?>"
title="<?= $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
<meta itemprop="worstRating" content = "1"/>
<meta itemprop="bestRating" content = "100"/>
<span>
<span itemprop="ratingValue"><?= $block->escapeHtml($_vote->getPercent()) ?>%</span>
</span>
<div class="block review-list" id="customer-reviews">
<?php if (!$block->getHideTitle()): ?>
<div class="block-title">
<strong><?= $escaper->escapeHtml(__('Customer Reviews')) ?></strong>
</div>
<?php endif ?>
<div class="block-content">
<div class="toolbar review-toolbar">
<?= $block->getChildHtml('toolbar') ?>
</div>
<ol class="items review-items">
<?php foreach ($_items as $_review): ?>
<li class="item review-item" itemscope itemprop="review" itemtype="http://schema.org/Review">
<div class="review-title" itemprop="name">
<?= $escaper->escapeHtml($_review->getTitle()) ?>
</div>
<?php if (count($_review->getRatingVotes())): ?>
<div class="review-ratings">
<?php foreach ($_review->getRatingVotes() as $_vote): ?>
<div class="rating-summary item"
itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating">
<span class="label rating-label">
<span><?= $escaper->escapeHtml($_vote->getRatingCode()) ?></span>
</span>
<div class="rating-result"
id="review_<?= /* @noEscape */ $_review->getReviewId()
. '_vote_'
. $_vote->getVoteId() ?>"
title="<?= $escaper->escapeHtmlAttr($_vote->getPercent()) ?>%">
<meta itemprop="worstRating" content="1"/>
<meta itemprop="bestRating" content="100"/>
<span>
<span itemprop="ratingValue">
<?= $escaper->escapeHtml($_vote->getPercent()) ?>%
</span>
</span>
</div>
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
'width:' . $_vote->getPercent() . '%',
'div#review_' . $_review->getReviewId()
. '_vote_' . $_vote->getVoteId() . ' span'
) ?>
</div>
<?php endforeach; ?>
</div>
<?php endif; ?>
<div class="review-content-container">
<div class="review-content" itemprop="description">
<?= /* @noEscape */ nl2br($escaper->escapeHtml($_review->getDetail())) ?>
</div>
<div class="review-details">
<p class="review-author">
<span class="review-details-label">
<?= $escaper->escapeHtml(__('Review by')) ?>
</span>
<strong class="review-details-value" itemprop="author">
<?= $escaper->escapeHtml($_review->getNickname()) ?>
</strong>
</p>
<p class="review-date">
<span class="review-details-label">
<?= $escaper->escapeHtml(__('Posted on')) ?>
</span>
<time class="review-details-value" itemprop="datePublished"
datetime="<?= $escaper->escapeHtmlAttr($block->formatDate(
$_review->getCreatedAt(),
$format
)) ?>">
<?= $escaper->escapeHtml(
$block->formatDate(
$_review->getCreatedAt(),
$format
)
) ?>
</time>
</p>
</div>
</div>
<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
'width:' . $_vote->getPercent() . '%',
'div#review_' . $_review->getReviewId() . '_vote_' . $_vote->getVoteId() . ' span'
) ?>
</div>
<?php endforeach; ?>
</div>
<?php endif; ?>
<div class="review-content" itemprop="description">
<?= /* @noEscape */ nl2br($block->escapeHtml($_review->getDetail())) ?>
</div>
<div class="review-details">
<p class="review-author">
<span class="review-details-label"><?= $block->escapeHtml(__('Review by')) ?></span>
<strong class="review-details-value"
itemprop="author"><?= $block->escapeHtml($_review->getNickname()) ?></strong>
</p>
<p class="review-date">
<span class="review-details-label"><?= $block->escapeHtml(__('Posted on')) ?></span>
<time class="review-details-value"
itemprop="datePublished"
datetime="<?= $block->escapeHtmlAttr($block->formatDate(
$_review->getCreatedAt(),
$format
)) ?>"><?= $block->escapeHtml($block->formatDate($_review->getCreatedAt(), $format)) ?>
</time>
</p>
</div>
</li>
<?php endforeach; ?>
</ol>
<div class="toolbar review-toolbar">
<?= $block->getChildHtml('toolbar') ?>
</li>
<?php endforeach; ?>
</ol>
<div class="toolbar review-toolbar">
<?= $block->getChildHtml('toolbar') ?>
</div>
</div>
</div>
</div>
<?php endif;?>
<?php endif; ?>
12 changes: 6 additions & 6 deletions app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,12 @@
&-ratings {
float: left;
margin-bottom: 0;
max-width: @review-ratings-left - @indent__xl;
min-width: @review-ratings-left - @indent__xl;
padding-right: @indent__xl;
}

&-ratings ~ &-content,
&-ratings ~ &-details {
margin-left: @review-ratings-left;
&-ratings ~ &-content-container {
overflow: hidden;
}
}

Expand Down Expand Up @@ -419,7 +419,7 @@
.product-details {
&:extend(.abs-add-clearfix all);
&:extend(.abs-margin-for-blocks-and-widgets all);

.rating-average-label {
&:extend(.abs-visually-hidden all);
}
Expand All @@ -441,7 +441,7 @@

.customer-review-rating {
margin-bottom: @indent__base;

.item {
margin-bottom: @indent__s;

Expand Down