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

# Conflicts:
#	app/design/frontend/Joshine/breeze/web/css/_custom.less

app/design/frontend/Joshine/breeze/Magento_Theme/requirejs-config.js

@@ -5,6 +5,6 @@
 
 var config = {
     deps: [
-        'Magento_Theme/js/theme'
+        'Magento_Theme/js/public'
     ]
 };

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

@@ -21,6 +21,11 @@
   margin: 0;
 }
 
+.page-main > .columns > .sidebar-additional{
+	font-family: Outfit-Regular;
+}
+
+
 //product vim desc
 #description{
   max-width: 100%;
@@ -102,6 +107,10 @@
 	display: block !important;
   }
 
+  .block-content >  .minisearch{
+	display: none !important;
+  }
+
   .header.content{
     gap: 3px;
   }
@@ -208,13 +217,23 @@ footer a{
     display: none;
 }
 .footer_link ul li{
-    margin-bottom: 20px;
+    margin-bottom: 12px;
+    font-family: 'Outfit-Regular';
 }
+
 @media screen and (max-width:1200px) {
     .footer_link > div{
         width: 100%;
     }
     
+    .block-search > .block .block-content{
+	display: none;
+    }
+
+    .block-content >  .minisearch{
+	display: none !important;
+    }
+
     .footer_link > div > img{
         margin-top: 10px;
 	margin-bottom: 20px;
@@ -351,12 +370,36 @@ footer a{
 	//	color: #222222;
 	//	margin-top: 5px;
 	//}
+}
 
-	
-    
+
+.input-text.qty,#qty{
+    padding: 0.5rem 0.75rem;
+}
+.price-final_price .price, .product-item-details > .price-box > .price{
+	font-size: 24px !important;
+}
+button, input, optgroup, select, textarea{
+	padding: 0.5rem 0.75rem;
+}
+.minisearch .control .input-text{
+    outline: none;
+    position: relative;
+    padding: 0.5rem 0.75rem;
+    width: 100%;
+    border-radius: 0;
 }
 
+.swatch-option.text:hover {
+    background-color: #222222;
+    color: #fff;
+}
+
+#product-options-wrapper .swatch-option.image:hover{
+	border: 2px solid #000;
+}
 
+    
 .product.info .review-add + .review-list, .product.info #product-review-container {
     float: left;
     width: 100%;
@@ -449,7 +492,7 @@ ul {
 	//}
 }
 
-.price-final_price .price{
+.price-final_price .price,.product-item-details > .price-box > .price{
   font-size: 14px;
   margin-top: 0px;
   position: relative;
@@ -460,6 +503,10 @@ ul {
   font-family: Outfit-Regular, sans-serif;
 }
 
+.filter-options-item .filter-price {
+     font-family: Outfit-Regular;
+}
+
 .price-final_price .old-price .price{
   color: #999999;
   text-decoration: line-through;