Skip to content

J
joshine
Commit f9e53aae by 王东红
Options

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

parents ce7c82a7 1c2d0eca
Showing with 34 additions and 11 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')) ?></span> <span><?= $block->escapeHtml(__('Add Cart')) ?></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')) ?></span> <span><?= $block->escapeHtml(__('Add Cart')) ?></span>
</button> </button>
<?php endif; ?> <?php endif; ?>
<?php else :?> <?php else :?>
...@@ -143,6 +143,9 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()-> ...@@ -143,6 +143,9 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
text-align: center; text-align: center;
font-size: x-large; font-size: x-large;
} }
.actions-secondary a{
color: #000;
}
.product-item-name .product-item-link{ .product-item-name .product-item-link{
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
...@@ -204,6 +207,13 @@ ol.product-items.widget-new-grid{ ...@@ -204,6 +207,13 @@ ol.product-items.widget-new-grid{
.grid { .grid {
display: list-item !important; display: list-item !important;
} }
ol.product-items.widget-new-grid{
margin-top: 1px;
}
.block-title{
margin-top: -30px;
}
} }
</style> </style>
app/design/frontend/Joshine/breeze/Magento_Newsletter/templates/subscribe.phtml
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
} }
.block.newsletter{ .block.newsletter{
height: 200px; height: 200px;
margin-top: 50px; margin-top: 0px;
} }
.newsletter-list.sub { .newsletter-list.sub {
width: 105%; width: 105%;
......
app/design/frontend/Joshine/breeze/web/css/_custom.less
...@@ -616,6 +616,7 @@ ul { ...@@ -616,6 +616,7 @@ ul {
@media (min-width: 768px){ @media (min-width: 768px){
.box-pc{ .box-pc{
display: block; display: block;
margin-top: -6px;
} }
.box-moblie{ .box-moblie{
display: none; display: none;
...@@ -628,8 +629,8 @@ ul { ...@@ -628,8 +629,8 @@ ul {
.box-moblie{ .box-moblie{
display: block; display: block;
width: 100%; width: 100%;
margin-top: 24px; margin-top: 23px;
margin-left: -10px; margin-left: 5px;
} }
.categories_tab { .categories_tab {
height: 330px; height: 330px;
...@@ -678,13 +679,13 @@ p.shopbycate-title { ...@@ -678,13 +679,13 @@ p.shopbycate-title {
} }
p.shopbycate-title{ p.shopbycate-title{
font-size:20px; font-size:20px;
margin-top: 50px; margin-top: 20px;
} }
.shopcatewpt { .shopcatewpt {
width: 130%; width: 130%;
margin: 0 auto; margin: 0 auto;
margin-top: -30px; margin-top: -20px;
margin-left: -33px; margin-left: -40px;
} }
.shop-by-cata img { .shop-by-cata img {
height: 54px; height: 54px;
...@@ -704,6 +705,14 @@ p.shopbycate-title { ...@@ -704,6 +705,14 @@ p.shopbycate-title {
padding-bottom: 20px; padding-bottom: 20px;
width: 50%; 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 {
...@@ -904,6 +913,7 @@ p.flashsale-title { ...@@ -904,6 +913,7 @@ p.flashsale-title {
} }
.categories_tab { .categories_tab {
height: 400px; height: 400px;
margin-top: 140px;
} }
.page-bottom { .page-bottom {
margin-top: 10px; margin-top: 10px;
...@@ -913,14 +923,17 @@ p.flashsale-title { ...@@ -913,14 +923,17 @@ p.flashsale-title {
} }
} }
.footer-middle{ @media(min-width:789px){
margin-top: 60px; .footer-middle{
margin-top: 60px;
}
} }
footer{ footer{
margin-top: -10px; margin-top: -10px;
} }
.page-bottom { .page-bottom {
margin-top: 50px; margin-top: 10px;
} }
.navigation-wrapper{ .navigation-wrapper{
......
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