Merge branch 'developer' into haowei/topmenu

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

@@ -31,6 +31,9 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
     .main-image-wrapper .mobile-pic{
     .main-image-wrapper .mobile-pic{
                 display: none !important;
                 display: none !important;
     }
     }
+    .stage {
+        min-width: 800px !important;
+    }
 }
 }
  @media (max-width: 1024px){
  @media (max-width: 1024px){
         .main-image-wrapper > img{
         .main-image-wrapper > img{
@@ -197,7 +200,7 @@ $thumbSizes = $responsiveImageHelper->getSizes('product_page_image_small');
         .breeze-gallery {
         .breeze-gallery {
             display: flex;
             display: flex;
             flex-direction: column;
             flex-direction: column;
-            margin-top: -20px;
+            margin-top: -35px;
         }
         }
     }
     }
     @media (max-width: 1024px){
     @media (max-width: 1024px){

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

@@ -65,26 +65,6 @@
   font-size: 14px;
   font-size: 14px;
 }
 }
 
 
-//.product-info-wrapper .page-title-wrapper span.base{
-//  text-transform: none;
-//  font-weight: 400;
-//  color: #292929;
-//  padding-bottom: 1px;
-//  margin-bottom: 0;
-//  font-family: Outfit-Regular, sans-serif;
-//  font-size: 20px;
-//  display: block !important;
-//}
-
-//.old-price  > span .price-label{
-//  display: none;
-//}
-//
-//.old-price #old-price-1 > span{
-//  text-decoration: line-through;
-//  font-size: large;
-//}
-
 .cms-page-view .columns{
 .cms-page-view .columns{
   box-sizing: border-box;
   box-sizing: border-box;
   margin-left: auto !important;
   margin-left: auto !important;
@@ -1177,8 +1157,6 @@ footer{
 .opc-progress-bar-item._active>span:after{
 .opc-progress-bar-item._active>span:after{
   border-color: #ecc09f;
   border-color: #ecc09f;
   background: #ecc09f;
   background: #ecc09f;
-  //content: '\e610';
-  //font-family: 'luma-icons';
 }
 }
 .opc-progress-bar-item._complete:hover:before{
 .opc-progress-bar-item._complete:hover:before{
   background: #d7d7d7;
   background: #d7d7d7;
@@ -1225,11 +1203,7 @@ footer{
 .block.widget.block-viewed-products-grid{
 .block.widget.block-viewed-products-grid{
   display: none;
   display: none;
 }
 }
-//@media(max-width: 639.98px){
-//  .switcher.currency{
-//    display: none;
-//  }
-//}
+
 .navigation-min-box{
 .navigation-min-box{
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
@@ -1618,10 +1592,7 @@ footer{
   }
   }
 
 
 }
 }
-//.product-items .product-item-photo:hover {
-//  transform: scale(1.02);
-//  transition: all 0.5s ease;
-//}
+
 
 
 .image0.image-switch {
 .image0.image-switch {
   postion: relative;
   postion: relative;
@@ -2045,18 +2016,6 @@ background-color: #000;
   }
   }
 }
 }
 
 
-//产品评论form表单默认隐藏
-
-//.block.review-add.amreview-submit-form{
-//  display: none;
-//}
-//
-//.slick-track{
-//  width: 100% !important;
-//}
-//.amreview-images.slick-slider .slick-slide{
-//  width: 100px !important;
-//}
 
 
 .block.review-add.amreview-submit-form{
 .block.review-add.amreview-submit-form{
   display: none;
   display: none;
@@ -2069,7 +2028,7 @@ background-color: #000;
     top: 20%;
     top: 20%;
   }
   }
   .product-info-wrapper .page-title-wrapper {
   .product-info-wrapper .page-title-wrapper {
-    margin-left: 10%;
+    margin-left: 5%;
     width: 80%;
     width: 80%;
   }
   }
   .product-info-wrapper .page-title span.base{
   .product-info-wrapper .page-title span.base{
@@ -2082,7 +2041,7 @@ background-color: #000;
   }
   }
 
 
   .product-info-wrapper .product-info-main {
   .product-info-wrapper .product-info-main {
-    margin-left: 10%;
+    margin-left: 5%;
     width: 80%;
     width: 80%;
   }
   }
 
 
@@ -2462,6 +2421,11 @@ div#shipping-method-buttons-container {
   display: none;
   display: none;
 }
 }
 @media(min-width: 1024px) {
 @media(min-width: 1024px) {
+  li.item.product.product-item:hover{
+    border: 1px solid #F0F0F0;
+    padding: 10px;
+    box-shadow: 0 10px 5px #888888;
+  }
   .payment-method-content {
   .payment-method-content {
     width: 55%;
     width: 55%;
     margin-top: -6%;
     margin-top: -6%;
@@ -2569,6 +2533,5 @@ strong#block-related-heading,strong#block-upsell-heading{ font-weight: 600; colo
   position:fixed;
   position:fixed;
   width: 4%;
   width: 4%;
   z-index: 10;
   z-index: 10;
-
 }
 }