merge: merge master

This commit is contained in:
jiangruowei
2017-03-22 17:08:28 +08:00
50 changed files with 871 additions and 255 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "@youzan/zanui-css",
"version": "0.0.38",
"version": "0.0.39",
"description": "zanui css.",
"main": "lib/index.css",
"style": "lib/index.css",

View File

@@ -65,7 +65,7 @@
}
@when alone {
float: left;
float: none;
}
}

View File

@@ -50,6 +50,12 @@
}
}
@m autosize {
.zan-field__control {
min-height: 0px;
}
}
.zan-cell__title,
.zan-cell__value {
float: none;

View File

@@ -48,6 +48,18 @@
width: 33.333%;
}
}
@m 4 {
.zan-picker-column {
width: 25%;
}
}
@m 5 {
.zan-picker-column {
width: 20%;
}
}
}
}

View File

@@ -29,7 +29,7 @@
padding: 45px;
}
@m text {
@m text, html {
padding: 12px;
min-width: 200px;
}