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

93e89993 · 王东红 · 3649799a · 2d74d3a4 · 93e89993 · 93e89993
Commit 93e89993 authored Oct 11, 2022 by 王东红
4 changed files
--- a/app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml
@@ -333,20 +333,7 @@
        </div>
 </div>
-<div  class="top-content-home">
+<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('home_category_thumnail')->toHtml();?>
-    <div class="banner-4-cate">
-        <a href="/bodysuits.html" ><img src="/media/wysiwyg/BDS.jpg" alt="" /></a>
-    </div>
-    <div class="banner-4-cate">
-        <a href="/bodysuits/bra.html" ><img src="/media/wysiwyg/Bra_1.jpg" alt="" /></a>
-    </div>
-    <div class="banner-4-cate">
-        <a href="/control-panties.html" ><img src="/media/wysiwyg/BT.jpg" alt="" /></a>
-    </div>
-    <div class="banner-4-cate">
-        <a href="/corsets-waist-trainer.html" ><img src="/media/wysiwyg/WT.jpg" alt="" /></a>
-    </div>
-</div>
 <div class="select-element section-before-footer clearfix">
    <div class="container-before-footer clearfix">

--- a/app/design/frontend/Joshine/breeze/Magento_Newsletter/templates/subscribe.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Newsletter/templates/subscribe.phtml
@@ -41,13 +41,13 @@
    <div class="newsletter-list ins">
        <ul>
            <li><a title="Tiktok" href="https://www.tiktok.com/@joshineofficial">
-                        <img src="/media/wysiwyg/1-tiktok.png" alt="">
+                        <img src="/media/wysiwyg/1-tiktok.png" alt="" clss="ins_image">
                </a></li>
            <li><a title="Instagram" href="https://www.instagram.com/JoshineOfficial/">
-                        <img src="/media/wysiwyg/2-instagram.png" alt="">
+                        <img src="/media/wysiwyg/2-instagram.png" alt="" clss="ins_image">
                </a></li>
            <li><a title="Facebook" href="https://www.facebook.com/JoshineOfficial/">
-                        <img src="/media/wysiwyg/3-facebook.png" alt="">
+                        <img src="/media/wysiwyg/3-facebook.png" alt="" clss="ins_image">
                </a></li>
        </ul>
    </div>
@@ -66,6 +66,7 @@
        margin-top: 80px;
        height: 100px;
    }
    .field.newsletter{
        width: 65%;
        float: left;
@@ -85,10 +86,10 @@
        background: #000;
    }
    .newsletter-list > span {
-        color: #fff;
        text-transform: uppercase;
        line-height: 80px;
        font-size: smaller;
+        color: #ffffff;
        font-weight: 600;
    }
    .newsletter-list.ins  {
@@ -102,39 +103,47 @@
    }
    .newsletter-list ul >li{
        float: left;
+        margin-left: 20px;
    }
