ui/vant
1
0
Fork 0
mirror of https://github.com/youzan/vant.git synced 2025-10-19 18:14:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Button: fix disabled color wrong when has bottomAction prop

Browse Source
This commit is contained in:
陈嘉涵
2017-09-14 20:05:53 +08:00
parent 3be326f7ea
commit 63acb5b799
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/vant-css/src/button.css
View File

@@ -36,10 +36,6 @@
color: $button-default-color;
background-color: $button-default-background-color;
border: 1px solid $button-default-border-color;
&:active {
color: $gray-dark;
}
}
&--primary {
@@ -91,12 +87,6 @@
}
}
&--disabled {
color: $button-disabled-color;
background-color: $button-disabled-background-color;
border: 1px solid $button-disabled-border-color;
}
&--block {
width: 100%;
display: block;
@@ -112,13 +102,14 @@
color: $bottom-action-button-default-color;
background-color: $bottom-action-button-default-background-color;
&:active {
color: $white;
}
&.van-button--primary {
color: $bottom-action-button-primary-color;
background-color: $bottom-action-button-primary-background-color;
}
}
&--disabled {
color: $button-disabled-color;
background-color: $button-disabled-background-color;
border: 1px solid $button-disabled-border-color;
}
}

6
packages/vant-css/src/search.css
View File

@@ -32,8 +32,12 @@
width: 100%;
height: 14px;
font-size: 14px;
color: $gray-dark;
color: $gray-darker;
border: none;
&::placeholder {
color: $gray-dark;
}
}
&__cancel {