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

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

@@ -183,6 +183,7 @@ $short_description = $this->helper(Magento\Catalog\Helper\Output::class)->produc
     $block->getProduct()->getShortDescription(),
     $block->getProduct()->getShortDescription(),
     'short_description'
     'short_description'
 );
 );
+if ($short_description)  :
 ?>
 ?>
 <div class="joshine-desction">
 <div class="joshine-desction">
     <div id="accordion" data-mage-init='{
     <div id="accordion" data-mage-init='{
@@ -205,6 +206,7 @@ $short_description = $this->helper(Magento\Catalog\Helper\Output::class)->produc
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>
+<?php endif; ?>
 <script>
 <script>
     require([
     require([
         'jquery'
         'jquery'
@@ -220,7 +222,7 @@ $short_description = $this->helper(Magento\Catalog\Helper\Output::class)->produc
         setTimeout(function(){
         setTimeout(function(){
             $("#product-intro-fast-delivery").show();
             $("#product-intro-fast-delivery").show();
             $("#product-intro-free-return").show();
             $("#product-intro-free-return").show();
-        },3000);
+        },5000);
     });
     });
 </script>
 </script>
 
 

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

@@ -67,11 +67,11 @@
                     '        <a href="javascript:void(0);">Size Guide</a></span></div>';
                     '        <a href="javascript:void(0);">Size Guide</a></span></div>';
                 $(".swatch-attribute.size > span:last").after(size);
                 $(".swatch-attribute.size > span:last").after(size);
             }
             }
-        },1000);
+        },3000);
         setTimeout(function(){
         setTimeout(function(){
             var content = '<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-size-chart')->toHtml();?>';
             var content = '<?php echo $block->getLayout()->createBlock('Magento\Cms\Block\Block')->setBlockId('product-intro-size-chart')->toHtml();?>';
             $("#product-intro-size-chart").html(content);
             $("#product-intro-size-chart").html(content);
-        },3000);
+        },5000);
 
 
 
 
     });
     });

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

@@ -41,10 +41,12 @@
     require([
     require([
         'jquery'
         'jquery'
     ], function ($) {
     ], function ($) {
-        console.log("jquery is work!")
         setTimeout(function(){
         setTimeout(function(){
             $("#tab-label-reviews").trigger("click");
             $("#tab-label-reviews").trigger("click");
         },3000);
         },3000);
+        setTimeout(function(){
+            $("#tab-label-reviews").trigger("click");
+        },8000);
     });
     });
 </script>
 </script>
 
 

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

@@ -1720,6 +1720,7 @@ button.action.submit.primary {
 .swatch-option.color, .swatch-option.text, .swatch-option.image{
 .swatch-option.color, .swatch-option.text, .swatch-option.image{
 width: 40px !important;
 width: 40px !important;
 height: 40px !important;
 height: 40px !important;
+  border: 1px solid #000008;
 }
 }
 
 
 .block-minicart .block-content>.actions .action.checkout{
 .block-minicart .block-content>.actions .action.checkout{