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

app/code/Joshine/Review/view/frontend/templates/product/view/list.phtml

@@ -52,6 +52,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
     }
     }
 
 
 </style>
 </style>
+<div class="block review-list joshine-clearfix" id="customer-reviews">
 
 
 <div class="joshine-review-container joshine-clearfix joshine-hidden-md joshine-hidden-sm joshine-hidden-xs">
 <div class="joshine-review-container joshine-clearfix joshine-hidden-md joshine-hidden-sm joshine-hidden-xs">
     <h1 class="joshine-review-title">
     <h1 class="joshine-review-title">
@@ -252,7 +253,7 @@ $imagesBlock = $helper->getReviewImagesBlock(15, $block->getProductId());
     </div>
     </div>
 </div>
 </div>
 </div>
 </div>
-
+</div>
 <style>
 <style>
 
 
     .joshine-model-warp {
     .joshine-model-warp {

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

@@ -190,8 +190,8 @@
     .express-area-box article {  overflow-y: scroll;height: calc(100vh); }
     .express-area-box article {  overflow-y: scroll;height: calc(100vh); }
     @media (max-width: 1024px){
     @media (max-width: 1024px){
         #product-intro__freeshipping-more-3{
         #product-intro__freeshipping-more-3{
-            margin-top: 7px;
-            margin-left: 55%;
+            margin-top: 1px;
+            float: right;
         }
         }
         #wishlist{
         #wishlist{
             display: none;
             display: none;

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

@@ -10,7 +10,7 @@ $product = $objectManager->get('Magento\Framework\Registry')->registry('current_
 /** @var \Magento\Catalog\Block\Product\View\Details $block */
 /** @var \Magento\Catalog\Block\Product\View\Details $block */
 ?>
 ?>
 <?php if ($detailedInfoGroup = $block->getGroupSortedChildNames('detailed_info', 'getChildHtml')) :?>
 <?php if ($detailedInfoGroup = $block->getGroupSortedChildNames('detailed_info', 'getChildHtml')) :?>
-    <div class="product info detailed">
+    <div class="product info detailed joshine-clearfix">
         <?php $layout = $block->getLayout();  ?>
         <?php $layout = $block->getLayout();  ?>
         <div class="product data items" data-mage-init='{"tabs":{"openedState":"active"}}'>
         <div class="product data items" data-mage-init='{"tabs":{"openedState":"active"}}'>
             <?php foreach ($detailedInfoGroup as $name) :?>
             <?php foreach ($detailedInfoGroup as $name) :?>

app/design/frontend/Joshine/breeze/Magento_Swatches/web/js/swatch-renderer.js

@@ -427,7 +427,7 @@ define([
                     var tem_size = '';
                     var tem_size = '';
                     if (item.label.toLowerCase() == "size"){
                     if (item.label.toLowerCase() == "size"){
                         tem_size = "<div  id=\"product-intro__freeshipping-more-3\"  >" +
                         tem_size = "<div  id=\"product-intro__freeshipping-more-3\"  >" +
-                            "<a href=\"javascript:void(0);\">Size Guide</a></div>";
+                            "<a href=\"javascript:void(0);\"><svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path fill-rule=\"evenodd\" clip-rule=\"evenodd\" d=\"M3.5 8.5V15.5H5.31045V13.75C5.31045 13.3358 5.64623 13 6.06045 13C6.47466 13 6.81045 13.3358 6.81045 13.75V15.5H9.31045V11.75C9.31045 11.3358 9.64623 11 10.0604 11C10.4747 11 10.8104 11.3358 10.8104 11.75V15.5H13.3104V13.75C13.3104 13.3358 13.6462 13 14.0604 13C14.4747 13 14.8104 13.3358 14.8104 13.75V15.5H17.3104V11.75C17.3104 11.3358 17.6462 11 18.0604 11C18.4747 11 18.8104 11.3358 18.8104 11.75V15.5H20.5V8.5H3.5ZM14.0604 17H18.0604H21C21.5523 17 22 16.5523 22 16V8C22 7.44772 21.5523 7 21 7H3C2.44772 7 2 7.44772 2 8V16C2 16.5523 2.44772 17 3 17H6.06045H10.0604H14.0604Z\" fill=\"#5D626A\"></path></svg> Size Guide</a></div>";
                     }
                     }
                     label +=
                     label +=
                         '<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
                         '<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +

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

@@ -435,10 +435,6 @@ button, input, optgroup, select, textarea{
   border-radius: 0;
   border-radius: 0;
 }
 }
 
 
-.swatch-option.text:hover {
-  background-color: #222222;
-  color: #fff;
-}
 
 
 #product-options-wrapper .swatch-option.image:hover{
 #product-options-wrapper .swatch-option.image:hover{
   border: 2px solid #000;
   border: 2px solid #000;
@@ -2051,7 +2047,7 @@ button.action.submit.primary {
   margin-left: 10%;
   margin-left: 10%;
 }
 }
 
 
-.swatch-option.color,.swatch-option.text,.swatch-option.image  {
+.swatch-option.color,.swatch-option.image  {
   border-radius: 50%;
   border-radius: 50%;
 }
 }
 
 
@@ -2073,6 +2069,10 @@ button.action.submit.primary {
   border-radius: 50%;
   border-radius: 50%;
 }
 }
 
 
+.swatch-option.text::before {
+  border-radius: 0;
+}
+
 //详情缩略图过多处理
 //详情缩略图过多处理
 @media (min-width: 1024px){
 @media (min-width: 1024px){
   .breeze-gallery.vertical:not(.opened) .thumbnails {
   .breeze-gallery.vertical:not(.opened) .thumbnails {
@@ -2143,11 +2143,6 @@ button.action.submit.primary {
     margin-top: -8%;
     margin-top: -8%;
   }
   }
 
 
-  #product-intro__freeshipping-more-3{
-    margin-top: -20px;
-    margin-bottom: 10px;
-    margin-left: 60%;
-  }
   .product-social-links .product-addto-links{
   .product-social-links .product-addto-links{
     display: block !important;
     display: block !important;
     position: fixed;
     position: fixed;