Merge branch 'master' into loading

packages/zanui-css/src/button.pcss

@@ -63,6 +63,9 @@
       font-size: 12px;
     }
 
+    /*
+      mini图标默认宽度50px，文字不能超过4个
+     */
     @m mini {
       display: inline-block;
       width: 50px;

packages/zanui-css/src/cell.pcss

@@ -2,7 +2,7 @@
 @import "./mixins/border_retina.pcss";
 
 @component-namespace z {
-  @component cell-group {
+  @b cell-group {
     padding-left: 10px;
     position: relative;
 
@@ -11,7 +11,7 @@
     }
   }
 
-  @component cell {
+  @b cell {
     display: block;
     overflow: hidden;
     position: relative;
@@ -33,19 +33,19 @@
       }
     }
 
-    @descendent title {
+    @empty-cells: show title {
       float: left;
       overflow: hidden;
     }
 
-    @descendent label {
+    @e label {
       display: block;
       font-size: 12px;
       line-height: 1.2;
       color: #666;
     }
 
-    @descendent value {
+    @e value {
       float: right;
       overflow: hidden;
 

packages/zanui-css/src/dialog.pcss

@@ -1,11 +1,11 @@
 @import "./mixins/border_retina.pcss";
 
 @component-namespace z {
-  @component dialog-wrapper {
+  @b dialog-wrapper {
     position: absolute;
   }
 
-  @component dialog {
+  @b dialog {
     position: fixed;
     top: 50%;
     left: 50%;
@@ -18,11 +18,11 @@
     backface-visibility: hidden;
     transition: .2s;
 
-    @descendent header {
+    @e header {
       padding: 15px 0 0;
     }
 
-    @descendent content {
+    @e content {
       padding: 15px 20px;
       min-height: 36px;
       position: relative;
@@ -32,7 +32,7 @@
       }
     }
 
-    @descendent title {
+    @e title {
       text-align: center;
       padding-left: 0;
       margin-bottom: 0;
@@ -40,31 +40,31 @@
       color: #333;
     }
 
-    @descendent message {
+    @e message {
       color: #999;
       margin: 0;
       font-size: 14px;
       line-height: 1.5;
     }
 
-    @descendent footer {
+    @e footer {
       font-size: 14px;
       overflow: hidden;
-    }
 
-    .is-twobtn {
-      .z-dialog-btn {
-        width: 50%;
-      }
+      @when twobtn {
+        .z-dialog__btn {
+          width: 50%;
+        }
 
-      .z-dialog-cancel {
-        &::after {
-          @mixin border-retina (right);
+        .z-dialog__cancel {
+          &::after {
+            @mixin border-retina (right);
+          }
         }
       }
     }
 
-    @descendent btn {
+    @e btn {
       line-height: 40px;
       border: 0;
       background-color: #fff;
@@ -74,11 +74,11 @@
       position: relative;
     }
 
-    @descendent cancel {
+    @e cancel {
       color: #333;
     }
 
-    @descendent confirm {
+    @e confirm {
       color: #00C000;
       width: 100%;
     }

packages/zanui-css/src/field.pcss

@@ -2,46 +2,46 @@
 @import "./mixins/border_retina.pcss";
 
 @component-namespace z {
-  @component field {
+  @b field {
     width: 100%;
     overflow: hidden;
 
     @when textarea {
-      .z-field-control {
+      .z-field__control {
         min-height: 60px;
       }
     }
 
     @when nolabel {
-      .z-cell-title {
+      .z-cell__title {
         display: none;
       }
 
-      .z-cell-value {
+      .z-cell__value {
         width: 100%;
         padding-left: 0;
       }
     }
 
-    .z-cell-title,
-    .z-cell-value {
+    .z-cell__title,
+    .z-cell__value {
       float: none;
       box-sizing: border-box;
     }
 
-    .z-cell-title {
+    .z-cell__title {
       width: 90px;
       position: absolute;
       top: 10px;
       left: 0;
     }
 
-    .z-cell-value {
+    .z-cell__value {
       width: 100%;
       padding-left: 90px;
     }
 
-    .z-field-control {
+    @e control {
       border: 0;
       font-size: 14px;
       line-height: 22px;

packages/zanui-css/src/popup.pcss

@@ -8,7 +8,7 @@
 }
 
 @component-namespace z {
-  @component popup {
+  @b popup {
     position: fixed;
     background-color: #fff;
     top: 50%;
@@ -17,7 +17,7 @@
     backface-visibility: hidden;
     transition: .2s ease-out;
 
-    @modifier top {
+    @m top {
       top: 0;
       right: auto;
       bottom: auto;
@@ -25,7 +25,7 @@
       transform: translate3d(-50%, 0, 0);
     }
 
-    @modifier right {
+    @m right {
       top: 50%;
       right: 0;
       bottom: auto;
@@ -33,7 +33,7 @@
       transform: translate3d(0, -50%, 0);
     }
 
-    @modifier bottom {
+    @m bottom {
       top: auto;
       bottom: 0;
       right: auto;
@@ -41,7 +41,7 @@
       transform: translate3d(-50%, 0, 0);
     }
 
-    @modifier left {
+    @m left {
       top: 50%;
       right: auto;
       bottom: auto;