merge: merge master&&rebuild docs

This commit is contained in:
jiangruowei
2017-03-13 21:19:39 +08:00
12 changed files with 118 additions and 43 deletions

View File

@@ -2,7 +2,8 @@
@component-namespace zan {
@b card {
padding: 5px 15px;
padding: 5px 15px 5px 115px;
height: 90px;
background: #FAFAFA;
overflow: hidden;
position: relative;
@@ -13,15 +14,17 @@
}
@e img {
float: left;
width: 90px;
height: 90px;
border: 0;
position: absolute;
top: 5px;
left: 15px;
}
@e content {
margin-left: 100px;
display: table;
width: 100%;
@when center {
display: table;
@@ -45,6 +48,7 @@
color: #333;
max-height: 40px;
margin-bottom: 5px;
word-break: break-all;
@mixin multi-ellipsis 2;
}
@@ -52,6 +56,7 @@
font-size: 12px;
color: #666;
max-height: 20px;
word-break: break-all;
@mixin multi-ellipsis 1;
}