Skip to content

J
joshine
Commit db9218f0 by 王东红
Options

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

parents 4bf81f53 b92b27cf
Showing with 38 additions and 21 deletions
app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/widget/new/content/home_news_product.phtml
...@@ -71,7 +71,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()-> ...@@ -71,7 +71,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
type="button" type="button"
title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"> title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
<span><?= $block->escapeHtml(__('Add to Cart')) ?></span> <span><?= $block->escapeHtml(__('Add')) ?></span>
</button> </button>
<?php else :?> <?php else :?>
<?php <?php
...@@ -85,7 +85,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()-> ...@@ -85,7 +85,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
data-post='<?= /* @noEscape */ $postData ?>' data-post='<?= /* @noEscape */ $postData ?>'
type="button" type="button"
title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"> title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
<span><?= $block->escapeHtml(__('Add to Cart')) ?></span> <span><?= $block->escapeHtml(__('Add')) ?></span>
</button> </button>
<?php endif; ?> <?php endif; ?>
<?php else :?> <?php else :?>
...@@ -109,7 +109,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()-> ...@@ -109,7 +109,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
class="action towishlist" class="action towishlist"
data-action="add-to-wishlist" data-action="add-to-wishlist"
title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>"> title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
<span><?= $block->escapeHtml(__('Add to Wish List')) ?></span> <span><?= $block->escapeHtml(__('Wish')) ?></span>
</a> </a>
<?php endif; ?> <?php endif; ?>
<?php if ($block->getAddToCompareUrl() && $showCompare) :?> <?php if ($block->getAddToCompareUrl() && $showCompare) :?>
...@@ -117,7 +117,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()-> ...@@ -117,7 +117,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
<a href="#" class="action tocompare" <a href="#" class="action tocompare"
data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>"> title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
<span><?= $block->escapeHtml(__('Add to Compare')) ?></span> <span><?= $block->escapeHtml(__('Compare')) ?></span>
</a> </a>
<?php endif; ?> <?php endif; ?>
</div> </div>
...@@ -201,6 +201,9 @@ ol.product-items.widget-new-grid{ ...@@ -201,6 +201,9 @@ ol.product-items.widget-new-grid{
width: 100%; width: 100%;
max-width: 50%; max-width: 50%;
} }
.products-grid.grid {
display: list-item !important;
}
} }
</style> </style>
app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
...@@ -27,31 +27,31 @@ ...@@ -27,31 +27,31 @@
<p class="shopbycate-title"> Shop By Cateogry</p> <p class="shopbycate-title"> Shop By Cateogry</p>
<div class="shopcatewpt"> <div class="shopcatewpt">
<div class="shop-by-cata" > <div class="shop-by-cata" >
<a href="https://www.joshine.com/shapewear/thongs-bodysuits-shapewear/strap-control-shorts-shapewear"><img src="/media/wysiwyg/shopbycategory/1-strap.png" alt="" /></a> <a href="/shapewear/thongs-bodysuits-shapewear/strap-control-shorts-shapewear"><img src="/media/wysiwyg/shopbycategory/1-strap.png" alt="" /></a>
</div> </div>
<div class="shop-by-cata" > <div class="shop-by-cata" >
<a href="https://www.joshine.com/shapewear/thongs-bodysuits-shapewear/underbust-bodysuits-shapewear"><img src="/media/wysiwyg/shopbycategory/2-underbust.png" alt="" /></a> <a href="/shapewear/thongs-bodysuits-shapewear/underbust-bodysuits-shapewear"><img src="/media/wysiwyg/shopbycategory/2-underbust.png" alt="" /></a>
</div> </div>
<div class="shop-by-cata" > <div class="shop-by-cata" >
<a href="https://www.joshine.com/shapewear/thongs-bodysuits-shapewear/overbust-bodysuits-shapewear"><img src="/media/wysiwyg/shopbycategory/3-overbust.png" alt="" /></a> <a href="/shapewear/thongs-bodysuits-shapewear/overbust-bodysuits-shapewear"><img src="/media/wysiwyg/shopbycategory/3-overbust.png" alt="" /></a>
</div> </div>
<div class="shop-by-cata" > <div class="shop-by-cata" >
<a href="https://www.joshine.com/shapewear/thongs-bodysuits-shapewear/sleeved-underbust-bodysuits-shapewear"><img src="/media/wysiwyg/shopbycategory/4-sleeved.png" alt="" /></a> <a href="/shapewear/thongs-bodysuits-shapewear/sleeved-underbust-bodysuits-shapewear"><img src="/media/wysiwyg/shopbycategory/4-sleeved.png" alt="" /></a>
</div> </div>
<div class="shop-by-cata" > <div class="shop-by-cata" >
<a href="https://www.joshine.com/shapewear/thongs-bodysuits-shapewear/full-body-shaper-shapewear"><img src="/media/wysiwyg/shopbycategory/5-fullbody.jpg" alt="" /></a> <a href="/shapewear/thongs-bodysuits-shapewear/full-body-shaper-shapewear"><img src="/media/wysiwyg/shopbycategory/5-fullbody.jpg" alt="" /></a>
</div> </div>
<div class="shop-by-cata" > <div class="shop-by-cata" >
<a href="https://www.joshine.com/shapewear/thongs-bodysuits-shapewear/thongs-bodysuits-shapewear"><img src="/media/wysiwyg/shopbycategory/6-thongs.png" alt="" /></a> <a href="/shapewear/thongs-bodysuits-shapewear/thongs-bodysuits-shapewear"><img src="/media/wysiwyg/shopbycategory/6-thongs.png" alt="" /></a>
</div> </div>
<div class="shop-by-cata" > <div class="shop-by-cata" >
<a href="https://www.joshine.com/shapewear/pamaleta-luggage"><img src="/media/wysiwyg/shopbycategory/7-buttlifter.png" alt="" /></a> <a href="/shapewear/pamaleta-luggage"><img src="/media/wysiwyg/shopbycategory/7-buttlifter.png" alt="" /></a>
</div> </div>
<div class="shop-by-cata" > <div class="shop-by-cata" >
<a href="https://www.joshine.com/shapewear/overbust-corset"><img src="/media/wysiwyg/shopbycategory/8-waisttrainer.png" alt="" /></a> <a href="/shapewear/overbust-corset"><img src="/media/wysiwyg/shopbycategory/8-waisttrainer.png" alt="" /></a>
</div> </div>
</div> </div>
</div> </div>
...@@ -61,7 +61,7 @@ echo $this->getLayout()->createBlock("Magento\Catalog\Block\Product\Widget\NewWi ...@@ -61,7 +61,7 @@ echo $this->getLayout()->createBlock("Magento\Catalog\Block\Product\Widget\NewWi
<div class="flash_sale"> <div class="flash_sale">
<a href="https://www.joshine.com/flashsale-0422?product_list_order=price_low"><p class="flashsale-title">⚡FLASH SALE⚡</p> </a> <a href="/flashsale-0422?product_list_order=price_low"><p class="flashsale-title">⚡FLASH SALE⚡</p> </a>
<div class="flash-sale-wpt row" style="background: linear-gradient(to right, #ffffff, #ffffff);" > <div class="flash-sale-wpt row" style="background: linear-gradient(to right, #ffffff, #ffffff);" >
<div class="flash-sale-inner"> <div class="flash-sale-inner">
<?php <?php
...@@ -98,16 +98,16 @@ echo $this->getLayout()->createBlock("Magento\Catalog\Block\Product\Widget\NewWi ...@@ -98,16 +98,16 @@ echo $this->getLayout()->createBlock("Magento\Catalog\Block\Product\Widget\NewWi
<div class="top-content-home"> <div class="top-content-home">
<div class="banner-4-cate"> <div class="banner-4-cate">
<a href="https://www.joshine.com/shapewear" ><img src="/media/wysiwyg/BDS.jpg" alt="" /></a> <a href="/shapewear" ><img src="/media/wysiwyg/BDS.jpg" alt="" /></a>
</div> </div>
<div class="banner-4-cate"> <div class="banner-4-cate">
<a href="https://www.joshine.com/bodysuits-shapewear/bra" ><img src="/media/wysiwyg/Bra_1.jpg" alt="" /></a> <a href="/bodysuits-shapewear/bra" ><img src="/media/wysiwyg/Bra_1.jpg" alt="" /></a>
</div> </div>
<div class="banner-4-cate"> <div class="banner-4-cate">
<a href="https://www.joshine.com/shapewear/control-panties-shapewear" ><img src="/media/wysiwyg/BT.jpg" alt="" /></a> <a href="/shapewear/control-panties-shapewear" ><img src="/media/wysiwyg/BT.jpg" alt="" /></a>
</div> </div>
<div class="banner-4-cate"> <div class="banner-4-cate">
<a href="https://www.joshine.com/shapewear/waist-trainer-corsets" ><img src="/media/wysiwyg/WT.jpg" alt="" /></a> <a href="/shapewear/waist-trainer-corsets" ><img src="/media/wysiwyg/WT.jpg" alt="" /></a>
</div> </div>
</div> </div>
......
app/design/frontend/Joshine/breeze/Magento_Newsletter/templates/subscribe.phtml
...@@ -79,7 +79,8 @@ ...@@ -79,7 +79,8 @@
position: relative; position: relative;
z-index: 1; z-index: 1;
margin-bottom: -18px; margin-bottom: -18px;
margin-top: 10px; margin-top: 80px;
height: 100px;
} }
.field.newsletter{ .field.newsletter{
width: 65%; width: 65%;
...@@ -119,7 +120,7 @@ ...@@ -119,7 +120,7 @@
float: left; float: left;
} }
.newsletter-list ul >li >a > img{ .newsletter-list ul >li >a > img{
max-width: 70%; max-width: 50%;
margin-left: 2px; margin-left: 2px;
} }
@media(max-width:789px) { @media(max-width:789px) {
...@@ -134,6 +135,7 @@ ...@@ -134,6 +135,7 @@
} }
.block.newsletter{ .block.newsletter{
height: 200px; height: 200px;
margin-top: 50px;
} }
.newsletter-list.sub { .newsletter-list.sub {
width: 105%; width: 105%;
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -207,6 +207,9 @@ footer{ ...@@ -207,6 +207,9 @@ footer{
padding: 10px ; padding: 10px ;
} }
footer .footer_link {
margin-bottom: 40px;
}
footer .footer_link .logo_img{ footer .footer_link .logo_img{
margin-top: 10%; margin-top: 10%;
} }
...@@ -230,7 +233,7 @@ footer a{ ...@@ -230,7 +233,7 @@ footer a{
font-family: 'Outfit-Regular'; font-family: 'Outfit-Regular';
} }
@media screen and (max-width:1200px) { @media screen and (max-width:789px) {
.footer_link > div{ .footer_link > div{
width: 100%; width: 100%;
} }
...@@ -678,7 +681,7 @@ p.shopbycate-title { ...@@ -678,7 +681,7 @@ p.shopbycate-title {
width: 130%; width: 130%;
margin: 0 auto; margin: 0 auto;
margin-top: -30px; margin-top: -30px;
margin-left: -38px; margin-left: -33px;
} }
.shop-by-cata img { .shop-by-cata img {
height: 54px; height: 54px;
...@@ -902,8 +905,17 @@ p.flashsale-title { ...@@ -902,8 +905,17 @@ p.flashsale-title {
.page-bottom { .page-bottom {
margin-top: 10px; margin-top: 10px;
} }
.footer-middle{
margin-top: 10px;
}
} }
.footer-middle{
margin-top: 60px;
}
footer{
margin-top: -10px;
}
.page-bottom { .page-bottom {
margin-top: 50px; margin-top: 50px;
} }
......
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