Merge remote-tracking branch 'origin/wynn'

chenhaodong
2 parents 4045efac 0185d136
Showing 4 changed files with 15 additions and 7 deletions Show diff stats
src/styles/components/button.less
src/styles/components/tabs.less
src/styles/custom.less
src/styles/mixins/button.less
@@ -156,8 +156,16 @@
         color: #fff;
         border-color: #fff;
         &:hover{
-            color: tint(@primary-color, 20%);
-            border-color: tint(@primary-color, 20%);
+            color: tint(@search-color, 20%);
+            border-color: tint(@search-color, 20%);
+        }
+    }
+    &-default {
+        color: #333;
+        border-color: @border-color-base;
+        &:hover {
+            color: #3fcdc0;
+            border-color: #3fcdc0;
         }
     }
     &-ghost&-primary{
@@ -201,7 +201,7 @@
         background: #fff;
         transform: translateZ(0);
         border-color: @border-color-base;
-        color: @primary-color;
+        color: @mew-common-color;
     }
     &&-card > &-bar &-nav-wrap {
         margin-bottom: 0;
@@ -91,7 +91,7 @@
 @btn-font-size-large    : 14px;
 @btn-border-radius      : 4px;
 @btn-border-radius-small: 3px;
-@btn-group-border       : shade(@primary-color, 5%);
+@btn-group-border       : shade(@mew-common-color, 5%);
  
 @btn-disable-color      : #c5c8ce;
 @btn-disable-bg         : @background-color-base;
@@ -206,13 +206,13 @@
     &:hover
     //&:focus
     {
-        .button-color(tint(@primary-color, 20%); white; tint(@primary-color, 20%));
+        .button-color(tint(@search-color, 20%); white; tint(@search-color, 20%));
     }
     &:active,
     &.active {
-        .button-color(shade(@primary-color, 5%); white; shade(@primary-color, 5%));
+        .button-color(shade(@search-color, 5%); white; shade(@search-color, 5%));
     }
-    .active-btn-color(@primary-color);
+    .active-btn-color(@search-color);
 }
  
 // Primary