blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-25 02:41:46 +08:00
Code Issues Projects Releases Wiki Activity

feat(NavBar): add @nav-bar-z-index less var

Browse Source
This commit is contained in:
陈嘉涵 2020-01-28 11:49:13 +08:00
parent 6f4c6f5aa6
commit a2d870ad8e
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nav-bar/index.less
View File

@ -2,6 +2,7 @@
.van-nav-bar { .van-nav-bar {
position: relative; position: relative;
z-index: @nav-bar-z-index;
height: @nav-bar-height; height: @nav-bar-height;
line-height: @nav-bar-height; line-height: @nav-bar-height;
text-align: center; text-align: center;

5
src/nav-bar/index.tsx
View File

@ -82,6 +82,7 @@ function NavBar(
NavBar.props = { NavBar.props = {
title: String, title: String,
fixed: Boolean, fixed: Boolean,
zIndex: Number,
leftText: String, leftText: String,
rightText: String, rightText: String,
leftArrow: Boolean, leftArrow: Boolean,
@ -89,10 +90,6 @@ NavBar.props = {
type: Boolean, type: Boolean,
default: true, default: true,
}, },
zIndex: {
type: Number,
default: 1,
},
}; };
export default createComponent<NavBarProps, NavBarEvents>(NavBar); export default createComponent<NavBarProps, NavBarEvents>(NavBar);

4
src/nav-bar/test/__snapshots__/demo.spec.js.snap
View File

@ -3,7 +3,7 @@
exports[`renders demo correctly 1`] = ` exports[`renders demo correctly 1`] = `
<div> <div>
<div> <div>
<div class="van-nav-bar van-hairline--bottom" style="z-index: 1;"> <div class="van-nav-bar van-hairline--bottom">
<div class="van-nav-bar__left"><i class="van-icon van-icon-arrow-left van-nav-bar__arrow"> <div class="van-nav-bar__left"><i class="van-icon van-icon-arrow-left van-nav-bar__arrow">
<!----></i><span class="van-nav-bar__text">返回</span></div> <!----></i><span class="van-nav-bar__text">返回</span></div>
<div class="van-nav-bar__title van-ellipsis">标题</div> <div class="van-nav-bar__title van-ellipsis">标题</div>
@ -11,7 +11,7 @@ exports[`renders demo correctly 1`] = `
</div> </div>
</div> </div>
<div> <div>
<div class="van-nav-bar van-hairline--bottom" style="z-index: 1;"> <div class="van-nav-bar van-hairline--bottom">
<div class="van-nav-bar__left"><i class="van-icon van-icon-arrow-left van-nav-bar__arrow"> <div class="van-nav-bar__left"><i class="van-icon van-icon-arrow-left van-nav-bar__arrow">
<!----></i><span class="van-nav-bar__text">返回</span></div> <!----></i><span class="van-nav-bar__text">返回</span></div>
<div class="van-nav-bar__title van-ellipsis">标题</div> <div class="van-nav-bar__title van-ellipsis">标题</div>

4
src/nav-bar/test/__snapshots__/index.spec.js.snap
View File

@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`render left & right slot 1`] = ` exports[`render left & right slot 1`] = `
<div class="van-nav-bar van-hairline--bottom" style="z-index: 1;"> <div class="van-nav-bar van-hairline--bottom">
<div class="van-nav-bar__left">Custom Left</div> <div class="van-nav-bar__left">Custom Left</div>
<div class="van-nav-bar__title van-ellipsis"></div> <div class="van-nav-bar__title van-ellipsis"></div>
<div class="van-nav-bar__right">Custom Right</div> <div class="van-nav-bar__right">Custom Right</div>
@ -9,7 +9,7 @@ exports[`render left & right slot 1`] = `
`; `;
exports[`render title slot 1`] = ` exports[`render title slot 1`] = `
<div class="van-nav-bar van-hairline--bottom" style="z-index: 1;"> <div class="van-nav-bar van-hairline--bottom">
<div class="van-nav-bar__left"></div> <div class="van-nav-bar__left"></div>
<div class="van-nav-bar__title van-ellipsis">Custom Title</div> <div class="van-nav-bar__title van-ellipsis">Custom Title</div>
<div class="van-nav-bar__right"></div> <div class="van-nav-bar__right"></div>

1
src/style/var.less
View File

@ -427,6 +427,7 @@
@nav-bar-text-color: @blue; @nav-bar-text-color: @blue;
@nav-bar-title-font-size: @font-size-lg; @nav-bar-title-font-size: @font-size-lg;
@nav-bar-title-text-color: @text-color; @nav-bar-title-text-color: @text-color;
@nav-bar-z-index: 1;
// NoticeBar // NoticeBar
@notice-bar-height: 40px; @notice-bar-height: 40px;