Merge branch '2.x' into dev

2020-10-31 18:19:32 +08:00
parent 8f17b898f2 fcadc2d79f
commit 2d2f0d8ad4
29 changed files with 324 additions and 69 deletions
@@ -9,7 +9,6 @@
  color: @sidebar-text-color;
  font-size: @sidebar-font-size;
  line-height: @sidebar-line-height;
-  word-wrap: break-word;
  background-color: @sidebar-background-color;
  cursor: pointer;
  user-select: none;
@@ -22,6 +21,11 @@
    border-bottom-width: 1px;
  }

+  &__text {
+    // https://github.com/youzan/vant/issues/7455
+    word-break: break-all;
+  }
+
  &--select {
    color: @sidebar-selected-text-color;
    font-weight: @sidebar-selected-font-weight;