Merge branch 'master' into hotfix/switch_0317

2025-10-20 18:54:24 +00:00 · 2017-03-17 16:23:43 +08:00
parent 25ce414de2 ad8dec39a8
commit 25c42381f9
15 changed files with 207 additions and 135 deletions
--- a/packages/zanui-css/src/field.css
+++ b/packages/zanui-css/src/field.css
@@ -31,8 +31,7 @@
    }

    @m error {
-      .zan-field__control,
-      .zan-cell__title {
+      .zan-field__control {
        color: $c-red;
      }
    }
--- a/packages/zanui-css/src/picker.css
+++ b/packages/zanui-css/src/picker.css
@@ -3,6 +3,7 @@
@component-namespace zan {
  @b picker {
    overflow: hidden;
+    background-color: #fff;

    @e toolbar {
      height: 40px;