merge: merge master

This commit is contained in:
jiangruowei
2017-03-15 16:31:00 +08:00
50 changed files with 979 additions and 58 deletions
+1
View File
@@ -1,5 +1,6 @@
@import './common/var.css';
@import './mixins/border_retina.css';
@import './popup.css';
@component-namespace zan {
@b actionsheet {
+2 -2
View File
@@ -1,5 +1,5 @@
@import "./common/var.css";
@import "./mixins/border_retina.css";
@import './common/var.css';
@import './mixins/border_retina.css';
@component-namespace zan {
@b badge-group {
+1 -1
View File
@@ -1,4 +1,4 @@
@import "./mixins/ellipsis.css";
@import './mixins/ellipsis.css';
@component-namespace zan {
@b card {
+2 -2
View File
@@ -1,5 +1,5 @@
@import "./common/var.css";
@import "./mixins/border_retina.css";
@import './common/var.css';
@import './mixins/border_retina.css';
@component-namespace zan {
@b cell-group {
+1 -1
View File
@@ -1,4 +1,4 @@
@import "./common/var.css";
@import './common/var.css';
@component-namespace zan {
@b checkbox {
+2 -1
View File
@@ -1,4 +1,5 @@
@import "./mixins/border_retina.css";
@import './mixins/border_retina.css';
@import './popup.css';
@component-namespace zan {
@b dialog-wrapper {
+18 -2
View File
@@ -1,5 +1,6 @@
@import "./common/var.css";
@import "./mixins/border_retina.css";
@import './common/var.css';
@import './mixins/border_retina.css';
@import './cell.css';
@component-namespace zan {
@b field {
@@ -36,6 +37,21 @@
}
}
@m border {
.zan-field__control {
padding-left: 10px;
}
&::after {
border-radius: 2px;
@mixin border-retina (top, right, bottom, left);
}
&:last-child::after {
@mixin border-retina (bottom);
}
}
.zan-cell__title,
.zan-cell__value {
float: none;
+2
View File
@@ -26,3 +26,5 @@
@import './quantity.css';
@import './progress.css';
@import './toast.css';
@import './uploader.css';
@import './swipe.css';
+1 -1
View File
@@ -1,4 +1,4 @@
@import "./mixins/border_retina.css";
@import './mixins/border_retina.css';
@component-namespace zan {
@b picker {
+1 -1
View File
@@ -6,7 +6,7 @@
top: 0;
left: 0;
background-color: rgba(0, 0, 0, 0.701961);
transition: background-color .5s ease-out;
transition: all .5s ease-out;
}
@b popup {
+1 -1
View File
@@ -1,4 +1,4 @@
@import "./common/var.css";
@import './common/var.css';
@component-namespace zan {
@b search {
+2 -2
View File
@@ -1,5 +1,5 @@
@import "./common/var.css";
@import "./mixins/ellipsis.css";
@import './common/var.css';
@import './mixins/ellipsis.css';
@component-namespace zan {
@b steps {
+24
View File
@@ -0,0 +1,24 @@
@component-namespace zan {
@b swipe {
position: relative;
overflow: hidden;
width: 100%;
}
@b swipe-item {
display: none;
width: 100%;
height: 100%;
overflow: hidden;
text-align: center;
img {
max-width: 100%;
max-height: 100%;
}
&:first-child {
display: block;
}
}
}
+1 -1
View File
@@ -1,4 +1,4 @@
@import "./mixins/border_retina.css";
@import './mixins/border_retina.css';
@component-namespace zan {
@b switch {
+3 -2
View File
@@ -1,5 +1,6 @@
@import "./common/var.css";
@import "./mixins/border_retina.css";
@import './common/var.css';
@import './mixins/border_retina.css';
@component-namespace zan {
@b tabs {
position: relative;
+2 -2
View File
@@ -1,5 +1,5 @@
@import "./common/var.css";
@import "./mixins/border_retina.css";
@import './common/var.css';
@import './mixins/border_retina.css';
@component-namespace zan {
@b tag {
+24
View File
@@ -0,0 +1,24 @@
@component-namespace zan {
@b uploader {
position: relative;
display: inline-block;
@e input {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
display: block;
width: 100%;
height: 100%;
opacity: 0;
cursor:pointer;
}
input[type="file" i]::-webkit-file-upload-button {
cursor:pointer;
}
}
}