Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into developer

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

@@ -106,12 +106,15 @@
         .free-wrapper {
         .free-wrapper {
             border-bottom: 1px solid #e8e7e7;
             border-bottom: 1px solid #e8e7e7;
             margin-bottom: 10px;
             margin-bottom: 10px;
+            padding-bottom: 10px;
         }
         }
         .free-wrapper , .product-intro__freeshipping-desc{
         .free-wrapper , .product-intro__freeshipping-desc{
             clear: both;
             clear: both;
         }
         }
         .free-wrapper p {
         .free-wrapper p {
             padding-left: 40px;font-size:13px;
             padding-left: 40px;font-size:13px;
+            font-size: 12px;
+            color: #767676;
         }.product-intro__freeshipping-desc {
         }.product-intro__freeshipping-desc {
              padding-left: 40px;font-size:13px;
              padding-left: 40px;font-size:13px;
          }
          }

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

@@ -2276,6 +2276,15 @@ button.action.submit.primary {
   margin-top: -10px;
   margin-top: -10px;
 }
 }
 
 
+
+.swatch-option.color, .swatch-option.image{
+  width: 40px !important;
+  height: 40px !important;
+  background-clip: content-box!important;
+  padding: 3px;
+}
+
+
 //详情页mobile修改
 //详情页mobile修改
 @media (max-width: 1024px){
 @media (max-width: 1024px){
   .product-info-wrapper .page-title span.base {
   .product-info-wrapper .page-title span.base {
@@ -2286,7 +2295,10 @@ button.action.submit.primary {
   }
   }
 
 
   .product-info-wrapper .price-final_price .price {
   .product-info-wrapper .price-final_price .price {
-    color: #000;
+    font-size: 24px;
+    font-weight: 600;
+    font-family: auto;
+    color: black;
   }
   }
 
 
 
 
@@ -2332,13 +2344,12 @@ button.action.submit.primary {
   #size-chart .table-wraper-fix table {
   #size-chart .table-wraper-fix table {
     max-width: 100% !important;
     max-width: 100% !important;
   }
   }
-}
-
-.swatch-option.color, .swatch-option.image{
-  width: 30px !important;
-  height: 30px !important;
-  background-clip: content-box!important;
-  padding: 3px;
+  .swatch-option.color, .swatch-option.image{
+    width: 30px !important;
+    height: 30px !important;
+    background-clip: content-box!important;
+    padding: 3px;
+  }
 }
 }
 
 
 .product-info-main .swatch-option.color, .swatch-option.image{
 .product-info-main .swatch-option.color, .swatch-option.image{
@@ -2371,7 +2382,7 @@ button.action.submit.primary {
 }
 }
 
 
 .swatch-attribute.size .swatch-attribute-selected-option{
 .swatch-attribute.size .swatch-attribute-selected-option{
-  font-size: 15px;
+  font-size: 12px;
   color: rgba(23, 23, 23, 0.6) !important;
   color: rgba(23, 23, 23, 0.6) !important;
 }
 }
 
 
@@ -2382,7 +2393,7 @@ button.action.submit.primary {
   display: none;
   display: none;
 }
 }
 
 
-.swatch-attribute-options.clearfix{margin-top: 20px !important;}
+.fieldset .swatch-attribute-options.clearfix{margin-top: 20px !important;}
 
 
 @media (max-width: 768px){
 @media (max-width: 768px){
   .swatch-attribute-selected-option-size-content span.swatch-attribute-selected-option{
   .swatch-attribute-selected-option-size-content span.swatch-attribute-selected-option{