mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-07 09:26:06 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

chore: auto merge branchs (#34226)

Browse Source 
chore: sync master into feature
This commit is contained in:
github-actions[bot] 2022-02-27 06:28:28 +00:00 committed by GitHub
commit faff0ec888
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/divider/style/index.less
View File

@ -13,7 +13,7 @@
top: -0.06em; top: -0.06em;
display: inline-block; display: inline-block;
height: 0.9em; height: 0.9em;
margin: 0 8px; margin: 0 @divider-vertical-gutter;
vertical-align: middle; vertical-align: middle;
border-top: 0; border-top: 0;
border-left: @border-width-base solid @divider-color; border-left: @border-width-base solid @divider-color;

4
components/drawer/style/drawer.less
View File

@ -134,8 +134,8 @@
margin: 0; margin: 0;
color: @heading-color; color: @heading-color;
font-weight: 500; font-weight: 500;
font-size: @font-size-lg; font-size: @drawer-title-font-size;
line-height: 22px; line-height: @drawer-title-line-height;
} }
&-content { &-content {

2
components/dropdown/style/index.less
View File

@ -218,7 +218,7 @@
&-selected { &-selected {
color: @dropdown-selected-color; color: @dropdown-selected-color;
background-color: @item-active-bg; background-color: @dropdown-selected-bg;
} }
&:hover { &:hover {

2
components/modal/style/confirm.less
View File

@ -23,7 +23,7 @@
overflow: hidden; overflow: hidden;
color: @heading-color; color: @heading-color;
font-weight: 500; font-weight: 500;
font-size: @font-size-lg; font-size: @modal-confirm-title-font-size;
line-height: 1.4; line-height: 1.4;
} }

2
components/radio/style/index.less
View File

@ -174,7 +174,7 @@ span.@{radio-prefix-cls} + * {
display: inline-block; display: inline-block;
height: @btn-height-base; height: @btn-height-base;
margin: 0; margin: 0;
padding: 0 @padding-md - 1px; padding: 0 @radio-button-padding-horizontal;
color: @radio-button-color; color: @radio-button-color;
font-size: @font-size-base; font-size: @font-size-base;
line-height: @btn-height-base - 2px; line-height: @btn-height-base - 2px;

6
components/style/themes/default.less
View File

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

6
components/style/themes/variable.less
View File

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

2
package.json
View File

@ -209,7 +209,7 @@
"eslint-plugin-jest": "^26.0.0", "eslint-plugin-jest": "^26.0.0",
"eslint-plugin-jsx-a11y": "^6.2.1", "eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-markdown": "^2.0.0", "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-react-hooks": "^4.1.2",
"eslint-plugin-unicorn": "^41.0.0", "eslint-plugin-unicorn": "^41.0.0",
"fetch-jsonp": "^1.1.3", "fetch-jsonp": "^1.1.3",