Skip to content

J
joshine
Commit 14fa0d5c by dhn
Options

Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branch_developer

parents bc64c607 9a09ea3a
Showing with 35 additions and 32 deletions
app/code/Joshine/Review/view/frontend/templates/product/view/list.phtml
......@@ -41,7 +41,6 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
</style>
<div class="block review-list joshine-clearfix" id="customer-reviews">
<div class="joshine-review-container joshine-clearfix joshine-hidden-md joshine-hidden-sm joshine-hidden-xs">
<h1 class="joshine-review-title">
<?= __("Customer Reviews") ?>
......@@ -109,13 +108,13 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
<?php endforeach; ?>
<?php endif; ?>
</div>
<div class="joshine-review-des">
<div class="joshine-review-des joshine-font-c-darkgray">
<?= $block->escapeHtml($review->getDetail()); ?>
</div>
<div class="joshine-foot-mark rate-fit">
<div class="rate-fit joshine-font-c-darkgray joshine-font-text">
<div class="rate-fit-item">
<?php $fitsValue = $review->getSizeFits(); ?>
<span><strong class="joshine-font-w-bolder"><?= __("Size Fits") ?> :</strong> <?= $helper->translateSizeFits($fitsValue); ?></span>
<span><strong><?= __("Size Fits") ?> :</strong> <?= $helper->translateSizeFits($fitsValue); ?></span>
</div>
</div>
</div>
......@@ -202,7 +201,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
</div>
</div>
</div>
<div class="row joshine-font-c-darkgray" style="font-size: .8em;">
<div class="row joshine-font-c-darkgray joshine-font-text">
<?= $block->escapeHtml($review->getDetail()); ?>
</div>
......@@ -210,9 +209,9 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
<?= /* @noEscape */ $helper->getReviewImagesHtml($review->getId(), $block->getProductId()) ?>
</div>
<div class="row joshine-foot-mark">
<div class="row joshine-font-c-darkgray joshine-font-text">
<?php $fitsValue = $review->getSizeFits(); ?>
<span><strong class="joshine-font-w-bolder"><?= __("Size Fits") ?>:</strong> <?= $helper->translateSizeFits($fitsValue); ?></span>
<span><strong><?= __("Size Fits") ?>:</strong> <?= $helper->translateSizeFits($fitsValue); ?></span>
</div>
</div>
<hr>
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/free_shipping.phtml
......@@ -6,7 +6,7 @@
?>
<div class="product-intro__freeshipping product-intro__bg-none">
<div class="product-intro__freeshipping-abt action" data-trigger="trigger-shipping">
<div class="product-intro__freeshipping-icon shipping "><i class="svgicon svgicon-gd-shipping"></i> <p>Fast Delivery</p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more"></span> </div>
<div class="product-intro__freeshipping-icon shipping joshine-clearfix"><i class="svgicon svgicon-gd-shipping"></i> <p>Fast Delivery</p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more"></span> </div>
<div class="free-wrapper">
<p> Estimated to be delivered on <span id="deliveredTime">11/25/2021 - 12/03/2021</span>.</p> </div></div>
<div data-bind="mageInit: {
......@@ -130,7 +130,7 @@
</div>
</div>
<div class="product-intro__freeshipping-item full-line paddingTop-0 paddingBottom-0 action" data-trigger="trigger2">
<div class="product-intro__freeshipping-icon">
<div class="product-intro__freeshipping-icon joshine-clearfix">
<i class="svgicon svgicon-gd-freereturn"></i><p>Free Return &amp; Exchange</p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more"></span> </div> <div class="product-intro__freeshipping-desc">
Learn More
</div>
......@@ -199,6 +199,13 @@
</script>
<style>
.product-intro__freeshipping-icon
{
display: flex;
flex-wrap: nowrap;
align-items: center;
}
.product-intro__freeshipping-icon .svgicon {
width: 15px;
height: 15px;
......@@ -220,21 +227,16 @@
}
.free-wrapper p {
padding-left: 40px;
}.product-intro__freeshipping-desc {
padding-left: 40px;
}
.product-intro__freeshipping-icon.shipping p ,.product-intro__freeshipping-icon p{
display: inline-block;
line-height: 15px;
padding: 0 10px;
float: left; padding-left: 15px;
}
.product-intro__freeshipping-desc {
padding-left: 40px;
font-size: .8rem !important;
}
.product-intro__freeshipping-icon.shipping p, .product-intro__freeshipping-icon p {
display: inline-block;
line-height: .9rem;
padding: 0 10px;
float: left;
padding-left: 15px;
}
......
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml
......@@ -60,7 +60,7 @@
<div style="width: 100%" class="product-view-freeshipping">
<div class="product-intro__freeshipping product-intro__bg-none">
<div class="product-intro__freeshipping-abt action" id="freeshipping-button">
<div class="product-intro__freeshipping-icon shipping " ><i class="svgicon svgicon-gd-shipping"></i> <p><?=__("Fast Delivery"); ?></p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more" ></span>
<div class="product-intro__freeshipping-icon shipping joshine-clearfix " ><i class="svgicon svgicon-gd-shipping" style="position: relative;top: 4px;"></i> <p><?=__("Fast Delivery"); ?></p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more" ></span>
</div>
<div class="free-wrapper">
......@@ -68,7 +68,7 @@
</div>
<div class="product-intro__freeshipping-item full-line paddingTop-0 paddingBottom-0 action" id="free-return-button" >
<div class="product-intro__freeshipping-icon">
<div class="product-intro__freeshipping-icon joshine-clearfix">
<i class="svgicon svgicon-gd-freereturn"></i><p><?= __("Free Return & Exchange") ?>:</p> <span class="svgicon svgicon-gd-more-grey product-intro__freeshipping-more" ></span> </div> <div class="product-intro__freeshipping-desc">
<?= __("Learn More") ?>
</div>
......@@ -91,6 +91,13 @@
});
</script>
<style>
.product-intro__freeshipping-icon
{
display: flex;
flex-wrap: nowrap;
align-items: center;
}
.product-intro__freeshipping-icon .svgicon {
width: 15px;
height: 15px;
......@@ -106,7 +113,6 @@
.free-wrapper {
border-bottom: 1px solid #e8e7e7;
margin-bottom: 10px;
line-height: 15px;
padding-bottom: 10px;
}
.free-wrapper > * {
......@@ -118,6 +124,7 @@
.free-wrapper p {
padding-left: 40px;
}.product-intro__freeshipping-desc {
font-size: .8rem !important;
padding-left: 40px;
}
.product-intro__freeshipping-icon.shipping p ,.product-intro__freeshipping-icon p{
......@@ -127,7 +134,7 @@
padding-left: 15px;
}
.product-intro__freeshipping-item > * {
font-size: .8rem;
font-size: 1rem;
}
.svgicon-gd-more-grey {
......@@ -173,8 +180,7 @@
.joshine-desction .desction-left{
width: 90%;
flot: left;
font-weight: 600;
color: #000;
font-size: 1rem;
}
.joshine-desction .desction-right{
width: 10%;
......@@ -182,7 +188,6 @@
text-align: end;
font-size: larger;
color: #000;
font-weight: 600;
}
.joshine-desction .desction-info{
font-size: small;
......
app/design/frontend/Joshine/breeze/Magento_Swatches/web/js/swatch-renderer.js
......@@ -451,8 +451,8 @@ define([
if (item.id == 137) {
// Create new control
var sizeContent = '<div class="swatch-attribute-selected-option-size-content" style="display:block;">'+
'<div style="color:#999999;">'+$.mage.__("Product Size Describe")+ '</div>'+
'<span style="color:#0a0a0a;" class="'+classes.attributeSelectedOptionLabelClass + '">'+item.options[0].label+'</span></div>';
'<div>'+$.mage.__("Product Size Describe")+ '</div>'+
'<span class="'+classes.attributeSelectedOptionLabelClass + '">'+item.options[0].label+'</span></div>';
container.append(
'<div class="' + classes.attributeClass + ' ' + item.code + '" ' +
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
......@@ -2716,8 +2716,7 @@ button.action.submit.primary {
}
.swatch-attribute.size .swatch-attribute-selected-option{
font-size: 12px;
color: rgba(23, 23, 23, 0.6) !important;
font-size: .8rem;
}
.swatch-attribute-selected-option-size-content{
......@@ -2731,9 +2730,7 @@ button.action.submit.primary {
.swatch-attribute-selected-option-size-content span.swatch-attribute-selected-option{
margin-left: 0!important;
line-height:0.53333rem;
font-size: 12px;
text-transform:capitalize;
color: #0a0a0a;
}
}
......@@ -3273,7 +3270,7 @@ tr.grand.totals {
}
.flash-sale-info .product-name{
font-size: 12px;
font-size: 14px;
}
.flash-sale-info .price{
font-size: 16px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment