Skip to content

J
joshine
Commit 14a97364 by 王东红
Options

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

parents 6818803d ad0487c0
Showing with 40 additions and 35 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/widget/new/content/home_news_product.phtml
......@@ -60,32 +60,6 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
<?php if ($templateType) :?>
<?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
<?php endif; ?>
<?php if ($showWishlist || $showCompare || $showCart) :?>
<div class="product-item-actions">
<?php if ($showWishlist || $showCompare) :?>
<div class="actions-secondary" data-role="add-to-links">
<?php if ($this->helper(Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) :?>
<a href="#"
data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>'
class="action towishlist"
data-action="add-to-wishlist"
title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
<span><?= $block->escapeHtml(__('Wish')) ?></span>
</a>
<?php endif; ?>
<?php if ($block->getAddToCompareUrl() && $showCompare) :?>
<?php $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class);?>
<a href="#" class="action tocompare"
data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
<span><?= $block->escapeHtml(__('Compare')) ?></span>
</a>
<?php endif; ?>
</div>
<?php endif; ?>
</div>
<?php endif; ?>
</div>
</div>
</li>
......@@ -158,8 +132,7 @@ ol.product-items.widget-new-grid{
.block-content.home-new-product{
display: contents;
}
.block.widget.block-new-products.grid{
}
@media (max-width: 789px){
li.product-item {
......@@ -176,6 +149,20 @@ ol.product-items.widget-new-grid{
.block-title{
margin-top: -30px;
}
.block.widget.block-new-products.grid{
margin-top: -100px;
}
.product-item-actions {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: flex-end;
margin-top: -30px;
}
.block .block-title strong {
padding: 0px;
}
}
</style>
app/design/frontend/Joshine/breeze/web/css/_custom.less
......@@ -624,14 +624,16 @@ ul {
}
}
@media (max-width: 768px){
#box{
margin: 60px auto;
}
.box-pc{
display: none;
}
.box-moblie{
display: block;
width: 100%;
margin-top: 23px;
margin-left: 5px;
margin-top: 100px;
}
.categories_tab {
height: 330px;
......@@ -680,7 +682,7 @@ p.shopbycate-title {
}
p.shopbycate-title{
font-size:20px;
margin-top: 20px;
margin-top: -20px;
}
.shopcatewpt {
width: 130%;
......@@ -763,7 +765,7 @@ p.shopbycate-title {
}
.cms-index-index .box-blog{padding-bottom:0;}
.baozhang_before_footer{width: 33.333%;float: left;}
.baozhang_before_footer{width: 33.333%;float: left;height: 60px;}
.select-element.section-before-footer.clearfix{ padding: 20px 10px;}
.select-element.section-before-footer.clearfix p{height:60px;font-size: 14px;text-transform: lowercase;}
......@@ -906,7 +908,7 @@ p.flashsale-title {
}
.categories_tab {
height: 400px;
margin-top: 140px;
margin-top: 250px;
}
.page-bottom {
margin-top: 10px;
......@@ -1015,10 +1017,26 @@ footer{
}
.view-more-flashsale {
padding: 20px;
padding: 0px;
}
p.flashsale-title {
padding: 20px;
padding: 0px;
}
}
@media (max-width: 670px) {
.categories_tab {
margin-top: 200px;
}
}
@media (min-width: 670px) {
.categories_tab {
margin-top: 250px;
}
}
@media (min-width: 780px){
.categories_tab {
margin-top: 0px;
}
}
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