Merge branch 'master' into feature/code_review

This commit is contained in:
cookfront
2017-03-30 21:22:40 +08:00
7 changed files with 45 additions and 50 deletions

View File

@@ -36,16 +36,6 @@
@e title {
float: left;
&.zan-cell__required {
&::before {
content: '*';
position: absolute;
left: -7px;
font-size: 14px;
color: #f44;
}
}
}
@e label {
@@ -59,15 +49,32 @@
float: right;
overflow: hidden;
@when link {
@m link {
margin-right: 20px;
}
@when alone {
@m alone {
float: none;
}
}
@m required {
overflow: visible;
&::before {
content: '*';
position: absolute;
left: -7px;
font-size: 14px;
color: #f44;
}
.zan-cell__title {
float: none;
display: inline-block;
}
}
.zan-icon-arrow {
position: absolute;
top: 50%;

View File

@@ -44,9 +44,13 @@
}
.zan-toast__text {
padding-bottom: 20px;
padding: 15px 0 20px;
font-size: 14px;
}
}
}
}
.zan-toast-fade-enter, .zan-toast-fade-leave-active {
opacity: 0;
}