Merge branch '2.x' into dev

2020-12-01 10:12:54 +08:00
parent d0c4c26d75 b57f7e9d98
commit 28afc8a521
48 changed files with 259 additions and 178 deletions
@@ -3,7 +3,7 @@
 exports[`should change the color of submit button when using button-color prop 1`] = `
 <button type="button"
        class="van-button van-button--danger van-button--normal van-button--round van-submit-bar__button van-submit-bar__button--danger"
-        style="color: rgb(255, 255, 255); background: red; border-color: red;"
+        style="color: white; background: red; border-color: red;"
 >
  <div class="van-button__content">
  </div>