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

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

@@ -2247,15 +2247,16 @@ button.action.submit.primary {
   height: 40px;
   background-clip: content-box!important;
   padding: 5px;
-  margin-left: 3%;
+  margin-left: 3%!important;
+  border: 1px solid rgba(23,23,23,0.3);
 }
 
 .swatch-option.color.selected{
-  border: 2px solid black;
+  border: 2px solid black!important;
 }
 
 .swatch-option.image.selected{
-  border: 2px solid black;
+  border: 2px solid black!important;
 }
 
 .swatch-option.text{
@@ -2326,7 +2327,7 @@ button.action.submit.primary {
   .swatch-option.text
   {
     width: auto !important;
-    line-height: 13px!important;
+    line-height: 10px!important;
     height: 30px !important;
     min-width: 30px;
   }