Merge remote-tracking branch 'main/dev' into dev

This commit is contained in:
陈嘉涵
2017-09-04 15:15:35 +08:00
7 changed files with 51 additions and 6 deletions
+1 -1
View File
@@ -49,7 +49,7 @@ import Toast from './toast';
import Uploader from './uploader';
import Waterfall from './waterfall';
const version = '0.8.7';
const version = '0.8.9';
const components = [
Actionsheet,
Badge,
+4 -1
View File
@@ -3,7 +3,10 @@
<div class="van-swipe__items">
<slot></slot>
</div>
<div class="van-swipe__indicators" v-if="showIndicators">
<div
class="van-swipe__indicators"
v-if="showIndicators && swipes.length > 1"
>
<span class="van-swipe__indicator" v-for="(item, index) in swipes.length" :key="index" :class="{
'van-swipe__indicator--active': currIndex === index
}">
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "vant-css",
"version": "0.8.7",
"version": "0.8.9",
"description": "vant css.",
"main": "lib/index.css",
"style": "lib/index.css",
+10 -2
View File
@@ -1,10 +1,12 @@
@import "./mixins/ellipsis";
@import "./mixins/clearfix";
@import "./mixins/ellipsis.css";
@import "./mixins/clearfix.css";
@import './common/var.css';
.van-deep-select {
user-select: none;
position: relative;
@mixin clearfix;
&__nav {
width: 143px;
/*float: left;*/
@@ -16,31 +18,37 @@
background-color: $c-white;
-webkit-overflow-scrolling: touch;
}
&__nitem {
line-height: 44px;
padding: 0 15px;
background-color: $c-white;
@mixin multi-ellipsis 1;
&--active {
background-color: $c-background;
}
}
&__content {
padding: 0 15px;
margin-left: 143px;
overflow: scroll;
-webkit-overflow-scrolling: touch;
}
&__item {
position: relative;
line-height: 44px;
padding-left: 5px;
padding-right: 18px;
@mixin multi-ellipsis 1;
&--active {
color: $button-danger-background-color;
}
}
&__selected {
float: right;
position: absolute;
+1
View File
@@ -1,4 +1,5 @@
@import './common/var.css';
@import './mixins/border_retina.css';
.van-goods-action {
left: 0;