From 864b386c433d11c94f14af9c40aee6e006757cd2 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 5 Jul 2018 19:25:57 +0800
Subject: [PATCH] [Improvement] border color variable (#1412)

---
 packages/vant-css/src/checkbox.css             | 6 +++---
 packages/vant-css/src/common/var.css           | 6 +++---
 packages/vant-css/src/coupon-list.css          | 2 +-
 packages/vant-css/src/mixins/border-retina.css | 6 +++---
 packages/vant-css/src/sku.css                  | 6 +++---
 packages/vant-css/src/steps.css                | 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/vant-css/src/checkbox.css b/packages/vant-css/src/checkbox.css
index e5630cc44..0c0d80609 100644
--- a/packages/vant-css/src/checkbox.css
+++ b/packages/vant-css/src/checkbox.css
@@ -44,12 +44,12 @@ $van-checkbox-size: 20px;
 
   &--disabled {
     color: $background-color;
-    border-color: $gray-light;
+    border-color: $border-color;
     background-color: currentColor;
   }
 
   &--disabled&--checked {
-    border-color: $gray-light;
-    background-color: $gray-light;
+    border-color: $border-color;
+    background-color: $border-color;
   }
 }
diff --git a/packages/vant-css/src/common/var.css b/packages/vant-css/src/common/var.css
index 35ecd2d8f..82e6ac099 100644
--- a/packages/vant-css/src/common/var.css
+++ b/packages/vant-css/src/common/var.css
@@ -12,7 +12,7 @@ $gray-dark: #999;
 
 /* default colors */
 $text-color: #333;
-$border-color: #eee;
+$border-color: $gray-light;
 $active-color: #e8e8e8;
 $background-color: #f8f8f8;
 
@@ -27,8 +27,8 @@ $button-danger-color: $white;
 $button-danger-background-color: $red;
 $button-danger-border-color: $red;
 $button-disabled-color: $gray-dark;
-$button-disabled-background-color: $border-color;
-$button-disabled-border-color: $gray-light;
+$button-disabled-background-color: $active-color;
+$button-disabled-border-color: $border-color;
 $button-bottom-action-default-color: $white;
 $button-bottom-action-default-background-color: #f85;
 $button-bottom-action-primary-color: $white;
diff --git a/packages/vant-css/src/coupon-list.css b/packages/vant-css/src/coupon-list.css
index 018a79d9c..3759265c4 100644
--- a/packages/vant-css/src/coupon-list.css
+++ b/packages/vant-css/src/coupon-list.css
@@ -58,7 +58,7 @@
           height: 1px;
           top: 50%;
           position: absolute;
-          background-color: $gray-light;
+          background-color: $border-color;
         }
 
         &::before {
diff --git a/packages/vant-css/src/mixins/border-retina.css b/packages/vant-css/src/mixins/border-retina.css
index 9ba5bc238..1474e4c0f 100644
--- a/packages/vant-css/src/mixins/border-retina.css
+++ b/packages/vant-css/src/mixins/border-retina.css
@@ -2,7 +2,7 @@
 
 $border-poses: top, right, bottom, left;
 
-@define-mixin border-retina $poses: $border-poses, $border-retina-color: $gray-light {
+@define-mixin border-retina $poses: $border-poses, $border-retina-color: $border-color {
   content: '';
   position: absolute;
   top: 0;
@@ -19,7 +19,7 @@ $border-poses: top, right, bottom, left;
   }
 }
 
-@define-mixin hairline $border-retina-color: $gray-light {
+@define-mixin hairline $border-retina-color: $border-color {
   content: '';
   position: absolute;
   top: 0;
@@ -31,4 +31,4 @@ $border-poses: top, right, bottom, left;
   pointer-events: none;
   box-sizing: border-box;
   border: 0 solid $border-retina-color;
-}
\ No newline at end of file
+}
diff --git a/packages/vant-css/src/sku.css b/packages/vant-css/src/sku.css
index a8d4820f1..5ae280872 100644
--- a/packages/vant-css/src/sku.css
+++ b/packages/vant-css/src/sku.css
@@ -118,7 +118,7 @@
 
       &--disabled {
         background: $active-color;
-        border-color: $gray-light;
+        border-color: $border-color;
         color: $gray;
       }
     }
@@ -179,7 +179,7 @@
 
     &__header {
       padding: 0 10px;
-      border: 1px solid $gray-light;
+      border: 1px solid $border-color;
       line-height: 24px;
       border-radius: 3px;
       font-size: 12px;
@@ -197,7 +197,7 @@
       float: left;
       margin: 10px 10px 0 0;
       position: relative;
-      border: $gray-light 1px solid;
+      border: 1px solid $border-color;
 
       img {
         max-width: 100%;
diff --git a/packages/vant-css/src/steps.css b/packages/vant-css/src/steps.css
index c48514078..735e0b96d 100644
--- a/packages/vant-css/src/steps.css
+++ b/packages/vant-css/src/steps.css
@@ -109,7 +109,7 @@
       top: 30px;
       width: 100%;
       height: 1px;
-      background-color: $gray-light;
+      background-color: $border-color;
     }
 
     &.van-step--finish {
@@ -191,7 +191,7 @@
       left: -15px;
       width: 1px;
       height: 100%;
-      background-color: $gray-light;
+      background-color: $border-color;
     }
   }
 }