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

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

@@ -647,6 +647,14 @@ p.shopbycate-title {
 .top-content-home{
 .top-content-home{
   width: 100%;
   width: 100%;
 }
 }
+.top-content-home:after {
+  clear: both;
+  content: ' ';
+  display: block;
+  font-size: 0;
+  height: 0;
+  visibility: hidden;
+}
 .banner-4-cate{
 .banner-4-cate{
   width: 25%;
   width: 25%;
   float: left;
   float: left;
@@ -680,6 +688,11 @@ p.shopbycate-title {
 
 
 .page-footer .footer_menu a,
 .page-footer .footer_menu a,
 .container-before-footer.clearfix a:visited {color:#000;}
 .container-before-footer.clearfix a:visited {color:#000;}
+.container-before-footer  .row {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: end;
+}
 
 
 .select-element.section-before-footer.clearfix {
 .select-element.section-before-footer.clearfix {
   text-align: center;
   text-align: center;
@@ -710,6 +723,7 @@ p.shopbycate-title {
 .baozhang_before_footer  img {opacity: 0.7;}
 .baozhang_before_footer  img {opacity: 0.7;}
 
 
 
 
+
 .checkout-cart-index  input[type="number"]::-webkit-inner-spin-button,
 .checkout-cart-index  input[type="number"]::-webkit-inner-spin-button,
 .checkout-cart-index input[type="number"]::-webkit-outer-spin-button {
 .checkout-cart-index input[type="number"]::-webkit-outer-spin-button {
   -webkit-appearance: none;
   -webkit-appearance: none;
@@ -1235,7 +1249,6 @@ div#cart-totals{
   .baozhang_before_footer{
   .baozhang_before_footer{
     margin-top: 30px;
     margin-top: 30px;
   }
   }
-  .baozhang_before_footer  .image_first {margin-top: 10px;}
   .checkout-cart-index .continue-content{
   .checkout-cart-index .continue-content{
     padding:0px 1rem;
     padding:0px 1rem;
   }
   }
@@ -1250,13 +1263,9 @@ div#cart-totals{
     margin-top: 1px;
     margin-top: 1px;
     padding-top: 40px
     padding-top: 40px
   }
   }
-  .container-before-footer.clearfix a {
-    font-size: 70%;
-  }
 
 
   .cms-index-index .box-blog{padding-bottom:0;}
   .cms-index-index .box-blog{padding-bottom:0;}
-  .baozhang_before_footer{width: 33.333%;float: left;height: 80px;}
-  .baozhang_before_footer  .image_first {margin-top: 10px;}
+  .baozhang_before_footer{width: 33.333%;}
 
 
   .select-element.section-before-footer.clearfix{ padding: 20px 10px;}
   .select-element.section-before-footer.clearfix{ padding: 20px 10px;}
   .select-element.section-before-footer.clearfix p{height:60px;font-size: 14px;text-transform: lowercase;}
   .select-element.section-before-footer.clearfix p{height:60px;font-size: 14px;text-transform: lowercase;}
@@ -2922,7 +2931,6 @@ button.action.submit.primary {
 @media (max-width: 1024px){
 @media (max-width: 1024px){
   .select-element.section-before-footer.clearfix p {
   .select-element.section-before-footer.clearfix p {
     font-weight: 200;
     font-weight: 200;
-    font-size: 12px;
     color: #000000;
     color: #000000;
     text-transform: none;
     text-transform: none;
   }
   }