Skip to content

Commit b985e70

Browse files
committed
💄 表单内组件样式同意调整
1 parent 733938c commit b985e70

6 files changed

Lines changed: 48 additions & 20 deletions

File tree

src/components/c-picker/style/input.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
transition: border 0.3s, box-shadow 0.3s;
2525

2626
&:hover {
27-
border-color: @gray-6;
27+
border-color: @blue-4;
2828
}
2929

3030
&-focused {

src/components/checkbox/index.less

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,17 @@
5353
font-size: 14px;
5454
line-height: 20px;
5555

56-
&:not(.@{checkbox-prefix-cls}-disabled):hover {
57-
cursor: pointer;
58-
.@{checkbox-prefix-cls}-inner {
59-
border-color: #496bf5;
56+
&:not(.@{checkbox-prefix-cls}-disabled) {
57+
&:hover {
58+
cursor: pointer;
59+
}
60+
61+
.@{checkbox-prefix-cls}-wrapper {
62+
&:hover {
63+
.@{checkbox-prefix-cls}-inner {
64+
border-color: #496bf5;
65+
}
66+
}
6067
}
6168
}
6269

src/components/input-number/index.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
}
3333

3434
&:not(&-focused):not(&-disabled):hover {
35-
border-color: @gray-6;
35+
border-color: @blue-4;
3636
}
3737

3838
&-focused {

src/components/input/demos/styles/mix.less

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
.input-prefix-icon {
2-
color: rgba(0, 0, 0, 0.25);
3-
font-size: 16px;
4-
}
1+
@import '../../../style/index';
2+
53
.input-demo-search-box {
64
display: flex;
75
gap: 20px;

src/components/input/index.less

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@placeholder-color: @gray-6;
1414

15-
@hover-border-color: @gray-6;
15+
@hover-border-color: @blue-4;
1616

1717
@focus-border-color: @blue-4;
1818

@@ -191,13 +191,24 @@
191191
padding: 5px @both-space-size;
192192
color: @gray-9;
193193
&:hover {
194-
border-color: @gray-6;
194+
border-color: @blue-4;
195+
}
196+
197+
.icon-search {
198+
color: @gray-6;
199+
cursor: pointer;
200+
font-size: 16px;
201+
202+
&:hover {
203+
color: @blue-4;
204+
}
195205
}
196206
}
197207

198208
&-counter {
199-
font-size: 12px;
200-
color: #c9c9c9;
209+
font-size: 14px;
210+
line-height: 20px;
211+
color: @gray-6;
201212
word-break: keep-all;
202213
}
203214

@@ -304,6 +315,14 @@
304315
&:hover {
305316
border-color: @gray-4;
306317
}
318+
319+
.icon-search {
320+
cursor: not-allowed;
321+
322+
&:hover {
323+
color: @gray-6;
324+
}
325+
}
307326
}
308327

309328
/* textarea */

src/components/select/index.less

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727

2828
@box-sizing: border-box;
2929

30-
@select-empty-color: @gray-7;
30+
@select-empty-color: @gray-6;
3131
@select-normal-border: 1px solid @gray-4;
3232
@select-hover-color: @gray-6;
33-
@select-hover-border: 1px solid @select-hover-color;
33+
@select-hover-border: 1px solid @blue-4;
3434
@select-active-border: 1px solid @blue-4;
35-
@select-disabled-border: 1px solid @color-gray5;
36-
@select-disabled-color: @gray-6;
35+
@select-disabled-border: 1px solid @gray-4;
36+
@select-disabled-color: @gray-7;
3737
@dropdown-icon-color: @gray-6;
3838
@option-hover-background: @blue-1;
3939
@option-disabled-background: @color-white;
@@ -93,7 +93,7 @@
9393

9494
&.disabled {
9595
border: @select-disabled-border;
96-
background: @color-gray7;
96+
background: #f5f5f5;
9797
cursor: not-allowed;
9898

9999
&:hover {
@@ -102,7 +102,7 @@
102102

103103
.@{select-prefix-cls}-selected {
104104
color: @select-disabled-color;
105-
background: @color-gray7;
105+
background: #f5f5f5;
106106
cursor: not-allowed;
107107
}
108108

@@ -157,6 +157,10 @@
157157
&.hidden {
158158
display: none;
159159
}
160+
161+
&:hover {
162+
color: @gray-7;
163+
}
160164
}
161165

162166
.@{select-prefix-cls}-clear-icon {

0 commit comments

Comments
 (0)