-    .newsletter-list ul >li >a > img{
+    .ins_image{
-        max-width: 50%;
+        max-width: 100%;
        margin-left: 2px;
+        width: 50px;
    }
    @media(max-width:789px) {
        .newsletter-list {
            width: 100%;
            float: left;
-            text-align: inherit;
+            text-align: center;
+            margin-top: 13px;
        }
         .newsletter-list ul{
            justify-content: center;
        }
+        .newsletter-list ul >li{
+            padding-left: 10px;
+            width: 50px;
+        }
        .block.newsletter{
-            height: 140px;
+            height: 200px;
            margin-top: 0px;
-            background: none;
+            padding: 10px;
        }
        .newsletter-list.sub  {
            width: 105%;
-            margin-top: -1%;
+            margin-top: 3%;
        }
        .newsletter-list.ins  {
            width: 100%;
            text-align: inherit;
+            margin-top: 5%;
        }
        .actions .subscribe {
            margin-left: -16px;
            width: 30%;
        }
        .newsletter-list > span {
-            color: #000;
            text-transform: uppercase;
            line-height: 40px;
            font-size: smaller;
@@ -143,7 +152,6 @@
        .newsletter-list ul >li >a > img{
            max-width: 50%;
            margin-left: 2px;
-            background-color: black;
            width: 100%;
            height: 100%;
            border-radius: 50%;

--- a/app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/footer.phtml
+++ b/app/design/frontend/Joshine/breeze/Magento_Theme/templates/html/footer.phtml
@@ -22,35 +22,35 @@ $logoHeight = $logoSizeResolver !== null && $logoSizeResolver->getHeight()
 <div class="footer-container">
    <div class="footer_link">
-        <div style="text-align: center;color: #ffffff;" >
+        <div style="text-align: center;color: #ffffff;padding-bottom: 30px;" >
            <img src="/media/wysiwyg/joshine_logo_1.png" width="200px;"  class="logo_img" id="footer_logo">
-            <h4 id="footer_logo_name">JOSHINE info</h4>
        </div>
        <div>
            <h4>ABOUT JOSHINE <span> > </span></h4>
            <ul>
-                <li><a href="#">About Us</a></li>
+                <li><a href="/about-us">About Us</a></li>
-                <li>About Our Products</li>
+                <li><a href="/about-our-products">About Our Products</a></li>
-                <li>Contact Us</li>
+                <li><a href="/contact-us">Contact Us</a></li>
                <li>Our Blog</li>
            </ul>
        </div>
        <div>
            <h4>HELP & SUPPORT<span> > </span></h4>
            <ul>
-                <li>Size Guide</li>
+                <li><a href="/size-guide">Size Guide</a></li>
-                <li>Payment Methods</li>
+                <li><a href="/payment-methods">Payment Methods</a></li>
-                <li>FAQs</li>
+                <li><a href="/faqs">FAQs</a></li>
-                <li>How to Order</li>
+                <li><a href="/how-to-order">How to Order</a></li>
-                <li>Track My Order</li>
+                <li><a href="/track-order">Track My Order</a></li>
            </ul>
        </div>
        <div>
            <h4>OUR POLICY<span> > </span></h4>
            <ul>
-                <li>Shipping Policy</li>
+                <li><a href="/shipping-policy">Shipping Policy</a></li>
-                <li>Return & Exchange</li>
+                <li><a href="/return-exchange-policy">Return & Exchange</a></li>
-                <li>365-Days Warranty</li>
+                <li><a href="/365-days-warranty">365-Days Warranty</a></li>
            </ul>
        </div>
    </div>

--- a/app/design/frontend/Joshine/breeze/web/css/_custom.less
+++ b/app/design/frontend/Joshine/breeze/web/css/_custom.less
@@ -412,23 +412,19 @@ footer .footer_link{
    margin-top: 10%;
  }
  footer a{
-    color: #222;
    text-decoration: auto;
    font-size: 14px;
  }
-  #footer_logo{
-    display: none;
-  }
  #footer_logo_name{
    display: block;
-    color: #222;
+    color: #ffffff;
    float: left;
    font-weight: 600;
    margin-top: 10px;
  }
  .footer_link > div {
    width: 100%;
-    color: #222;
+    color: #fff;
    margin-top: 10px;
  }
@@ -915,7 +911,7 @@ p.flashsale-title {
    height: 400px;
  }
  .page-bottom {
-    margin-top: 10px;
+    margin-top: 30px;
  }
  .footer-middle{
    margin-top: 10px;
@@ -1613,8 +1609,7 @@ footer{
  }
  footer{
    padding-top: 115px;
-    margin-top: -120px;
+    margin-top: -80px;
-    background-color: #f6f6f6;
    margin-bottom: env(safe-area-inset-bottom);
  }
@@ -1688,6 +1683,12 @@ button.action.submit.primary {
  width: 300px;
 }
+@media (min-width: 780px) {
+  .action.primary.tocart{
+    width: 500px !important;
+  }
+}
 #product-intro__freeshipping-more-3{
  display: inline-block;
  color: #2d68a8;
@@ -1799,6 +1800,15 @@ border-radius: 50% !important;;
 display: none !important;
 }
+@media (max-width: 768px){
+  .product-item-info > product-item-details > div > .swatch-attribute.color > div > .swatch-option.color {
+    width: 30px !important;;
+    height: 30px !important;;
+    border-radius: 50% !important;;
+  }
+}
 //商品评论
 .amreview-submit-form .review-fieldset .review-legend.legend>span {
@@ -1806,7 +1816,7 @@ float: left;
 margin: 0 5px 0 0;
 font-weight: bold;
 }
-@media (min-width: 768px){
+@media (max-width: 768px){
  .product.info .review-add {
  float: left;
  width: 100% !important;