From 5debc352fffaa5d3cee35c8920f48e57ca203e35 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Thu, 17 Sep 2020 10:58:40 +0800
Subject: [PATCH] style(Dialog): add message min-height (#7191)

---
 src/dialog/Dialog.js  |  2 +-
 src/dialog/index.less | 17 ++++++++++++++++-
 src/style/var.less    |  4 +++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/dialog/Dialog.js b/src/dialog/Dialog.js
index 19b9e694e..68359efac 100644
--- a/src/dialog/Dialog.js
+++ b/src/dialog/Dialog.js
@@ -187,7 +187,7 @@ export default createComponent({
         };
 
         return (
-          <div class={bem('content')}>
+          <div class={bem('content', { isolated: !hasTitle })}>
             <div {...data} />
           </div>
         );
diff --git a/src/dialog/index.less b/src/dialog/index.less
index 8af647bf8..ad8a76b92 100644
--- a/src/dialog/index.less
+++ b/src/dialog/index.less
@@ -29,9 +29,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;
@@ -65,6 +74,7 @@
   &__confirm,
   &__cancel {
     flex: 1;
+    height: @dialog-button-height;
     margin: 0;
     border: 0;
   }
@@ -88,6 +98,11 @@
       color: @text-color;
     }
 
+    .van-dialog__confirm,
+    .van-dialog__cancel {
+      height: @dialog-round-button-height;
+    }
+
     .van-dialog__confirm {
       color: @white;
     }
diff --git a/src/style/var.less b/src/style/var.less
index 08e075ce5..332bc6c5d 100644
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -306,7 +306,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;
@@ -314,6 +314,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