[Improvement] border color variable (#1412)

This commit is contained in:
neverland 2018-07-05 19:25:57 +08:00 committed by GitHub
parent 8942eb56fa
commit 864b386c43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 15 deletions

View File

@ -44,12 +44,12 @@ $van-checkbox-size: 20px;
&--disabled { &--disabled {
color: $background-color; color: $background-color;
border-color: $gray-light; border-color: $border-color;
background-color: currentColor; background-color: currentColor;
} }
&--disabled&--checked { &--disabled&--checked {
border-color: $gray-light; border-color: $border-color;
background-color: $gray-light; background-color: $border-color;
} }
} }

View File

@ -12,7 +12,7 @@ $gray-dark: #999;
/* default colors */ /* default colors */
$text-color: #333; $text-color: #333;
$border-color: #eee; $border-color: $gray-light;
$active-color: #e8e8e8; $active-color: #e8e8e8;
$background-color: #f8f8f8; $background-color: #f8f8f8;
@ -27,8 +27,8 @@ $button-danger-color: $white;
$button-danger-background-color: $red; $button-danger-background-color: $red;
$button-danger-border-color: $red; $button-danger-border-color: $red;
$button-disabled-color: $gray-dark; $button-disabled-color: $gray-dark;
$button-disabled-background-color: $border-color; $button-disabled-background-color: $active-color;
$button-disabled-border-color: $gray-light; $button-disabled-border-color: $border-color;
$button-bottom-action-default-color: $white; $button-bottom-action-default-color: $white;
$button-bottom-action-default-background-color: #f85; $button-bottom-action-default-background-color: #f85;
$button-bottom-action-primary-color: $white; $button-bottom-action-primary-color: $white;

View File

@ -58,7 +58,7 @@
height: 1px; height: 1px;
top: 50%; top: 50%;
position: absolute; position: absolute;
background-color: $gray-light; background-color: $border-color;
} }
&::before { &::before {

View File

@ -2,7 +2,7 @@
$border-poses: top, right, bottom, left; $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: ''; content: '';
position: absolute; position: absolute;
top: 0; 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: ''; content: '';
position: absolute; position: absolute;
top: 0; top: 0;
@ -31,4 +31,4 @@ $border-poses: top, right, bottom, left;
pointer-events: none; pointer-events: none;
box-sizing: border-box; box-sizing: border-box;
border: 0 solid $border-retina-color; border: 0 solid $border-retina-color;
} }

View File

@ -118,7 +118,7 @@
&--disabled { &--disabled {
background: $active-color; background: $active-color;
border-color: $gray-light; border-color: $border-color;
color: $gray; color: $gray;
} }
} }
@ -179,7 +179,7 @@
&__header { &__header {
padding: 0 10px; padding: 0 10px;
border: 1px solid $gray-light; border: 1px solid $border-color;
line-height: 24px; line-height: 24px;
border-radius: 3px; border-radius: 3px;
font-size: 12px; font-size: 12px;
@ -197,7 +197,7 @@
float: left; float: left;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
position: relative; position: relative;
border: $gray-light 1px solid; border: 1px solid $border-color;
img { img {
max-width: 100%; max-width: 100%;

View File

@ -109,7 +109,7 @@
top: 30px; top: 30px;
width: 100%; width: 100%;
height: 1px; height: 1px;
background-color: $gray-light; background-color: $border-color;
} }
&.van-step--finish { &.van-step--finish {
@ -191,7 +191,7 @@
left: -15px; left: -15px;
width: 1px; width: 1px;
height: 100%; height: 100%;
background-color: $gray-light; background-color: $border-color;
} }
} }
} }