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

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

@@ -1654,11 +1654,8 @@ button.action.submit.primary {
 
   .product-info-wrapper .page-title-wrapper{
     margin-top: -20px;
-    margin-left: 30px;
-  }
-  .product-info-wrapper .product-info-main{
-    margin-left: 30px;
   }
+  
   .swatch-option-tooltip{
     display: none;
   }
@@ -1666,6 +1663,7 @@ button.action.submit.primary {
   .product-info-wrapper .page-title-wrapper h1{
     margin-left: 10px;
     margin-top:10px;
+    line-height: 1.2;
   }
 
   .product.info.detailed,.block.related{
@@ -1691,6 +1689,16 @@ button.action.submit.primary {
     z-index: 11;
   }
 }
+//详情页修改
+@media (min-width: 768px){
+  .product-info-wrapper .page-title-wrapper{
+    margin-top: -20px;
+    margin-left: 30px;
+  }
+  .product-info-wrapper .product-info-main{
+    margin-left: 30px;
+  }
+}
 .swatch-option.color, .swatch-option.text, .swatch-option.image{
 width: 40px !important;
 height: 40px !important;