From 75a4b06e449359582111c91e5719a8c4004cd14e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= <afc163@gmail.com>
Date: Wed, 8 Feb 2017 14:21:29 +0800
Subject: [PATCH] Unified border radius, close #4772 (#4773)

---
 components/card/style/index.less              | 2 +-
 components/checkbox/style/mixin.less          | 2 +-
 components/date-picker/style/Calendar.less    | 2 +-
 components/date-picker/style/RangePicker.less | 1 -
 components/input/style/mixin.less             | 1 -
 components/select/style/index.less            | 3 ---
 components/style/themes/default.less          | 2 +-
 components/upload/style/index.less            | 2 +-
 8 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/components/card/style/index.less b/components/card/style/index.less
index 3d6be426be..dbea66e1c0 100644
--- a/components/card/style/index.less
+++ b/components/card/style/index.less
@@ -4,7 +4,7 @@
 
 .@{card-prefix-cls} {
   background: @component-background;
-  border-radius: @border-radius-sm;
+  border-radius: @border-radius-base;
   font-size: @font-size-base;
   position: relative;
   overflow: hidden;
diff --git a/components/checkbox/style/mixin.less b/components/checkbox/style/mixin.less
index b402419150..9e99006136 100644
--- a/components/checkbox/style/mixin.less
+++ b/components/checkbox/style/mixin.less
@@ -28,7 +28,7 @@
       width: 14px;
       height: 14px;
       border: @border-width-base @border-style-base @border-color-base;
-      border-radius: 3px;
+      border-radius: @border-radius-sm;
       background-color: #fff;
       transition: all .3s;
 
diff --git a/components/date-picker/style/Calendar.less b/components/date-picker/style/Calendar.less
index 01f4549771..1d4c7fe42d 100644
--- a/components/date-picker/style/Calendar.less
+++ b/components/date-picker/style/Calendar.less
@@ -292,7 +292,7 @@
   .@{calendar-prefix-cls}-ok-btn {
     .btn;
     .btn-primary;
-    .button-size(@btn-padding-sm; @font-size-base; @border-radius-sm);
+    .button-size(@btn-padding-sm; @font-size-base; @border-radius-base);
     position: absolute;
     bottom: 8px;
     right: 9px;
diff --git a/components/date-picker/style/RangePicker.less b/components/date-picker/style/RangePicker.less
index 7047a30e5a..d5a64fd5d6 100644
--- a/components/date-picker/style/RangePicker.less
+++ b/components/date-picker/style/RangePicker.less
@@ -85,7 +85,6 @@
   .@{calendar-prefix-cls}-input,
   .@{calendar-timepicker-prefix-cls}-input {
     .input;
-    border-radius: @border-radius-sm;
     height: @input-height-sm;
     border: 0;
     box-shadow: none;
diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less
index d613f24cda..786290cdd7 100644
--- a/components/input/style/mixin.less
+++ b/components/input/style/mixin.less
@@ -12,7 +12,6 @@
 .input-sm() {
   padding: @input-padding-vertical-sm @input-padding-horizontal;
   height: @input-height-sm;
-  border-radius: @border-radius-sm;
 }
 
 // input status
diff --git a/components/select/style/index.less b/components/select/style/index.less
index e100f9560f..4d4fb23eb4 100644
--- a/components/select/style/index.less
+++ b/components/select/style/index.less
@@ -177,9 +177,6 @@
   }
 
   &-sm {
-    .@{select-prefix-cls}-selection {
-      border-radius: @border-radius-sm;
-    }
     .@{select-prefix-cls}-selection--single {
       height: @input-height-sm;
     }
diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index 1890718262..16b6054b00 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -91,7 +91,7 @@
 // Buttons
 @btn-font-weight        : 500;
 @btn-border-radius-base : @border-radius-base;
-@btn-border-radius-sm   : @border-radius-sm;
+@btn-border-radius-sm   : @border-radius-base;
 
 @btn-primary-color      : #fff;
 @btn-primary-bg         : @primary-color;
diff --git a/components/upload/style/index.less b/components/upload/style/index.less
index 2d557f3c26..1e94a72c7c 100644
--- a/components/upload/style/index.less
+++ b/components/upload/style/index.less
@@ -209,7 +209,7 @@
       height: 48px;
       display: block;
       overflow: hidden;
-      border-radius: @border-radius-sm;
+      border-radius: @border-radius-base;
     }
 
     .@{upload-item}-thumbnail.@{iconfont-css-prefix}:before {