Merge branch '2.x' into dev

2020-11-01 20:52:07 +08:00
parent 2270dbeddc 7e1ad5dbd5
commit c60b899c42
15 changed files with 993 additions and 31 deletions
@@ -154,7 +154,6 @@
  }

  &__icon {
-    min-width: 1em;
    font-size: 1.2em;
    line-height: inherit;
  }
@@ -50,7 +50,6 @@

  &__left-icon,
  &__right-icon {
-    min-width: 1em;
    height: @cell-line-height;
    font-size: @cell-icon-size;
    line-height: @cell-line-height;
@@ -116,7 +116,6 @@
  &__left-icon .van-icon,
  &__right-icon .van-icon {
    display: block;
-    min-width: 1em;
    font-size: @field-icon-size;
    line-height: inherit;
  }
@@ -1,5 +1,5 @@
@import '../style/var';
-@import '~@vant/icons/src/index.less';
+@import '~@vant/icons/src/encode-woff2.less';

 .van-icon {
  &__image {
@@ -16,7 +16,6 @@
  }

  &__arrow {
-    min-width: 1em;
    margin-right: @padding-base;
    font-size: @nav-bar-arrow-size;
  }
@@ -17,7 +17,6 @@

    .van-icon {
      display: block;
-      min-width: 1em;
    }

    img {
@@ -91,7 +91,6 @@
  }

  &__close {
-    min-width: 1em;
    margin-left: 2px;
    cursor: pointer;
  }