Skip to content

J
joshine
Commit 9c9a1879 by 王东红
Options

Merge branch 'master' of http://47.99.244.21:9999/root/joshine

parents 598548ae bbf13145
Showing with 21 additions and 57 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/widget/new/content/home_news_product.phtml
...@@ -63,44 +63,6 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()-> ...@@ -63,44 +63,6 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
<?php if ($showWishlist || $showCompare || $showCart) :?> <?php if ($showWishlist || $showCompare || $showCart) :?>
<div class="product-item-actions"> <div class="product-item-actions">
<?php if ($showCart) :?>
<div class="actions-primary">
<?php if ($_item->isSaleable()) :?>
<?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)) :?>
<button class="action tocart primary"
data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
type="button"
title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
<span><?= $block->escapeHtml(__('Add Cart')) ?></span>
</button>
<?php else :?>
<?php
$postDataHelper = $this->helper(Magento\Framework\Data\Helper\PostHelper::class);
$postData = $postDataHelper->getPostData(
$block->escapeUrl($block->getAddToCartUrl($_item)),
['product' => (int) $_item->getEntityId()]
)
?>
<button class="action tocart primary"
data-post='<?= /* @noEscape */ $postData ?>'
type="button"
title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
<span><?= $block->escapeHtml(__('Add Cart')) ?></span>
</button>
<?php endif; ?>
<?php else :?>
<?php if ($_item->isAvailable()) :?>
<div class="stock available">
<span><?= $block->escapeHtml(__('In stock')) ?></span>
</div>
<?php else :?>
<div class="stock unavailable">
<span><?= $block->escapeHtml(__('Out of stock')) ?></span>
</div>
<?php endif; ?>
<?php endif; ?>
</div>
<?php endif; ?>
<?php if ($showWishlist || $showCompare) :?> <?php if ($showWishlist || $showCompare) :?>
<div class="actions-secondary" data-role="add-to-links"> <div class="actions-secondary" data-role="add-to-links">
<?php if ($this->helper(Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) :?> <?php if ($this->helper(Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) :?>
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -265,6 +265,7 @@ footer a{ ...@@ -265,6 +265,7 @@ footer a{
.page-main > .columns{ .page-main > .columns{
margin-top: 20px; margin-top: 20px;
position: inherit;
} }
footer .footer_link .logo_img{ footer .footer_link .logo_img{
...@@ -700,20 +701,7 @@ p.shopbycate-title { ...@@ -700,20 +701,7 @@ p.shopbycate-title {
float: left; float: left;
padding: 10px; padding: 10px;
} }
@media(max-width:789px){
.banner-4-cate{
padding-bottom: 20px;
width: 50%;
}
.view-more-flashsale {
padding: 20px;
}
p.flashsale-title {
padding: 20px;
}
}
.cms-index-index >.page-main , main#maincontent { .cms-index-index >.page-main , main#maincontent {
max-width: inherit !important; max-width: inherit !important;
...@@ -900,6 +888,11 @@ p.flashsale-title { ...@@ -900,6 +888,11 @@ p.flashsale-title {
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
.footer-middle{
margin-top: 60px;
}
@media(max-width:789px){ @media(max-width:789px){
.flash-sale-inner{width:100%;} .flash-sale-inner{width:100%;}
.flash-sale-wpt { .flash-sale-wpt {
...@@ -923,12 +916,6 @@ p.flashsale-title { ...@@ -923,12 +916,6 @@ p.flashsale-title {
} }
} }
@media(min-width:789px){
.footer-middle{
margin-top: 60px;
}
}
footer{ footer{
margin-top: -10px; margin-top: -10px;
} }
...@@ -990,3 +977,18 @@ footer{ ...@@ -990,3 +977,18 @@ footer{
} }
} }
@media(max-width:789px){
.banner-4-cate{
padding-bottom: 20px;
width: 50%;
}
.view-more-flashsale {
padding: 20px;
}
p.flashsale-title {
padding: 20px;
}
}
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