Merge pull request #17364 from ant-design/feature

merge Feature into master
ant-design · Jun 29, 2019 · 319b11d · 319b11d
2 parents f557cf8 + 8eceb04
commit 319b11d
Show file tree

Hide file tree

Showing 36 changed files with 8,064 additions and 137 deletions.
diff --git a/components/collapse/style/index.less b/components/collapse/style/index.less
@@ -9,15 +9,15 @@
   background-color: @collapse-header-bg;
   border: @border-width-base @border-style-base @border-color-base;
   border-bottom: 0;
-  border-radius: @border-radius-base;
+  border-radius: @collapse-panel-border-radius;
 
   & > &-item {
     border-bottom: @border-width-base @border-style-base @border-color-base;
 
     &:last-child {
       &,
       & > .@{collapse-prefix-cls}-header {
-        border-radius: 0 0 @border-radius-base @border-radius-base;
+        border-radius: 0 0 @collapse-panel-border-radius @collapse-panel-border-radius;
       }
     }
 
@@ -97,7 +97,7 @@
 
   &-item:last-child {
     > .@{collapse-prefix-cls}-content {
-      border-radius: 0 0 @border-radius-base @border-radius-base;
+      border-radius: 0 0 @collapse-panel-border-radius @collapse-panel-border-radius;
     }
   }