Merge branch 'master' of github.com:ant-design/ant-design

style/components/dialog.less

@@ -5,6 +5,6 @@
 
 
 .@{dialogPrefixCls}-footer button + button {
-  margin-left: 10px;
+  margin-left: 8px;
   margin-bottom: 0;
 }

style/components/dialog/Dialog.less

@@ -60,12 +60,14 @@
   }
 
   &-body {
-    padding: 20px;
+    padding: 8px 20px;
+    font-size: 12px;
+    line-height: 1.5;
   }
 
   &-footer {
     border-top: 1px solid #e9e9e9;
-    padding: 10px 20px 10px 10px;
+    padding: 8px 20px 16px 10px;
     text-align: right;
     border-radius: 0 0 5px 5px;
   }

style/components/index.less

@@ -5,7 +5,7 @@
 @import "datepicker";
 @import "dialog";
 @import "confirm";
-@import "tab";
+@import "tabs";
 @import "tooltip";
 @import "form";
 @import "loading";