Merge branch 'master' of gitlab.qima-inc.com:weapp/zui

This commit is contained in:
pangxie1991 2017-01-13 11:09:19 +08:00
commit 8a37c3397b

View File

@ -64,7 +64,9 @@
transform: translateY(-50%) matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
}
.zui-ellipsis {
.zui-ellipsis,
.zui-ellipsis--l2,
.zui-ellipsis--l3 {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@ -74,13 +76,17 @@
.zui-ellipsis--l2 {
max-height: 40px;
line-height: 20px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.zui-ellipsis--l3 {
max-height: 60px;
line-height: 20px;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
.zui-clearfix {
zoom: 1;
}