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

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addto.phtml

@@ -222,7 +222,7 @@ if ($description)  :
     <div class="joshine-desction">
     <div class="joshine-desction">
         <div id="accordion" data-mage-init='{
         <div id="accordion" data-mage-init='{
         "accordion":{
         "accordion":{
-            "active": [1, 2],
+            "active": [0],
             "collapsible": true,
             "collapsible": true,
             "openedState": "active",
             "openedState": "active",
             "multipleCollapsible": true
             "multipleCollapsible": true
@@ -230,7 +230,7 @@ if ($description)  :
             <div data-role="collapsible">
             <div data-role="collapsible">
                 <div data-role="trigger" class="description-button">
                 <div data-role="trigger" class="description-button">
                     <a class="desction-left description info-desc" href="#">description</a>
                     <a class="desction-left description info-desc" href="#">description</a>
-                    <a class="desction-right description info-desc"  href="#">+</a>
+                    <a class="desction-right description info-desc"  href="#">-</a>
                 </div>
                 </div>
             </div>
             </div>
             <div data-role="content" id="description">
             <div data-role="content" id="description">

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/view/addtocart.phtml

@@ -134,7 +134,12 @@
             </ul>
             </ul>
             <div class="area-content">
             <div class="area-content">
                 <div id="size-chart" style="display: none;">
                 <div id="size-chart" style="display: none;">
-                    <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-size-chart')->toHtml();?>
+                    <?php
+                    $productCharTemplate = $block->getProduct()->getAttributeText("sizeTemplate");
+                    if (empty($block->getProduct()->getAttributeText("sizeTemplate"))){
+                        $productCharTemplate = "product-size-chart-default";
+                    }
+                    echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId($productCharTemplate)->toHtml();?>
                 </div>
                 </div>
                 <div  id="free-return" style="display: none;">
                 <div  id="free-return" style="display: none;">
                     <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-free-return')->toHtml();?>
                     <?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-free-return')->toHtml();?>

app/design/frontend/Joshine/breeze/Magento_Cms/templates/default/home.phtml

@@ -190,7 +190,7 @@
             }
             }
         }
         }
 
 
-        var img_arr =  ["/media/wysiwyg/2_1_.jpg", "/media/wysiwyg/1_1_.jpg"];
+        var img_arr =  ["/media/wysiwyg/202210281.png", "/media/wysiwyg/202210282.png"];
         if (isMobile()) {
         if (isMobile()) {
             img_arr =  ["/media/wysiwyg/2_M_1_.jpg", "/media/wysiwyg/1_M_1_.jpg"];
             img_arr =  ["/media/wysiwyg/2_M_1_.jpg", "/media/wysiwyg/1_M_1_.jpg"];
         }
         }

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

@@ -2429,4 +2429,39 @@ span.swatch-attribute-selected-option{
   }
   }
 }
 }
 
 
+@media (max-width: 1024px){
+  .select-element.section-before-footer.clearfix p {
+    font-weight: 200;
+    font-size: 12px;
+    color: #909090;
+    text-transform: none;
+  }
+}
+
+@media (max-width: 1024px) and (min-width: 768px){
+  .select-element.section-before-footer.clearfix p {
+    font-weight: 400;
+    font-size: 16px;
+    color: #909090;
+    text-transform: none;
+  }
+
+  .flash-sale-item{
+     width: 33.33%;
+  }
+
+  .shopcatewpt{
+    width: 100%;
+  }
+  .shop-by-cata {
+    padding: 10px;
+    width: 50%;
+    float: left;
+  }
+}
+
+
+
+
+