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

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()->
                                                                 data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
                                                                 type="button"
                                                                 title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add')) ?></span>
+                                                            <span><?= $block->escapeHtml(__('Add Cart')) ?></span>
                                                         </button>
                                                     <?php else :?>
                                                         <?php
@@ -85,7 +85,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                                 data-post='<?= /* @noEscape */ $postData ?>'
                                                                 type="button"
                                                                 title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add')) ?></span>
+                                                            <span><?= $block->escapeHtml(__('Add Cart')) ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else :?>
@@ -143,6 +143,9 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
     text-align: center;
     font-size: x-large;
 }
+ .actions-secondary a{
+     color: #000;
+ }
 .product-item-name .product-item-link{
       text-overflow: ellipsis;
       white-space: nowrap;
@@ -204,6 +207,13 @@ ol.product-items.widget-new-grid{
     .grid {
         display: list-item !important;
     }
+
+    ol.product-items.widget-new-grid{
+        margin-top: 1px;
+    }
+    .block-title{
+        margin-top: -30px;
+    }
 }
 
 </style>

app/design/frontend/Joshine/breeze/Magento_Newsletter/templates/subscribe.phtml

@@ -135,7 +135,7 @@
         }
         .block.newsletter{
             height: 200px;
-            margin-top: 50px;
+            margin-top: 0px;
         }
         .newsletter-list.sub  {
             width: 105%;

app/design/frontend/Joshine/breeze/web/css/_custom.less

@@ -616,6 +616,7 @@ ul {
 @media (min-width: 768px){
   .box-pc{
     display: block;
+    margin-top: -6px;
   }
   .box-moblie{
     display: none;
@@ -628,8 +629,8 @@ ul {
   .box-moblie{
     display: block;
     width: 100%;
-    margin-top: 24px;
-    margin-left: -10px;
+    margin-top: 23px;
+    margin-left: 5px;
   }
   .categories_tab {
     height: 330px;
@@ -678,13 +679,13 @@ p.shopbycate-title {
   }
   p.shopbycate-title{
     font-size:20px;
-    margin-top: 50px;
+    margin-top: 20px;
   }
   .shopcatewpt {
     width: 130%;
     margin: 0 auto;
-    margin-top: -30px;
-    margin-left: -33px;
+    margin-top: -20px;
+    margin-left: -40px;
   }
   .shop-by-cata img {
     height: 54px;
@@ -704,6 +705,14 @@ p.shopbycate-title {
     padding-bottom: 20px;
     width: 50%;
   }
+
+  .view-more-flashsale {
+    padding: 20px;
+  }
+
+  p.flashsale-title {
+    padding: 20px;
+  }
 }
 
 .cms-index-index >.page-main , main#maincontent {
@@ -904,6 +913,7 @@ p.flashsale-title {
   }
   .categories_tab {
     height: 400px;
+    margin-top: 140px;
   }
   .page-bottom {
     margin-top: 10px;
@@ -913,14 +923,17 @@ p.flashsale-title {
   }
 }
 
-.footer-middle{
-  margin-top: 60px;
+@media(min-width:789px){
+  .footer-middle{
+    margin-top: 60px;
+  }
 }
+
 footer{
   margin-top: -10px;
 }
 .page-bottom {
-  margin-top: 50px;
+  margin-top: 10px;
 }
 
 .navigation-wrapper{