Merge branch 'developer' into production

app/design/frontend/Joshine/breeze/Magento_Catalog/templates/product/list.phtml

@@ -61,11 +61,15 @@ $_helper = $block->getData('outputHelper');
     <style>
         .product-item-photo{
             animation: fadeIn 2s linear;
+            background-color: #F0F0F0;
         }
         @keyframes fadeIn{
             0% {
                 opacity: 0.1;
             }
+            50% {
+                opacity: 0.5;
+            }
             100% {
                 opacity: 1;
             }

app/design/frontend/Joshine/breeze/Magento_LayeredNavigation/templates/layer/view.phtml

@@ -27,17 +27,14 @@
 ?>
 <style>
     .page-head-zindex {z-index:5!important;}
-    @media (max-width: 767.98px){
-        .page-layout-1column .block.filter .filter-title, .sidebar .block.filter .filter-title{margin-top: -10%;}
-    }
     @media (max-width: 767px){
         .catalog-category-view .page-main > .columns{position:relative!important;}
-        p#toolbar-amount {margin-top: !important;}
         .catalog-category-view .filter-content .filter-options .filter-options-title {background-color: #fff;}
     }
     @media (max-width: 1024px){
         .product-reviews-summary {justify-content: flex-start;margin-bottom: 0 !important;}
         .product-item .swatch-attribute-options{gap: 0.2rem;}
+        .toolbar .sorter{margin: margin-top: 20px;}
     }
 </style>
 <div class="block filter" data-mage-init='{"slideout":{"toggler":".filter-title","panel":".filter-content"}}' data-breeze-processed="true">

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

@@ -3256,9 +3256,6 @@ tr.grand.totals {
     font-size: 20px;
   }
 
-  p#toolbar-amount{
-    margin-top: -15%;
-  }
 
   .field.size-fits .field.choice{
     margin-right:0px;
@@ -3341,11 +3338,7 @@ div#shipping-method-buttons-container {
     position: relative;
     z-index: 9;
   }
-
-  .products.list .product-item-info:hover {
-    padding: 7px !important;
-  }
-
+  
   div.flash-sale-inner .product-item-info{
     padding: 1px; //占位
   }