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

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

@@ -87,10 +87,12 @@
     }
     .newsletter-list > span {
         text-transform: uppercase;
-        line-height: 80px;
-        font-size: smaller;
+        line-height: 10px;
+        font-size: xx-small;
         color: #ffffff;
-        font-weight: 600;
+        display: inline-block;
+        vertical-align: middle;
+        margin-top: 10%;
     }
     .newsletter-list.ins  {
         width: 35%;
@@ -110,6 +112,9 @@
         margin-left: 2px;
         width: 50px;
     }
+    @media(max-width:1024px) {
+
+    }
     @media(max-width:789px) {
         .newsletter-list {
             width: 100%;
@@ -158,6 +163,16 @@
             border-radius: 50%;
         }
     }
+    @media(max-width:1024px) and (min-width:768px) {
+        .block.newsletter{
+            width: 90%;
+            max-width: 90%;
+        }
+        .newsletter-list > span {
+            margin-top: 15%;
+        }
+    }
+
     @media(max-width:1280px) {
         .actions .subscribe {
             width: 33%;

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

@@ -107,9 +107,9 @@
     padding-left: 10px;
   }
   .box-tocart .fieldset .actions  > button{
-    width: 85% !important;
+    width: 80% !important;
     float: right;
-    margin-left: 15%;
+    margin-left: 20%;
   }
 
   .action.primary.tocart {

lib/web/mage/gallery/gallery.js

@@ -186,7 +186,7 @@ define([
             settings.focusableStart = this.settings.$element.find('[data-gallery-role="fotorama__focusable-start"]');
             settings.focusableEnd = this.settings.$element.find('[data-gallery-role="fotorama__focusable-end"]');
             settings.closeIcon = this.settings.$element.find('[data-gallery-role="fotorama__fullscreen-icon"]');
-            settings.fullscreenConfig.swipe = true;
+            //settings.fullscreenConfig.swipe = true;
 
             settings.$gallery.on('fotorama:fullscreenenter', function () {
                 settings.closeIcon.show();
@@ -537,9 +537,9 @@ define([
                     returnCurrentImages: function () {
                         var images = [];
 
-                        _.each(this.fotorama.data, function (item) {
-                            images.push(_.omit(item, '$navThumbFrame', '$navDotFrame', '$stageFrame', 'labelledby'));
-                        });
+                        // _.each(this.fotorama.data, function (item) {
+                        //     images.push(_.omit(item, '$navThumbFrame', '$navDotFrame', '$stageFrame', 'labelledby'));
+                        // });
 
                         return images;
                     },