Skip to content

Commit 16f6742

Browse files
author
zhaoliangyu
committed
fix: the button group and the slider styles
1 parent 91b936a commit 16f6742

File tree

4 files changed

+24
-26
lines changed

4 files changed

+24
-26
lines changed

components/radio/style/index.less

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ span.@{radio-prefix-cls} + * {
253253

254254
&:hover {
255255
position: relative;
256-
color: @radio-dot-color;
256+
color: @radio-button-hover-color;
257257
}
258258

259259
&:focus-within {
@@ -276,7 +276,7 @@ span.@{radio-prefix-cls} + * {
276276
border-color: @radio-solid-checked-color;
277277

278278
&::before {
279-
background-color: @radio-dot-color;
279+
background-color: @radio-button-hover-color;
280280
}
281281

282282
&:first-child {
@@ -307,20 +307,18 @@ span.@{radio-prefix-cls} + * {
307307
}
308308

309309
.@{radio-group-prefix-cls}-solid &-checked:not(&-disabled) {
310-
color: @radio-solid-checked-color;
311-
background: @radio-dot-color;
312-
border-color: @radio-dot-color;
310+
color: @component-background;
311+
background: @radio-solid-checked-color;
312+
border-color: @radio-solid-checked-color;
313313

314314
&:hover {
315-
color: @radio-solid-checked-color;
316-
background: @radio-button-hover-color;
317-
border-color: @radio-button-hover-color;
315+
background: fade(@radio-solid-checked-color, 90%);
316+
border-color: fade(@radio-solid-checked-color, 90%);
318317
}
319318

320319
&:active {
321-
color: @radio-solid-checked-color;
322-
background: @radio-button-active-color;
323-
border-color: @radio-button-active-color;
320+
background: fade(@radio-solid-checked-color, 100%);
321+
border-color: fade(@radio-solid-checked-color, 100%);
324322
}
325323

326324
&:focus-within {

components/style/themes/default.less

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -884,15 +884,15 @@
884884
@slider-margin: 10px 6px 10px;
885885
@slider-rail-background-color: @background-color-base;
886886
@slider-rail-background-color-hover: #e1e1e1;
887-
@slider-track-background-color: @primary-3;
888-
@slider-track-background-color-hover: @primary-4;
887+
@slider-track-background-color: @color-orange-30;
888+
@slider-track-background-color-hover: @color-orange-50;
889889
@slider-handle-border-width: 2px;
890890
@slider-handle-background-color: @component-background;
891-
@slider-handle-color: @primary-3;
892-
@slider-handle-color-hover: @primary-4;
893-
@slider-handle-color-focus: tint(@primary-color, 20%);
894-
@slider-handle-color-focus-shadow: fade(@primary-color, 12%);
895-
@slider-handle-color-tooltip-open: @primary-color;
891+
@slider-handle-color: @color-orange-30;
892+
@slider-handle-color-hover: @color-orange-50;
893+
@slider-handle-color-focus: tint(@radio-solid-checked-color, 20%);
894+
@slider-handle-color-focus-shadow: fade(@radio-solid-checked-color, 12%);
895+
@slider-handle-color-tooltip-open: @color-orange-60;
896896
@slider-handle-size: 14px;
897897
@slider-handle-margin-top: -5px;
898898
@slider-handle-margin-left: -5px;

components/style/themes/variable.less

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -939,15 +939,15 @@
939939
@slider-margin: 10px 6px 10px;
940940
@slider-rail-background-color: @background-color-base;
941941
@slider-rail-background-color-hover: #e1e1e1;
942-
@slider-track-background-color: @primary-3;
943-
@slider-track-background-color-hover: @primary-4;
942+
@slider-track-background-color: @color-orange-30;
943+
@slider-track-background-color-hover: @color-orange-50;
944944
@slider-handle-border-width: 2px;
945945
@slider-handle-background-color: @component-background;
946-
@slider-handle-color: @primary-3;
947-
@slider-handle-color-hover: @primary-4;
948-
@slider-handle-color-focus: ~'var(--@{ant-prefix}-primary-color-deprecated-t-20)';
949-
@slider-handle-color-focus-shadow: ~'var(--@{ant-prefix}-primary-color-deprecated-f-12)';
950-
@slider-handle-color-tooltip-open: @primary-color;
946+
@slider-handle-color: @color-orange-30;
947+
@slider-handle-color-hover: @color-orange-50;
948+
@slider-handle-color-focus: tint(@radio-solid-checked-color, 20%);
949+
@slider-handle-color-focus-shadow: fade(@radio-solid-checked-color, 12%);
950+
@slider-handle-color-tooltip-open: @color-orange-60;
951951
@slider-handle-size: 14px;
952952
@slider-handle-margin-top: -5px;
953953
@slider-handle-margin-left: -5px;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gd-uikit/antd",
3-
"version": "4.25.1",
3+
"version": "4.25.2",
44
"description": "An enterprise-class UI design language and React components implementation",
55
"title": "Ant Design",
66
"keywords": [

0 commit comments

Comments
 (0)