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

app/code/Magento/Sales/Model/Order/Shipment/Validation/QuantityValidator.php

@@ -75,9 +75,9 @@ class QuantityValidator implements ValidatorInterface
                 $totalQuantity += $item->getQty();
             }
         }
-        if ($totalQuantity <= 0) {
-            $messages[] = __('You can\'t create a shipment without products.');
-        }
+//        if ($totalQuantity <= 0) {
+//            $messages[] = __('You can\'t create a shipment , .');
+//        }
 
         return $messages;
     }

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

@@ -169,7 +169,7 @@
         height: 55px;
         width: 300px;
     }
-    @media (max-width: 780px){
+    @media (max-width: 1024px){
         #product-intro__freeshipping-more-3{
             margin-top: 7px;
             float: right;
@@ -208,7 +208,7 @@
                 font-weight: 500;
         }
     }
-    @media (min-width: 780px) {
+    @media (min-width: 1024px) {
         #wishlist{
             width: 10%;
             float: left;

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

@@ -27,12 +27,12 @@ $sizes = $responsiveImageHelper->getSizes('product_page_image_medium');
 $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
 ?>
 <style>
-@media (min-width: 768px){
-.main-image-wrapper .mobile-pic{
+@media (min-width: 1024px){
+    .main-image-wrapper .mobile-pic{
                 display: none !important;
-        }
+    }
 }
- @media (max-width: 768px){
+ @media (max-width: 1024px){
         .main-image-wrapper > img{
             display:none;
         }
@@ -60,6 +60,11 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
             --container-max-width: 80%;
         } 
 }
+@media(min-width: 768px) {
+    .breadcrumbs ul {
+        width: 80%;
+    }
+}
     
 </style>
 
@@ -195,6 +200,7 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
             margin-top: -20px;
         }
     }
+
 </style>
 <script>
     require([

app/design/frontend/Joshine/breeze/Magento_Catalog/web/js/catalog-add-to-cart.js

@@ -224,7 +224,7 @@ define([
             }, 1000);
             setTimeout(function () {
                 $('[data-block="minicart"]').find('[data-role="dropdownDialog"]').dropdownDialog('open');
-            }, 3000);
+            }, 2000);
 
 
         }

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

@@ -158,6 +158,12 @@
             border-radius: 50%;
         }
     }
+    @media(max-width:1280px) {
+        .actions .subscribe {
+            width: 33%;
+        }
+    }
+
 </style>
 <script type="text/x-magento-init">
     {

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

@@ -91,7 +91,7 @@
   margin-right: auto !important;
   max-width: 1280px;
 }
-@media (max-width: 767px){
+@media (max-width: 1024px){
   .box-tocart .fieldset .actions
   {
     position: fixed;
@@ -107,9 +107,19 @@
     padding-left: 10px;
   }
   .box-tocart .fieldset .actions  > button{
-    width: 80%;
+    width: 85% !important;
     float: right;
-    margin-left: 20%;
+    margin-left: 15%;
+  }
+
+  .action.primary.tocart {
+    font-size: 18px;
+    background-color: #000;
+    max-width: 100%;
+    font-weight: 600;
+    height: 55px;
+    width: 90% !important;
+    margin-left: 10%;
   }
 
   .block .review-add .block-content{
@@ -241,7 +251,7 @@ footer .footer_link{
   font-family: 'Outfit-Regular';
 }
 
-@media screen and (max-width:789px) {
+@media screen and (max-width:1024px) {
   .footer_link > div{
     width: 100%;
   }
@@ -633,7 +643,7 @@ ul {
 }
 #shipping-zip-form .field .label{font-size: 14px;color: #555555;}
 #co-shipping-method-form .item-options .radio{margin-top: 4px;}
-@media (min-width: 768px){
+@media (min-width: 1024px){
   .product-info-wrapper {
     row-gap: 0;
     grid-template-columns: 1fr 1fr;
@@ -649,16 +659,6 @@ ul {
     justify-content: space-between;
   }
 }
-.product-info-wrapper .page-title span.base{
-  text-transform: none;
-  font-size: 20px;
-  font-weight: 400;
-  color: #292929;
-  padding-bottom: 1px;
-  margin-bottom: 0;
-  display: inline-block;
-  letter-spacing: -1.5px;
-}
 
 .cms-home .cms-index-index .page-layout-1column > main#maincontent {
   max-width: fit-content;
@@ -1979,25 +1979,22 @@ button.action.submit.primary {
 }
 
 //详情页mobile修改
-@media (max-width: 780px){
+@media (max-width: 1024px){
   .product-info-stock-sku{
     display: none;
   }
   .product-info-wrapper .page-title span.base {
-    color: #999999;
     font-size: medium;
     float: left;
     margin-left: -10px;
     letter-spacing: inherit;
+    font-weight: 100;
   }
 
   .product-info-wrapper .price-final_price .price {
     color: #000;
   }
 
-  .product-info-price .price-box{
-    margin-top: -15px;
-  }
 
   .price-final_price .old-price .price{
     color: #999999;
@@ -2044,11 +2041,7 @@ button.action.submit.primary {
   }
 }
 //详情页修改
-@media (min-width: 768px){
-  .product-info-wrapper .page-title-wrapper{
-    margin-top: -20px;
-    margin-left: 30px;
-  }
+@media (min-width: 1024px){
   .product-info-wrapper .product-info-main{
     margin-left: 30px;
   }
@@ -2082,7 +2075,7 @@ border-radius: 50% !important;;
 display: none !important;
 }
 
-@media (max-width: 768px){
+@media (max-width: 1024px){
   #product-options-wrapper .swatch-option.image{
     width: 30px !important;;
     height: 30px !important;;
@@ -2288,7 +2281,26 @@ span.swatch-attribute-selected-option{
   color: blue;
 }
 
-//.swatch-option.selected::before{
-//  box-shadow: 0 0 0 1px inset rgba(var(--brand-color), var(--brand-alpha, 1)), 0 0 0 3px inset #ffffff;
-//}
+//product view right
+@media(min-width: 1024px) {
+
+  .product-info-wrapper .page-title-wrapper {
+    margin-left: 10%;
+    width: 80%;
+  }
+  .product-info-wrapper .page-title span.base{
+    font-size: 20px;
+    font-weight: 400;
+    color: #292929;
+    padding-bottom: 1px;
+    margin-bottom: 0;
+    line-height: 0px;
+  }
+
+  .product-info-wrapper .product-info-main {
+    margin-left: 10%;
+    width: 80%;
+  }
+}
+