diff --git a/src/nav-bar/index.less b/src/nav-bar/index.less index 1fed3ee1f..f86b4af9a 100644 --- a/src/nav-bar/index.less +++ b/src/nav-bar/index.less @@ -1,6 +1,7 @@ @import '../style/var'; .van-nav-bar { + position: relative; z-index: @nav-bar-z-index; line-height: @line-height-lg; text-align: center; diff --git a/src/popover/README.zh-CN.md b/src/popover/README.zh-CN.md index 4c04a6f63..31b4d1775 100644 --- a/src/popover/README.zh-CN.md +++ b/src/popover/README.zh-CN.md @@ -2,7 +2,7 @@ ### 介绍 -弹出式的气泡菜单。 +弹出式的气泡菜单,2.11 版本开始支持此组件。 ### 引入 diff --git a/src/popover/index.js b/src/popover/index.js index 9b5339947..82de6ea0b 100644 --- a/src/popover/index.js +++ b/src/popover/index.js @@ -127,13 +127,14 @@ export default createComponent({ const renderAction = (action, index) => { const { icon, text, disabled, className } = action; return ( -
onClickAction(action, index)} > {icon && }
{text}
-
+ ); }; diff --git a/src/popover/index.less b/src/popover/index.less index 31fd3f6bd..bc9d5c046 100644 --- a/src/popover/index.less +++ b/src/popover/index.less @@ -34,6 +34,9 @@ padding: 0 @padding-md; font-size: @popover-action-font-size; line-height: @line-height-md; + background-color: transparent; + border: none; + cursor: pointer; &:last-child { .van-popover__action-text::after { @@ -212,6 +215,7 @@ &--disabled { color: @popover-light-action-disabled-text-color; + cursor: not-allowed; &:active { background-color: transparent; diff --git a/src/popover/test/__snapshots__/index.spec.js.snap b/src/popover/test/__snapshots__/index.spec.js.snap index 5072b608c..46429c21c 100644 --- a/src/popover/test/__snapshots__/index.spec.js.snap +++ b/src/popover/test/__snapshots__/index.spec.js.snap @@ -1,11 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`should allow to custom the className of action 1`] = ` -
+
+ `; exports[`should locate to reference element when showed 1`] = ` diff --git a/src/slider/demo/index.vue b/src/slider/demo/index.vue index 2b02445b8..78d5a240e 100644 --- a/src/slider/demo/index.vue +++ b/src/slider/demo/index.vue @@ -3,7 +3,7 @@ - + @@ -43,7 +43,7 @@ v-model="value9" range vertical - style="margin-left: 100px;" + style="margin-left: 100px" @change="onChange" />