Merge branch 'dev' into next

src/dialog/index.less

@@ -55,19 +55,15 @@
   }
 
   &__footer {
+    display: flex;
     overflow: hidden;
     user-select: none;
-
-    &--buttons {
-      display: flex;
-
-      .van-button {
-        flex: 1;
-      }
-    }
   }
 
-  .van-button {
+  &__confirm,
+  &__cancel {
+    flex: 1;
+    margin: 0;
     border: 0;
   }
 
@@ -78,6 +74,23 @@
     }
   }
 
+  &--round-button {
+    .van-dialog__footer {
+      position: relative;
+      height: auto;
+      padding: @padding-xs @padding-lg @padding-md;
+    }
+
+    .van-dialog__message {
+      padding-bottom: @padding-md;
+      color: @text-color;
+    }
+
+    .van-dialog__confirm {
+      color: @white;
+    }
+  }
+
   &-bounce-enter-from {
     transform: translate3d(-50%, -50%, 0) scale(0.7);
     opacity: 0;