Skip to content

Commit

Permalink
[improvement] Color: update base green to wechat green (#2479)
Browse files Browse the repository at this point in the history
  • Loading branch information
chenjiahan committed Jan 9, 2019
1 parent d74147d commit d62ccc0
Show file tree
Hide file tree
Showing 31 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion docs/markdown/theme.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ There are some basic variables below, all available variables could be found in
@orange: #ff976a;
@orange-dark: #ed6a0c;
@orange-light: #fffbe8;
@green: #4b0;
@green: #07c160;
@gray: #c9c9c9;
@gray-light: #e5e5e5;
@gray-darker: #7d7e80;
Expand Down
2 changes: 1 addition & 1 deletion docs/markdown/theme.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Vant 使用了 [Less](http://lesscss.org/) 对样式进行预处理,并内置
@orange: #ff976a;
@orange-dark: #ed6a0c;
@orange-light: #fffbe8;
@green: #4b0;
@green: #07c160;
@gray: #c9c9c9;
@gray-light: #e5e5e5;
@gray-darker: #7d7e80;
Expand Down
2 changes: 1 addition & 1 deletion packages/checkbox/demo/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<demo-block :title="$t('customColor')">
<van-checkbox
v-model="checkbox2"
checked-color="#4b0"
checked-color="#07c160"
>
{{ $t('customColor') }}
</van-checkbox>
Expand Down
2 changes: 1 addition & 1 deletion packages/checkbox/en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default {
#### Custom Color

```html
<van-checkbox v-model="checked" checked-color="#4b0">Checkbox</van-checkbox>
<van-checkbox v-model="checked" checked-color="#07c160">Checkbox</van-checkbox>
```

#### Custom Icon
Expand Down
2 changes: 1 addition & 1 deletion packages/checkbox/test/__snapshots__/demo.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ exports[`renders demo correctly 1`] = `
</div>
<div>
<div class="van-checkbox">
<div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked"><i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;border-color:#4b0;background-color:#4b0;">
<div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked"><i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;border-color:#07c160;background-color:#07c160;">
<!---->
<!----></i></div> <span class="van-checkbox__label">
自定义颜色
Expand Down
2 changes: 1 addition & 1 deletion packages/checkbox/zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default {
#### 自定义颜色

```html
<van-checkbox v-model="checked" checked-color="#4b0">复选框</van-checkbox>
<van-checkbox v-model="checked" checked-color="#07c160">复选框</van-checkbox>
```

#### 自定义图标
Expand Down
2 changes: 1 addition & 1 deletion packages/circle/demo/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/>
<van-circle
v-model="currentRate2"
color="#13ce66"
color="#07c160"
fill="#fff"
:rate="rate"
size="120px"
Expand Down
2 changes: 1 addition & 1 deletion packages/circle/en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default {
```html
<van-circle
v-model="currentRate"
color="#13ce66"
color="#07c160"
fill="#fff"
size="120px"
layer-color="#ebedf0"
Expand Down
2 changes: 1 addition & 1 deletion packages/circle/test/__snapshots__/demo.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports[`renders demo correctly 1`] = `
</div>
<div class="van-circle" style="width:120px;height:120px;"><svg viewBox="0 0 1060 1060">
<path d="M 530 530 m -500, 0 a 500, 500 0 1, 1 1000, 0 a 500, 500 0 1, 1 -1000, 0" class="van-circle__hover" style="fill:#fff;stroke:#ebedf0;stroke-width:60px;"></path>
<path d="M 530 530 m -500, 0 a 500, 500 0 1, 1 1000, 0 a 500, 500 0 1, 1 -1000, 0" class="van-circle__layer" style="stroke:#13ce66;stroke-dashoffset:3140px;stroke-width:61px;"></path>
<path d="M 530 530 m -500, 0 a 500, 500 0 1, 1 1000, 0 a 500, 500 0 1, 1 -1000, 0" class="van-circle__layer" style="stroke:#07c160;stroke-dashoffset:3140px;stroke-width:61px;"></path>
</svg>
<div class="van-circle__text">0%</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/circle/zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default {
```html
<van-circle
v-model="currentRate"
color="#13ce66"
color="#07c160"
fill="#fff"
size="120px"
layer-color="#ebedf0"
Expand Down
2 changes: 1 addition & 1 deletion packages/radio/demo/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<van-radio
name="1"
value="1"
checked-color="#4b0"
checked-color="#07c160"
class="demo-radio-group"
>
{{ $t('radio') }}
Expand Down
2 changes: 1 addition & 1 deletion packages/radio/en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default {
#### Custom Color

```html
<van-radio checked-color="#4b0">Radio</van-radio>
<van-radio checked-color="#07c160">Radio</van-radio>
```

#### Inside a Cell
Expand Down
2 changes: 1 addition & 1 deletion packages/radio/test/__snapshots__/demo.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ exports[`renders demo correctly 1`] = `
</div>
</div>
<div>
<div class="demo-radio-group van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:#4b0;font-size:undefined;"> <!----> <!----></i></span> <span class="van-radio__label">
<div class="demo-radio-group van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:#07c160;font-size:undefined;"> <!----> <!----></i></span> <span class="van-radio__label">
单选框
</span></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/radio/zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default {
#### 自定义颜色

```html
<van-radio checked-color="#4b0">复选框</van-radio>
<van-radio checked-color="#07c160">复选框</van-radio>
```

#### 与 Cell 组件一起使用
Expand Down
2 changes: 1 addition & 1 deletion packages/rate/demo/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
v-model="value3"
:size="25"
:count="6"
color="#2ba"
color="#07c160"
void-color="#ceefe8"
/>
</demo-block>
Expand Down
2 changes: 1 addition & 1 deletion packages/rate/en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default {
v-model="value"
:size="25"
:count="6"
color="#2ba"
color="#07c160"
void-color="#ceefe8"
/>
```
Expand Down
8 changes: 4 additions & 4 deletions packages/rate/test/__snapshots__/demo.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ exports[`renders demo correctly 1`] = `
<!----></i></div>
</div>
<div>
<div class="van-rate"><i data-index="0" class="van-icon van-icon-star van-rate__item" style="color:#2ba;font-size:25px;">
<div class="van-rate"><i data-index="0" class="van-icon van-icon-star van-rate__item" style="color:#07c160;font-size:25px;">
<!---->
<!----></i><i data-index="1" class="van-icon van-icon-star van-rate__item" style="color:#2ba;font-size:25px;">
<!----></i><i data-index="1" class="van-icon van-icon-star van-rate__item" style="color:#07c160;font-size:25px;">
<!---->
<!----></i><i data-index="2" class="van-icon van-icon-star van-rate__item" style="color:#2ba;font-size:25px;">
<!----></i><i data-index="2" class="van-icon van-icon-star van-rate__item" style="color:#07c160;font-size:25px;">
<!---->
<!----></i><i data-index="3" class="van-icon van-icon-star van-rate__item" style="color:#2ba;font-size:25px;">
<!----></i><i data-index="3" class="van-icon van-icon-star van-rate__item" style="color:#07c160;font-size:25px;">
<!---->
<!----></i><i data-index="4" class="van-icon van-icon-star-o van-rate__item" style="color:#ceefe8;font-size:25px;">
<!---->
Expand Down
2 changes: 1 addition & 1 deletion packages/rate/zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default {
v-model="value"
:size="25"
:count="6"
color="#2ba"
color="#07c160"
void-color="#ceefe8"
/>
```
Expand Down
2 changes: 1 addition & 1 deletion packages/steps/en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default {
| title | Title | `String` | - |
| description | Description | `String` | - |
| direction | Can be set to `horizontal` `vertical` | `String` | `horizontal` |
| active-color | Active step color | `String` | `#4b0` |
| active-color | Active step color | `String` | `#07c160` |

### Steps Slot

Expand Down
4 changes: 2 additions & 2 deletions packages/steps/test/__snapshots__/demo.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ exports[`renders demo correctly 1`] = `
<div class="van-step__line"></div>
</div>
<div class="van-hairline van-step van-step--horizontal van-step--process">
<div class="van-step__title" style="color:#4b0;">商家接单</div>
<div class="van-step__circle-container"><i class="van-icon van-icon-checked" style="color:#4b0;font-size:undefined;">
<div class="van-step__title" style="color:#07c160;">商家接单</div>
<div class="van-step__circle-container"><i class="van-icon van-icon-checked" style="color:#07c160;font-size:undefined;">
<!---->
<!----></i></div>
<div class="van-step__line"></div>
Expand Down
2 changes: 1 addition & 1 deletion packages/steps/zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default {
| icon | 描述栏图标 | `String` | - | - |
| icon-class | 图标额外类名 | `String` | - | - |
| direction | 显示方向,可选值为 `vertical` | `String` | `horizontal` | - |
| active-color | 激活状态颜色 | `String` | `#4b0` | - |
| active-color | 激活状态颜色 | `String` | `#07c160` | - |

### Steps Slot

Expand Down
2 changes: 1 addition & 1 deletion packages/style/var.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@orange: #ff976a;
@orange-dark: #ed6a0c;
@orange-light: #fffbe8;
@green: #4b0;
@green: #07c160;
@gray: #c8c9cc;
@gray-light: #e5e5e5;
@gray-darker: #7d7e80;
Expand Down
2 changes: 1 addition & 1 deletion packages/switch/demo/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<demo-block :title="$t('customColor')">
<van-switch
v-model="checked3"
active-color="#4b0"
active-color="#07c160"
inactive-color="#f44"
/>
</demo-block>
Expand Down
2 changes: 1 addition & 1 deletion packages/switch/en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default {
```html
<van-switch
v-model="checked"
active-color="#4b0"
active-color="#07c160"
inactive-color="#f44"
/>
```
Expand Down
2 changes: 1 addition & 1 deletion packages/switch/test/__snapshots__/demo.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ exports[`renders demo correctly 1`] = `
</div>
</div>
<div>
<div class="van-switch van-switch--on" style="font-size:30px;background-color:#4b0;">
<div class="van-switch van-switch--on" style="font-size:30px;background-color:#07c160;">
<div class="van-switch__node">
<!---->
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/switch/zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default {
```html
<van-switch
v-model="checked"
active-color="#4b0"
active-color="#07c160"
inactive-color="#f44"
/>
```
Expand Down
2 changes: 1 addition & 1 deletion packages/tabbar/demo/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<demo-block :title="$t('customColor')">
<van-tabbar
v-model="active3"
active-color="#4b0"
active-color="#07c160"
>
<van-tabbar-item icon="home-o">{{ $t('tab') }}</van-tabbar-item>
<van-tabbar-item icon="search">{{ $t('tab') }}</van-tabbar-item>
Expand Down
2 changes: 1 addition & 1 deletion packages/tabbar/zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default {
```html
<van-tabbar
v-model="active"
active-color="#4b0"
active-color="#07c160"
>
<van-tabbar-item icon="home-o">标签</van-tabbar-item>
<van-tabbar-item icon="search">标签</van-tabbar-item>
Expand Down
8 changes: 4 additions & 4 deletions packages/tag/test/__snapshots__/demo.spec.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@

exports[`renders demo correctly 1`] = `
<div>
<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" 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:#07c160;">标签</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> <span class="van-tag van-tag--plain van-hairline--surround" style="color:#07c160;">
标签
</span></div>
<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> <span class="van-tag van-tag--round" style="background-color:#07c160;">
标签
</span></div>
<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;">
标签
</span> <span class="van-tag van-tag--mark" style="background-color:#4b0;">
</span> <span class="van-tag van-tag--mark" style="background-color:#07c160;">
标签
</span></div>
<div><span class="van-tag" style="background-color:#f2826a;">标签</span> <span class="van-tag van-tag--plain van-hairline--surround" style="color:#f2826a;">
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/color.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const RED = '#f44';
export const BLUE = '#1989fa';
export const GREEN = '#4b0';
export const GREEN = '#07c160';
export const WHITE = '#fff';
export const GRAY_DARK = '#969799';

0 comments on commit d62ccc0

Please sign in to comment.