alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Doc] update neutral color variables (#2130)

Browse Source
This commit is contained in:
neverland
2018-11-23 20:29:43 +08:00
committed by GitHub
parent ec159b5e47
commit f69c66b439
21 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/tag/index.vue
+2 -3
View File
@@ -16,9 +16,8 @@
<script>
import create from '../utils/create';
import { RED, BLUE, GREEN } from '../utils/color';
import { RED, BLUE, GREEN, GRAY_DARK } from '../utils/color';
const DEFAULT_COLOR = '#999';
const COLOR_MAP = {
danger: RED,
primary: BLUE,
@@ -39,7 +38,7 @@ export default create({
computed: {
style() {
const color = this.color || COLOR_MAP[this.type] || DEFAULT_COLOR;
const color = this.color || COLOR_MAP[this.type] || GRAY_DARK;
const key = this.plain ? 'color' : 'backgroundColor';
return { [key]: color };
}
packages/tag/test/__snapshots__/demo.spec.js.snap
+4 -4
View File
@@ -2,22 +2,22 @@
exports[`renders demo correctly 1`] = `
<div>
<div><span class="van-tag" style="background-color:#999;">标签</span> <span class="van-tag" style="background-color:#f44;">标签</span> <span class="van-tag" style="background-color:#1989fa;">标签</span> <span class="van-tag" style="background-color:#4b0;">标签</span></div>
<div><span class="van-tag van-tag--plain van-hairline--surround" style="color:#999;">标签</span> <span class="van-tag van-tag--plain van-tag--round van-hairline--surround" style="color:#f44;">
<div><span class="van-tag" style="background-color:#969799;">标签</span> <span class="van-tag" style="background-color:#f44;">标签</span> <span class="van-tag" style="background-color:#1989fa;">标签</span> <span class="van-tag" style="background-color:#4b0;">标签</span></div>
<div><span class="van-tag van-tag--plain van-hairline--surround" style="color:#969799;">标签</span> <span class="van-tag van-tag--plain van-tag--round van-hairline--surround" style="color:#f44;">
标签
</span> <span class="van-tag van-tag--plain van-tag--round van-hairline--surround" style="color:#1989fa;">
标签
</span> <span class="van-tag van-tag--plain van-hairline--surround" style="color:#4b0;">
标签
</span></div>
<div><span class="van-tag van-tag--round" style="background-color:#999;">标签</span> <span class="van-tag van-tag--round" style="background-color:#f44;">
<div><span class="van-tag van-tag--round" style="background-color:#969799;">标签</span> <span class="van-tag van-tag--round" style="background-color:#f44;">
标签
</span> <span class="van-tag van-tag--round" style="background-color:#1989fa;">
标签
</span> <span class="van-tag van-tag--round" style="background-color:#4b0;">
标签
</span></div>
<div><span class="van-tag van-tag--mark" style="background-color:#999;">标签</span> <span class="van-tag van-tag--mark" style="background-color:#f44;">
<div><span class="van-tag van-tag--mark" style="background-color:#969799;">标签</span> <span class="van-tag van-tag--mark" style="background-color:#f44;">
标签
</span> <span class="van-tag van-tag--mark" style="background-color:#1989fa;">
标签