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

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

@@ -944,9 +944,12 @@ footer{
   }
   }
   .page-header .header.content .logo{
   .page-header .header.content .logo{
     position: absolute;
     position: absolute;
-    left: 45%;
+    left: 46%;
   }
   }
 }
 }
+.header.content{
+  max-width: none;
+}
 .block-collapsible-nav .content .current>a, .block-collapsible-nav .content .current>strong{
 .block-collapsible-nav .content .current>a, .block-collapsible-nav .content .current>strong{
   border-color: #000000 !important;
   border-color: #000000 !important;
 }
 }
@@ -1022,7 +1025,7 @@ footer{
 @media(min-width: 640px){
 @media(min-width: 640px){
   .switcher.currency{
   .switcher.currency{
     position: relative;
     position: relative;
-    top: 40px;
+    top: 37px;
     right: 116px;
     right: 116px;
   }
   }
 }
 }
@@ -1218,15 +1221,20 @@ footer{
       height: 30px;
       height: 30px;
       margin-top: 15px;
       margin-top: 15px;
     }
     }
-    .minisearch .control .input-text,.minisearch .control .input-text:hover{
-      border: none;
-      border-bottom: 1px solid #000;
-      border-radius: 0;
-      background: none;
-      font-weight: normal;
-    }
-    .minisearch .action.search{
-      margin-left: -17rem;
+    //.minisearch .control .input-text,.minisearch .control .input-text:hover{
+    //  border: none;
+    //  border-bottom: 1px solid #000;
+    //  border-radius: 0;
+    //  background: none;
+    //  font-weight: normal;
+    //}
+    //.minisearch .action.search{
+    //  margin-left: -17rem;
+    //}
+    .minisearch .control .input-text{
+      border: 1px solid rgba(0,0,0,.1);
+      font-size: 12px;
+      font-family: sans-serif;
     }
     }
     .block-search{
     .block-search{
       width: 20%;
       width: 20%;
@@ -1700,7 +1708,7 @@ border-radius: 50% !important;;
 }
 }
 
 
 //颜色提示强制关闭
 //颜色提示强制关闭
-.breeze .field-tooltip-content, .breeze .tooltip.wrapper .tooltip.content, .breeze .minisearch .search-autocomplete, .breeze .map-popup, .breeze .swatch-option-tooltip {
+.breeze .field-tooltip-content, .breeze .tooltip.wrapper .tooltip.content, .breeze .map-popup, .breeze .swatch-option-tooltip {
 display: none !important;
 display: none !important;
 }
 }