mirror of
https://gitee.com/vant-contrib/vant.git
synced 2025-05-22 22:49:15 +08:00
fix: component style should not depend on reset.css
This commit is contained in:
parent
fd36e37dc0
commit
d85025ebf7
@ -12,6 +12,13 @@
|
|||||||
.van-steps__message + p {
|
.van-steps__message + p {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
p,
|
||||||
|
h3 {
|
||||||
|
margin: 0;
|
||||||
|
font-size: inherit;
|
||||||
|
font-weight: normal;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
@ -29,33 +29,33 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.side-nav {
|
.side-nav {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 90px 15px 20px;
|
padding: 40px 15px 20px;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
|
|
||||||
.zanui-title,
|
.zanui-title,
|
||||||
.zanui-desc {
|
.zanui-desc {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
|
||||||
|
|
||||||
.zanui-title {
|
|
||||||
padding-top: 40px;
|
|
||||||
height: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
background: url(https://img.yzcdn.cn/upload_files/2017/04/20/FjwR1mraVIqtHWb8YWDW_YzQ_Kh2.png) center center no-repeat;
|
|
||||||
background-size: 156px 40px;
|
|
||||||
margin-bottom: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.zanui-desc {
|
|
||||||
font-size: 14px;
|
|
||||||
color: #666;
|
|
||||||
margin-bottom: 50px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.zanui-title {
|
||||||
|
padding-top: 40px;
|
||||||
|
height: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
background: url(https://img.yzcdn.cn/upload_files/2017/04/20/FjwR1mraVIqtHWb8YWDW_YzQ_Kh2.png) center center no-repeat;
|
||||||
|
background-size: 156px 40px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.zanui-desc {
|
||||||
|
font-size: 14px;
|
||||||
|
color: #666;
|
||||||
|
margin-bottom: 50px;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<transition name="van-actionsheet-float">
|
<transition name="van-actionsheet-float">
|
||||||
<div :class="['van-actionsheet', { 'van-actionsheet--withtitle': title }]" v-show="value">
|
<div :class="['van-actionsheet', { 'van-actionsheet--withtitle': title }]" v-show="value">
|
||||||
<div class="van-actionsheet__header van-hairline--top-bottom" v-if="title">
|
<div class="van-actionsheet__header van-hairline--top-bottom" v-if="title">
|
||||||
<h3 v-text="title" />
|
<div v-text="title" />
|
||||||
<van-icon name="close" @click.stop="$emit('input', false)" />
|
<van-icon name="close" @click.stop="$emit('input', false)" />
|
||||||
</div>
|
</div>
|
||||||
<ul v-if="!title" class="van-actionsheet__list">
|
<ul v-if="!title" class="van-actionsheet__list">
|
||||||
|
@ -8,14 +8,14 @@
|
|||||||
<div class="van-card__content">
|
<div class="van-card__content">
|
||||||
<slot name="title">
|
<slot name="title">
|
||||||
<div class="van-card__row" v-if="title || price !== undefined">
|
<div class="van-card__row" v-if="title || price !== undefined">
|
||||||
<h4 v-if="title" class="van-card__title">{{ title }}</h4>
|
<div v-if="title" class="van-card__title">{{ title }}</div>
|
||||||
<p v-if="price !== undefined" class="van-card__price">¥ {{ price }}</p>
|
<div v-if="price !== undefined" class="van-card__price">¥ {{ price }}</div>
|
||||||
</div>
|
</div>
|
||||||
</slot>
|
</slot>
|
||||||
<slot name="desc">
|
<slot name="desc">
|
||||||
<div class="van-card__row" v-if="desc || num !== undefined">
|
<div class="van-card__row" v-if="desc || num !== undefined">
|
||||||
<p v-if="desc" class="van-card__desc">{{ desc }}</p>
|
<div v-if="desc" class="van-card__desc">{{ desc }}</div>
|
||||||
<p v-if="num !== undefined" class="van-card__num">x {{ num }}</p>
|
<div v-if="num !== undefined" class="van-card__num">x {{ num }}</div>
|
||||||
</div>
|
</div>
|
||||||
</slot>
|
</slot>
|
||||||
<slot name="tags"></slot>
|
<slot name="tags"></slot>
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
@touchcancel="blurKey"
|
@touchcancel="blurKey"
|
||||||
@animationend="onAnimationEnd"
|
@animationend="onAnimationEnd"
|
||||||
>
|
>
|
||||||
<h3 class="van-number-keyboard__title van-hairline--top">
|
<div class="van-number-keyboard__title van-hairline--top">
|
||||||
<span>{{ title }}</span>
|
<span>{{ title }}</span>
|
||||||
</h3>
|
</div>
|
||||||
<i
|
<i
|
||||||
v-for="(key, index) in keys"
|
v-for="(key, index) in keys"
|
||||||
v-text="key"
|
v-text="key"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<div class="van-panel van-hairline--top-bottom">
|
<div class="van-panel van-hairline--top-bottom">
|
||||||
<div class="van-panel__header van-hairline--bottom">
|
<div class="van-panel__header van-hairline--bottom">
|
||||||
<slot name="header">
|
<slot name="header">
|
||||||
<h4 class="van-panel__title" v-text="title"></h4>
|
<div class="van-panel__title" v-text="title"></div>
|
||||||
<span class="van-panel__desc" v-if="desc" v-text="desc"></span>
|
<span class="van-panel__desc" v-if="desc" v-text="desc"></span>
|
||||||
<span class="van-panel__status" v-if="status" v-text="status"></span>
|
<span class="van-panel__status" v-if="status" v-text="status"></span>
|
||||||
</slot>
|
</slot>
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<slot>
|
<slot>
|
||||||
<a href="javascript:void(0)" class="van-picker__cancel" @click="handlePickerCancel">取消</a>
|
<a href="javascript:void(0)" class="van-picker__cancel" @click="handlePickerCancel">取消</a>
|
||||||
<a href="javascript:void(0)" class="van-picker__confirm" @click="handlePickerConfirm">完成</a>
|
<a href="javascript:void(0)" class="van-picker__confirm" @click="handlePickerConfirm">完成</a>
|
||||||
<p v-if="title" class="van-picker__title">{{ title }}</p>
|
<div v-if="title" class="van-picker__title">{{ title }}</div>
|
||||||
</slot>
|
</slot>
|
||||||
</div>
|
</div>
|
||||||
<div class="van-picker__columns" :class="['van-picker__columns--' + columns.length]">
|
<div class="van-picker__columns" :class="['van-picker__columns--' + columns.length]">
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="van-steps__message">
|
<div class="van-steps__message">
|
||||||
<div class="van-steps__message-wrapper">
|
<div class="van-steps__message-wrapper">
|
||||||
<h4 class="van-steps__title" v-text="title"></h4>
|
<div class="van-steps__title" v-text="title"></div>
|
||||||
<p class="van-steps__desc" v-text="description"></p>
|
<div class="van-steps__desc" v-text="description"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<slot name="message-extra">
|
<slot name="message-extra">
|
||||||
|
@ -6,4 +6,3 @@
|
|||||||
@import "./common/normalize.css";
|
@import "./common/normalize.css";
|
||||||
@import "./common/hairline.css";
|
@import "./common/hairline.css";
|
||||||
@import "./common/animation.css";
|
@import "./common/animation.css";
|
||||||
|
|
||||||
|
4
packages/vant-css/src/common/normalize.css
vendored
4
packages/vant-css/src/common/normalize.css
vendored
@ -6,6 +6,10 @@ html {
|
|||||||
-webkit-tap-highlight-color: transparent;
|
-webkit-tap-highlight-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
height: 50px;
|
height: 50px;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
min-width: 15%;
|
min-width: 15%;
|
||||||
|
line-height: 1;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user