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

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

@@ -91,6 +91,8 @@
         margin-top: -10px;
         margin-top: -10px;
         font-weight: 700;
         font-weight: 700;
         margin-left: 60%;
         margin-left: 60%;
+        width: 50%;
+        float: right;
     }
     }
     .action.primary.tocart{
     .action.primary.tocart{
         font-size: 18px;
         font-size: 18px;
@@ -102,8 +104,9 @@
     }
     }
     @media (max-width: 780px){
     @media (max-width: 780px){
         #product-intro__freeshipping-more-3{
         #product-intro__freeshipping-more-3{
-            margin-top: -20px;
-            margin-bottom: 10px;
+            margin-top: 7px;
+            float: right;
+            width: 20%;
         }
         }
         #wishlist{
         #wishlist{
             display: none;
             display: none;

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

 <?php
 <?php
 $images = $block->getGalleryImages()->getItems();
 $images = $block->getGalleryImages()->getItems();
-$mainImage = current(array_filter($images, function ($img) use ($block) {
-    return $block->isMainImage($img);
-}));
+$mainImage = null;
 
 
 if (!empty($images) && empty($mainImage)) {
 if (!empty($images) && empty($mainImage)) {
     $mainImage = $block->getGalleryImages()->getFirstItem();
     $mainImage = $block->getGalleryImages()->getFirstItem();
+
 }
 }
 
 
 $helper = $block->getData('imageHelper');
 $helper = $block->getData('imageHelper');
@@ -197,8 +196,6 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
     ], function ($) {
     ], function ($) {
         $(".thumbnails > a").removeClass("active");
         $(".thumbnails > a").removeClass("active");
         $(".thumbnails > a:first").addClass("active");
         $(".thumbnails > a:first").addClass("active");
-        var main_img = $(".thumbnails > a:first").attr("name");
-        $(".main-image").attr("src",main_img);
 
 
         $(".thumbnails > a").mouseover(function (s) {
         $(".thumbnails > a").mouseover(function (s) {
             var main_img = $(this).attr("name");
             var main_img = $(this).attr("name");