chore: auto merge branchs (#34226)

chore: sync master into feature
ant-design · Feb 27, 2022 · faff0ec · faff0ec
2 parents 4ed6e93 + 1a2ced6
commit faff0ec
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 7 deletions.
diff --git a/components/divider/style/index.less b/components/divider/style/index.less
@@ -13,7 +13,7 @@
     top: -0.06em;
     display: inline-block;
     height: 0.9em;
-    margin: 0 8px;
+    margin: 0 @divider-vertical-gutter;
     vertical-align: middle;
     border-top: 0;
     border-left: @border-width-base solid @divider-color;

diff --git a/components/drawer/style/drawer.less b/components/drawer/style/drawer.less
@@ -134,8 +134,8 @@
     margin: 0;
     color: @heading-color;
     font-weight: 500;
-    font-size: @font-size-lg;
-    line-height: 22px;
+    font-size: @drawer-title-font-size;
+    line-height: @drawer-title-line-height;
   }
 
   &-content {

diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less
@@ -218,7 +218,7 @@
 
       &-selected {
         color: @dropdown-selected-color;
-        background-color: @item-active-bg;
+        background-color: @dropdown-selected-bg;
       }
 
       &:hover {

diff --git a/components/modal/style/confirm.less b/components/modal/style/confirm.less
@@ -23,7 +23,7 @@
       overflow: hidden;
       color: @heading-color;
       font-weight: 500;
-      font-size: @font-size-lg;
+      font-size: @modal-confirm-title-font-size;
       line-height: 1.4;
     }
 

diff --git a/components/radio/style/index.less b/components/radio/style/index.less
@@ -174,7 +174,7 @@ span.@{radio-prefix-cls} + * {
   display: inline-block;
   height: @btn-height-base;
   margin: 0;
-  padding: 0 @padding-md - 1px;
+  padding: 0 @radio-button-padding-horizontal;
   color: @radio-button-color;
   font-size: @font-size-base;
   line-height: @btn-height-base - 2px;

diff --git a/components/style/themes/default.less b/components/style/themes/default.less
@@ -283,10 +283,12 @@
 @divider-text-padding: 1em;
 @divider-orientation-margin: 5%;
 @divider-color: rgba(0, 0, 0, 6%);
+@divider-vertical-gutter: 8px;
 
 // Dropdown
 @dropdown-selected-color: @primary-color;
 @dropdown-menu-submenu-disabled-bg: @component-background;
+@dropdown-selected-bg: @item-active-bg;
 
 // Empty
 @empty-font-size: @font-size-base;
@@ -306,6 +308,7 @@
 @radio-button-color: @btn-default-color;
 @radio-button-hover-color: @primary-5;
 @radio-button-active-color: @primary-7;
+@radio-button-padding-horizontal: @padding-md - 1px;
 @radio-disabled-button-checked-bg: @disabled-active-bg;
 @radio-disabled-button-checked-color: @disabled-color;
 @radio-wrapper-margin-right: 8px;
@@ -563,6 +566,7 @@
 @modal-footer-border-width: @border-width-base;
 @modal-mask-bg: fade(@black, 45%);
 @modal-confirm-body-padding: 32px 32px 24px;
+@modal-confirm-title-font-size: @font-size-lg;
 
 // Progress
 // --
@@ -989,6 +993,8 @@
 @drawer-footer-padding-vertical: @modal-footer-padding-vertical;
 @drawer-footer-padding-horizontal: @modal-footer-padding-horizontal;
 @drawer-header-close-size: 56px;
+@drawer-title-font-size: @font-size-lg;
+@drawer-title-line-height: 22px;
 
 // Timeline
 // ---

diff --git a/components/style/themes/variable.less b/components/style/themes/variable.less
@@ -338,10 +338,12 @@ html {
 @divider-text-padding: 1em;
 @divider-orientation-margin: 5%;
 @divider-color: rgba(0, 0, 0, 6%);
+@divider-vertical-gutter: 8px;
 
 // Dropdown
 @dropdown-selected-color: @primary-color;
 @dropdown-menu-submenu-disabled-bg: @component-background;
+@dropdown-selected-bg: @item-active-bg;
 
 // Empty
 @empty-font-size: @font-size-base;
@@ -361,6 +363,7 @@ html {
 @radio-button-color: @btn-default-color;
 @radio-button-hover-color: @primary-5;
 @radio-button-active-color: @primary-7;
+@radio-button-padding-horizontal: @padding-md - 1px;
 @radio-disabled-button-checked-bg: @disabled-active-bg;
 @radio-disabled-button-checked-color: @disabled-color;
 @radio-wrapper-margin-right: 8px;
@@ -618,6 +621,7 @@ html {
 @modal-footer-border-width: @border-width-base;
 @modal-mask-bg: fade(@black, 45%);
 @modal-confirm-body-padding: 32px 32px 24px;
+@modal-confirm-title-font-size: @font-size-lg;
 
 // Progress
 // --
@@ -1044,6 +1048,8 @@ html {
 @drawer-footer-padding-vertical: @modal-footer-padding-vertical;
 @drawer-footer-padding-horizontal: @modal-footer-padding-horizontal;
 @drawer-header-close-size: 56px;
+@drawer-title-font-size: @font-size-lg;
+@drawer-title-line-height: 22px;
 
 // Timeline
 // ---

diff --git a/package.json b/package.json
@@ -209,7 +209,7 @@
     "eslint-plugin-jest": "^26.0.0",
     "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-markdown": "^2.0.0",
-    "eslint-plugin-react": "7.28.0",
+    "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.1.2",
     "eslint-plugin-unicorn": "^41.0.0",
     "fetch-jsonp": "^1.1.3",