From 60aaa70069108e3a2e069af8ab1c7b37f99f4393 Mon Sep 17 00:00:00 2001 From: qdzhaoxiaodao <32627250+qdzhaoxiaodao@users.noreply.github.com> Date: Sun, 27 Feb 2022 10:52:21 +0800 Subject: [PATCH 1/6] feat: add variable for aliyun theme of drawer (#34188) Co-authored-by: zhaohonghai --- components/drawer/style/drawer.less | 4 ++-- components/style/themes/default.less | 2 ++ components/style/themes/variable.less | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/drawer/style/drawer.less b/components/drawer/style/drawer.less index 9f7dd1846fb4..20985efdfbfc 100644 --- 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/style/themes/default.less b/components/style/themes/default.less index a268427e0d7d..5971986755af 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -989,6 +989,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 index 5ebd52c21ce1..6cec9b06850c 100644 --- a/components/style/themes/variable.less +++ b/components/style/themes/variable.less @@ -1044,6 +1044,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 // --- From 3b0174dbdb75ef9f3a360e0ef470451c5edacd06 Mon Sep 17 00:00:00 2001 From: qdzhaoxiaodao <32627250+qdzhaoxiaodao@users.noreply.github.com> Date: Sun, 27 Feb 2022 10:52:50 +0800 Subject: [PATCH 2/6] feat: add variable for aliyun theme of dropdown (#34189) Co-authored-by: zhaohonghai --- components/dropdown/style/index.less | 2 +- components/style/themes/default.less | 1 + components/style/themes/variable.less | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less index 101894767f4b..b9a6769aa15c 100644 --- a/components/dropdown/style/index.less +++ b/components/dropdown/style/index.less @@ -216,7 +216,7 @@ &-selected { color: @dropdown-selected-color; - background-color: @item-active-bg; + background-color: @dropdown-selected-bg; } &:hover { diff --git a/components/style/themes/default.less b/components/style/themes/default.less index 5971986755af..d2399847246f 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -287,6 +287,7 @@ // 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; diff --git a/components/style/themes/variable.less b/components/style/themes/variable.less index 6cec9b06850c..d8eaadd8d44c 100644 --- a/components/style/themes/variable.less +++ b/components/style/themes/variable.less @@ -342,6 +342,7 @@ html { // 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; From 582ce4f6d53ab97500fca56bd5e71f84ab5e7412 Mon Sep 17 00:00:00 2001 From: vagusX Date: Sun, 27 Feb 2022 11:04:28 +0800 Subject: [PATCH 3/6] fix: remove lock for eslint-plugin-react (#34220) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d977204bdc8..2fd284b03a6b 100644 --- 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", From 6c1057724ac42310c1ae70ee56f64d183cb31c17 Mon Sep 17 00:00:00 2001 From: qdzhaoxiaodao <32627250+qdzhaoxiaodao@users.noreply.github.com> Date: Sun, 27 Feb 2022 13:51:58 +0800 Subject: [PATCH 4/6] feat: add variable for aliyun theme of modal (#34191) Co-authored-by: zhaohonghai --- components/modal/style/confirm.less | 2 +- components/style/themes/default.less | 1 + components/style/themes/variable.less | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/modal/style/confirm.less b/components/modal/style/confirm.less index cf5c4047b004..dfe34d1d2021 100644 --- 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/style/themes/default.less b/components/style/themes/default.less index d2399847246f..43ab753c9adc 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -564,6 +564,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 // -- diff --git a/components/style/themes/variable.less b/components/style/themes/variable.less index d8eaadd8d44c..1a3dd1f67b9f 100644 --- a/components/style/themes/variable.less +++ b/components/style/themes/variable.less @@ -619,6 +619,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 // -- From 2082b3717ac16b5c703144bc37f2dbd724ab6a5a Mon Sep 17 00:00:00 2001 From: qdzhaoxiaodao <32627250+qdzhaoxiaodao@users.noreply.github.com> Date: Sun, 27 Feb 2022 13:52:26 +0800 Subject: [PATCH 5/6] feat: add variable for aliyun theme of divider (#34187) Co-authored-by: zhaohonghai --- components/divider/style/index.less | 2 +- components/style/themes/default.less | 1 + components/style/themes/variable.less | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/divider/style/index.less b/components/divider/style/index.less index ba271e05397e..ff7e932ef09d 100644 --- 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/style/themes/default.less b/components/style/themes/default.less index 43ab753c9adc..c6d20653ce7e 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -283,6 +283,7 @@ @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; diff --git a/components/style/themes/variable.less b/components/style/themes/variable.less index 1a3dd1f67b9f..27bf47475b7b 100644 --- a/components/style/themes/variable.less +++ b/components/style/themes/variable.less @@ -338,6 +338,7 @@ 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; From 1a2ced6874cdc31c7784aaa415283de225b28fe2 Mon Sep 17 00:00:00 2001 From: qdzhaoxiaodao <32627250+qdzhaoxiaodao@users.noreply.github.com> Date: Sun, 27 Feb 2022 13:52:42 +0800 Subject: [PATCH 6/6] feat: add variable for aliyun theme of radio (#34194) Co-authored-by: zhaohonghai --- components/radio/style/index.less | 2 +- components/style/themes/default.less | 1 + components/style/themes/variable.less | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/radio/style/index.less b/components/radio/style/index.less index 44d4e499daa4..713dc25d0d3e 100644 --- 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 index c6d20653ce7e..fce17ec46d38 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -308,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; diff --git a/components/style/themes/variable.less b/components/style/themes/variable.less index 27bf47475b7b..0779d6577b66 100644 --- a/components/style/themes/variable.less +++ b/components/style/themes/variable.less @@ -363,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;