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

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

@@ -2037,6 +2037,12 @@ button.action.submit.primary {
   border-radius: 50%;
 }
 
+.swatch-option.text.selected::before{
+  box-shadow:none;
+  background: #0a0a0a;
+  color: #FFFFFF;
+}
+
 .swatch-option::before {
   box-shadow: 0 0 0 0px;
 }
@@ -2148,8 +2154,9 @@ height: 40px !important;
 
 .swatch-option.text{
   width: auto!important;
-  padding: calc( 7.5px) calc( 15px);
+  padding: calc( 8.5px) calc( 11px);
   line-height:22px!important;
+  min-width: 40px;
 }
 
 .block-minicart .block-content>.actions .action.checkout{
@@ -2175,12 +2182,8 @@ display: none !important;
 }
 
 @media (max-width: 1024px){
-  #product-options-wrapper .swatch-option.image{
-    width: 30px !important;;
-    height: 30px !important;;
-    border-radius: 50% !important;;
-  }
-  .swatch-option.color .swatch-option.image{
+
+  #product-options-wrapper .swatch-option.color,.swatch-option.image{
     width: 30px !important;
     height: 30px !important;
     border: 1px solid #000008;
@@ -2193,6 +2196,7 @@ display: none !important;
     width: auto !important;
     line-height: 13px!important;
     height: 30px !important;
+    min-width: 30px;
   }
 
   .swatch-option::before{