From e12b468843db28536455810b127f861e7fd60522 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 24 Jul 2020 17:45:20 +0800 Subject: [PATCH] style(DropdownMenu): adjust default active color to @red (#6863) --- src/dropdown-menu/README.md | 8 ++++++-- src/dropdown-menu/README.zh-CN.md | 8 ++++++-- src/dropdown-menu/demo/index.vue | 14 +++++++++++--- src/style/var.less | 4 ++-- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/dropdown-menu/README.md b/src/dropdown-menu/README.md index d3b5526be..0805893f3 100644 --- a/src/dropdown-menu/README.md +++ b/src/dropdown-menu/README.md @@ -50,7 +50,11 @@ export default { - Confirm +
+ + Confirm + +
``` @@ -112,7 +116,7 @@ Use `active-color` prop to custom active color of the title and options | Attribute | Description | Type | Default | | --- | --- | --- | --- | -| active-color | Active color of title and option | _string_ | `#1989fa` | +| active-color | Active color of title and option | _string_ | `#ee0a24` | | direction `v2.0.1` | Expand direction, can be set to `up` | _string_ | `down` | | z-index | z-index of menu item | _number \| string_ | `10` | | duration | Transition duration, unit second | _number \| string_ | `0.2` | diff --git a/src/dropdown-menu/README.zh-CN.md b/src/dropdown-menu/README.zh-CN.md index 2336c71d6..ac1547b93 100644 --- a/src/dropdown-menu/README.zh-CN.md +++ b/src/dropdown-menu/README.zh-CN.md @@ -52,7 +52,11 @@ export default { - 确认 +
+ + 确认 + +
``` @@ -116,7 +120,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | -| active-color | 菜单标题和选项的选中态颜色 | _string_ | `#1989fa` | +| active-color | 菜单标题和选项的选中态颜色 | _string_ | `#ee0a24` | | direction `v2.0.1` | 菜单展开方向,可选值为`up` | _string_ | `down` | | z-index | 菜单栏 z-index 层级 | _number \| string_ | `10` | | duration | 动画时长,单位秒 | _number \| string_ | `0.2` | diff --git a/src/dropdown-menu/demo/index.vue b/src/dropdown-menu/demo/index.vue index 18e8ef119..4eeb25073 100644 --- a/src/dropdown-menu/demo/index.vue +++ b/src/dropdown-menu/demo/index.vue @@ -13,9 +13,17 @@ - - {{ t('confirm') }} - +
+ + {{ t('confirm') }} + +
diff --git a/src/style/var.less b/src/style/var.less index 9919d8597..5989aea32 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -331,11 +331,11 @@ @dropdown-menu-background-color: @white; @dropdown-menu-title-font-size: 15px; @dropdown-menu-title-text-color: @text-color; -@dropdown-menu-title-active-text-color: @blue; +@dropdown-menu-title-active-text-color: @red; @dropdown-menu-title-disabled-text-color: @gray-6; @dropdown-menu-title-padding: 0 @padding-xs; @dropdown-menu-title-line-height: @line-height-lg; -@dropdown-menu-option-active-color: @blue; +@dropdown-menu-option-active-color: @red; @dropdown-menu-content-max-height: 80%; @dropdown-item-z-index: 10;