chore: add control-radius (#34727)

ant-design · Mar 26, 2022 · 8a3ee71 · 8a3ee71
1 parent 9af935f
commit 8a3ee71
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/components/date-picker/style/index.less b/components/date-picker/style/index.less
@@ -23,7 +23,7 @@
   align-items: center;
   background: @picker-bg;
   border: @border-width-base @border-style-base @select-border-color;
-  border-radius: @border-radius-base;
+  border-radius: @control-border-radius;
   transition: border @animation-duration-slow, box-shadow @animation-duration-slow;
 
   &:hover,

diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less
@@ -66,7 +66,7 @@
   background-color: @input-bg;
   background-image: none;
   border: @border-width-base @border-style-base @input-border-color;
-  border-radius: @border-radius-base;
+  border-radius: @control-border-radius;
   transition: all 0.3s;
   .placeholder(); // Reset placeholder
 
@@ -193,7 +193,7 @@
     text-align: center;
     background-color: @input-addon-bg;
     border: @border-width-base @border-style-base @input-border-color;
-    border-radius: @border-radius-base;
+    border-radius: @control-border-radius;
     transition: all 0.3s;
 
     // Reset Select's style in addon
@@ -297,8 +297,8 @@
       border-top-right-radius: 0;
       border-bottom-right-radius: 0;
       .@{ant-prefix}-input-search & {
-        border-top-left-radius: @border-radius-base;
-        border-bottom-left-radius: @border-radius-base;
+        border-top-left-radius: @control-border-radius;
+        border-bottom-left-radius: @control-border-radius;
       }
     }
 
@@ -384,17 +384,17 @@
     & > .@{ant-prefix}-select:first-child > .@{ant-prefix}-select-selector,
     & > .@{ant-prefix}-select-auto-complete:first-child .@{ant-prefix}-input,
     & > .@{ant-prefix}-cascader-picker:first-child .@{ant-prefix}-input {
-      border-top-left-radius: @border-radius-base;
-      border-bottom-left-radius: @border-radius-base;
+      border-top-left-radius: @control-border-radius;
+      border-bottom-left-radius: @control-border-radius;
     }
 
     & > *:last-child,
     & > .@{ant-prefix}-select:last-child > .@{ant-prefix}-select-selector,
     & > .@{ant-prefix}-cascader-picker:last-child .@{ant-prefix}-input,
     & > .@{ant-prefix}-cascader-picker-focused:last-child .@{ant-prefix}-input {
       border-right-width: @border-width-base;
-      border-top-right-radius: @border-radius-base;
-      border-bottom-right-radius: @border-radius-base;
+      border-top-right-radius: @control-border-radius;
+      border-bottom-right-radius: @control-border-radius;
     }
 
     // https://github.com/ant-design/ant-design/issues/12493
@@ -416,7 +416,7 @@
         }
 
         & > .@{ant-prefix}-input {
-          border-radius: @border-radius-base 0 0 @border-radius-base;
+          border-radius: @control-border-radius 0 0 @control-border-radius;
         }
       }
     }

diff --git a/components/select/style/index.less b/components/select/style/index.less
@@ -13,7 +13,7 @@
   position: relative;
   background-color: @select-background;
   border: @border-width-base @border-style-base @select-border-color;
-  border-radius: @border-radius-base;
+  border-radius: @control-border-radius;
   transition: all 0.3s @ease-in-out;
 
   input {

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
@@ -108,6 +108,9 @@
 @border-radius-base: 2px;
 @border-radius-sm: @border-radius-base;
 
+// control border
+@control-border-radius: @border-radius-base;
+
 // vertical paddings
 @padding-lg: 24px; // containers
 @padding-md: 16px; // small containers and buttons
@@ -668,6 +671,7 @@
 
 // Tag
 // --
+@tag-border-radius: @border-radius-base;
 @tag-default-bg: @background-color-light;
 @tag-default-color: @text-color;
 @tag-font-size: @font-size-sm;

diff --git a/components/style/themes/variable.less b/components/style/themes/variable.less
@@ -163,6 +163,9 @@ html {
 @border-radius-base: 2px;
 @border-radius-sm: @border-radius-base;
 
+// control border
+@control-border-radius: @border-radius-base;
+
 // vertical paddings
 @padding-lg: 24px; // containers
 @padding-md: 16px; // small containers and buttons
@@ -723,6 +726,7 @@ html {
 
 // Tag
 // --
+@tag-border-radius: @border-radius-base;
 @tag-default-bg: @background-color-light;
 @tag-default-color: @text-color;
 @tag-font-size: @font-size-sm;