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

Merge branch '2.x' into dev

Browse Source
This commit is contained in:
chenjiahan
2020-12-01 10:12:54 +08:00
parent d0c4c26d75 b57f7e9d98
commit 28afc8a521
48 changed files with 259 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/button/index.tsx
View File

@@ -2,7 +2,7 @@ import { PropType, CSSProperties } from 'vue';
// Utils
import { createNamespace } from '../utils';
import { BORDER_SURROUND, WHITE } from '../utils/constant';
import { BORDER_SURROUND } from '../utils/constant';
import { useRoute, routeProps } from '../composables/use-route';
// Components
@@ -116,7 +116,7 @@ export default createComponent({
if (color) {
const style: CSSProperties = {};
style.color = plain ? color : WHITE;
style.color = plain ? color : 'white';
if (!plain) {
// Use background instead of backgroundColor to make linear-gradient work

4
src/button/test/__snapshots__/demo.spec.js.snap
View File

@@ -324,7 +324,7 @@ exports[`should render demo and match snapshot 1`] = `
<div>
<button type="button"
class="van-button van-button--default van-button--normal"
style="color: rgb(255, 255, 255); background: rgb(114, 50, 221); border-color: #7232dd;"
style="color: white; background: rgb(114, 50, 221); border-color: #7232dd;"
>
<div class="van-button__content">
<span class="van-button__text">
@@ -344,7 +344,7 @@ exports[`should render demo and match snapshot 1`] = `
</button>
<button type="button"
class="van-button van-button--default van-button--normal"
style="color: rgb(255, 255, 255); border: 0px;"
style="color: white; border: 0px;"
>
<div class="van-button__content">
<span class="van-button__text">