Merge branch 'dev' into next

src/dialog/Dialog.js

@@ -119,7 +119,7 @@ export default createComponent({
       const { title, message, allowHtml, messageAlign } = props;
       if (message) {
         return (
-          <div class={bem('content')}>
+          <div class={bem('content', { isolated: !slots.title })}>
             <div
               class={bem('message', {
                 'has-title': slots.title || title,

src/dialog/index.less

@@ -27,9 +27,18 @@
     }
   }
 
+  &__content {
+    &--isolated {
+      display: flex;
+      align-items: center;
+      min-height: 104px;
+    }
+  }
+
   &__message {
+    flex: 1;
     max-height: @dialog-message-max-height;
-    padding: @dialog-message-padding;
+    padding: 26px @dialog-message-padding;
     overflow-y: auto;
     font-size: @dialog-message-font-size;
     line-height: @dialog-message-line-height;
@@ -63,6 +72,7 @@
   &__confirm,
   &__cancel {
     flex: 1;
+    height: @dialog-button-height;
     margin: 0;
     border: 0;
   }
@@ -86,6 +96,11 @@
       color: @text-color;
     }
 
+    .van-dialog__confirm,
+    .van-dialog__cancel {
+      height: @dialog-round-button-height;
+    }
+
     .van-dialog__confirm {
       color: @white;
     }

src/number-keyboard/Key.js

@@ -38,7 +38,10 @@ export default createComponent({
     const onTouchEnd = (event) => {
       if (active.value) {
         // eliminate tap delay on safari
-        event.preventDefault();
+        // see: https://github.com/youzan/vant/issues/6836
+        if (!slots.default) {
+          event.preventDefault();
+        }
         active.value = false;
         emit('press', props.text, props.type);
       }

src/slider/README.md

@@ -111,8 +111,14 @@ export default {
 
 ```html
 <div :style="{ height: '150px' }">
-  <van-slider v-model="value" vertical />
-  <van-slider v-model="value2" range vertical @change="onChange" />
+  <van-slider v-model="value" vertical @change="onChange" />
+  <van-slider
+    v-model="value2"
+    range
+    vertical
+    style="margin-left: 100px;"
+    @change="onChange"
+  />
 </div>
 ```
 

src/slider/README.zh-CN.md

@@ -114,7 +114,13 @@ export default {
 ```html
 <div :style="{ height: '150px' }">
   <van-slider v-model="value" vertical @change="onChange" />
-  <van-slider v-model="value2" range vertical @change="onChange" />
+  <van-slider
+    v-model="value2"
+    range
+    vertical
+    style="margin-left: 100px;"
+    @change="onChange"
+  />
 </div>
 ```
 

src/slider/test/__snapshots__/demo.spec.js.snap

@@ -69,7 +69,7 @@ exports[`renders demo correctly 1`] = `
     </div>
   </div>
   <div>
-    <div style="height: 120px; padding-left: 30px;">
+    <div style="height: 150px; padding-left: 30px;">
       <div class="van-slider van-slider--vertical">
         <div class="van-slider__bar" style="height: 50%;">
           <div role="slider" tabindex="0" aria-valuemin="0" aria-valuenow="50" aria-valuemax="100" aria-orientation="vertical" class="van-slider__button-wrapper">
@@ -77,11 +77,7 @@ exports[`renders demo correctly 1`] = `
           </div>
         </div>
       </div>
-    </div>
-  </div>
-  <div>
-    <div style="height: 120px; padding-left: 30px;">
-      <div class="van-slider van-slider--vertical">
+      <div class="van-slider van-slider--vertical" style="margin-left: 100px;">
         <div class="van-slider__bar" style="height: 40%; top: 20%;">
           <div role="slider" tabindex="0" aria-valuemin="0" aria-valuenow="20,60" aria-valuemax="100" aria-orientation="vertical" class="van-slider__button-wrapper-left">
             <div class="van-slider__button"></div>

src/style/var.less

@@ -318,7 +318,7 @@
 @dialog-background-color: @white;
 @dialog-header-font-weight: @font-weight-bold;
 @dialog-header-line-height: 24px;
-@dialog-header-padding-top: @padding-lg;
+@dialog-header-padding-top: 26px;
 @dialog-header-isolated-padding: @padding-lg 0;
 @dialog-message-padding: @padding-lg;
 @dialog-message-font-size: @font-size-md;
@@ -326,6 +326,8 @@
 @dialog-message-max-height: 60vh;
 @dialog-has-title-message-text-color: @gray-7;
 @dialog-has-title-message-padding-top: @padding-xs;
+@dialog-button-height: 48px;
+@dialog-round-button-height: 36px;
 @dialog-confirm-button-text-color: @red;
 
 // Divider
@@ -369,7 +371,7 @@
 @field-input-text-color: @text-color;
 @field-input-error-text-color: @red;
 @field-input-disabled-text-color: @gray-5;
-@field-placeholder-text-color: @gray-5;
+@field-placeholder-text-color: @gray-6;
 @field-icon-size: 16px;
 @field-clear-icon-size: 16px;
 @field-clear-icon-color: @gray-5;