Skip to content

Commit 8577c04

Browse files
ZxBing0066ZxBing0066
authored
feat(All): change text color of select,input and radio.button
close #129
1 parent 79f9184 commit 8577c04

File tree

32 files changed

+625
-398
lines changed

32 files changed

+625
-398
lines changed

‎src/components/Badge/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,26 @@ exports[`Badge demo -- badge 1`] = `
124124
}
125125
126126
.c27 .c28,
127-
.c27 .style__RadioTagWrap-sc-25j3mq-3,
128-
.c27 .style__RadioCardWrap-sc-25j3mq-8 {
127+
.c27 .style__RadioTagWrap-sc-25j3mq-3 {
129128
margin-right: 8px;
130129
margin-bottom: 8px;
131130
}
132131
133132
.c27 .c28:last-child,
134-
.c27 .style__RadioTagWrap-sc-25j3mq-3:last-child,
135-
.c27 .style__RadioCardWrap-sc-25j3mq-8:last-child {
133+
.c27 .style__RadioTagWrap-sc-25j3mq-3:last-child {
136134
margin-right: 0;
137135
}
138136
139-
.c27 .c37+.c37 {
137+
.c27 .c37 {
138+
margin-right: 12px;
139+
margin-bottom: 8px;
140+
}
141+
142+
.c27 .c37:last-child {
143+
margin-right: 0;
144+
}
145+
146+
.c27 .c38+.c38 {
140147
margin-left: -1px;
141148
}
142149
@@ -158,7 +165,7 @@ exports[`Badge demo -- badge 1`] = `
158165
position: relative;
159166
display: inline-block;
160167
vertical-align: middle;
161-
color: #6b798e;
168+
color: #0a1633;
162169
}
163170
164171
.c7 input {
@@ -213,7 +220,7 @@ exports[`Badge demo -- badge 1`] = `
213220
color: #abb4c3;
214221
}
215222
216-
.c7 .c38 {
223+
.c7 .c39 {
217224
width: 28px;
218225
height: 28px;
219226
line-height: 28px;

‎src/components/Button/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,26 @@ exports[`Button demo -- button 1`] = `
135135
}
136136
137137
.c7 .c8,
138-
.c7 .style__RadioTagWrap-sc-25j3mq-3,
139-
.c7 .style__RadioCardWrap-sc-25j3mq-8 {
138+
.c7 .style__RadioTagWrap-sc-25j3mq-3 {
140139
margin-right: 8px;
141140
margin-bottom: 8px;
142141
}
143142
144143
.c7 .c8:last-child,
145-
.c7 .style__RadioTagWrap-sc-25j3mq-3:last-child,
146-
.c7 .style__RadioCardWrap-sc-25j3mq-8:last-child {
144+
.c7 .style__RadioTagWrap-sc-25j3mq-3:last-child {
147145
margin-right: 0;
148146
}
149147
150-
.c7 .c26+.c26 {
148+
.c7 .c26 {
149+
margin-right: 12px;
150+
margin-bottom: 8px;
151+
}
152+
153+
.c7 .c26:last-child {
154+
margin-right: 0;
155+
}
156+
157+
.c7 .c27+.c27 {
151158
margin-left: -1px;
152159
}
153160
@@ -559,7 +566,7 @@ exports[`Button demo -- disabled 1`] = `
559566
vertical-align: middle;
560567
height: 28px;
561568
padding: 0 8px;
562-
color: #6b798e;
569+
color: #0a1633;
563570
background: #fff;
564571
border-color: #c3cad9;
565572
border: none;
@@ -591,7 +598,7 @@ exports[`Button demo -- disabled 1`] = `
591598
vertical-align: middle;
592599
height: 28px;
593600
padding: 0 8px;
594-
color: #6b798e;
601+
color: #0a1633;
595602
background: #fff;
596603
border-color: #c3cad9;
597604
border: none;
@@ -667,7 +674,7 @@ exports[`Button demo -- icon 1`] = `
667674
vertical-align: middle;
668675
height: 28px;
669676
padding: 0 8px;
670-
color: #6b798e;
677+
color: #0a1633;
671678
background: #fff;
672679
border-color: #c3cad9;
673680
border: none;
@@ -807,7 +814,7 @@ exports[`Button demo -- loading 1`] = `
807814
vertical-align: middle;
808815
height: 28px;
809816
padding: 0 8px;
810-
color: #6b798e;
817+
color: #0a1633;
811818
background: #fff;
812819
border-color: #c3cad9;
813820
border: none;
@@ -944,7 +951,7 @@ exports[`Button demo -- shape 1`] = `
944951
vertical-align: middle;
945952
height: 32px;
946953
padding: 0 12px;
947-
color: #6b798e;
954+
color: #0a1633;
948955
background: #fff;
949956
border-color: #c3cad9;
950957
border: none;
@@ -1048,7 +1055,7 @@ exports[`Button demo -- size 1`] = `
10481055
vertical-align: middle;
10491056
height: 28px;
10501057
padding: 0 8px;
1051-
color: #6b798e;
1058+
color: #0a1633;
10521059
background: #fff;
10531060
border-color: #c3cad9;
10541061
border: none;
@@ -1080,7 +1087,7 @@ exports[`Button demo -- size 1`] = `
10801087
vertical-align: middle;
10811088
height: 22px;
10821089
padding: 0 8px;
1083-
color: #6b798e;
1090+
color: #0a1633;
10841091
background: #fff;
10851092
border-color: #c3cad9;
10861093
border: none;
@@ -1112,7 +1119,7 @@ exports[`Button demo -- size 1`] = `
11121119
vertical-align: middle;
11131120
height: 32px;
11141121
padding: 0 12px;
1115-
color: #6b798e;
1122+
color: #0a1633;
11161123
background: #fff;
11171124
border-color: #c3cad9;
11181125
border: none;
@@ -1167,7 +1174,7 @@ exports[`Button demo -- styleType 1`] = `
11671174
vertical-align: middle;
11681175
height: 28px;
11691176
padding: 0 8px;
1170-
color: #6b798e;
1177+
color: #0a1633;
11711178
background: #fff;
11721179
border-color: #c3cad9;
11731180
border: none;

‎src/components/Button/style/theme.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default ({ colorList, materialVars }) => ({
1818
}
1919
},
2020
border: {
21-
color: colorList.secondary1,
21+
color: colorList.black,
2222
background: colorList.white,
2323
borderColor: colorList.secondary4,
2424
border: 'none',

‎src/components/Card/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ exports[`Card demo -- card 1`] = `
119119
vertical-align: middle;
120120
height: 28px;
121121
padding: 0 8px;
122-
color: #6b798e;
122+
color: #0a1633;
123123
background: #fff;
124124
border-color: #c3cad9;
125125
border: none;
@@ -310,7 +310,7 @@ exports[`Card demo -- custom 1`] = `
310310
vertical-align: middle;
311311
height: 28px;
312312
padding: 0 8px;
313-
color: #6b798e;
313+
color: #0a1633;
314314
background: #fff;
315315
border-color: #c3cad9;
316316
border: none;
@@ -484,7 +484,7 @@ exports[`Card demo -- single 1`] = `
484484
vertical-align: middle;
485485
height: 28px;
486486
padding: 0 8px;
487-
color: #6b798e;
487+
color: #0a1633;
488488
background: #fff;
489489
border-color: #c3cad9;
490490
border: none;

‎src/components/Checkbox/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,26 @@ exports[`Checkbox demo -- checkbox 1`] = `
4242
}
4343
4444
.c7 .c8,
45-
.c7 .style__RadioTagWrap-sc-25j3mq-3,
46-
.c7 .style__RadioCardWrap-sc-25j3mq-8 {
45+
.c7 .style__RadioTagWrap-sc-25j3mq-3 {
4746
margin-right: 8px;
4847
margin-bottom: 8px;
4948
}
5049
5150
.c7 .c8:last-child,
52-
.c7 .style__RadioTagWrap-sc-25j3mq-3:last-child,
53-
.c7 .style__RadioCardWrap-sc-25j3mq-8:last-child {
51+
.c7 .style__RadioTagWrap-sc-25j3mq-3:last-child {
5452
margin-right: 0;
5553
}
5654
57-
.c7 .c33+.c33 {
55+
.c7 .c33 {
56+
margin-right: 12px;
57+
margin-bottom: 8px;
58+
}
59+
60+
.c7 .c33:last-child {
61+
margin-right: 0;
62+
}
63+
64+
.c7 .c34+.c34 {
5865
margin-left: -1px;
5966
}
6067
@@ -1191,19 +1198,26 @@ exports[`Checkbox demo -- group 1`] = `
11911198
}
11921199
11931200
.c7 .c8,
1194-
.c7 .style__RadioTagWrap-sc-25j3mq-3,
1195-
.c7 .style__RadioCardWrap-sc-25j3mq-8 {
1201+
.c7 .style__RadioTagWrap-sc-25j3mq-3 {
11961202
margin-right: 8px;
11971203
margin-bottom: 8px;
11981204
}
11991205
12001206
.c7 .c8:last-child,
1201-
.c7 .style__RadioTagWrap-sc-25j3mq-3:last-child,
1202-
.c7 .style__RadioCardWrap-sc-25j3mq-8:last-child {
1207+
.c7 .style__RadioTagWrap-sc-25j3mq-3:last-child {
12031208
margin-right: 0;
12041209
}
12051210
1206-
.c7 .c35+.c35 {
1211+
.c7 .c35 {
1212+
margin-right: 12px;
1213+
margin-bottom: 8px;
1214+
}
1215+
1216+
.c7 .c35:last-child {
1217+
margin-right: 0;
1218+
}
1219+
1220+
.c7 .c36+.c36 {
12071221
margin-left: -1px;
12081222
}
12091223
@@ -2256,15 +2270,11 @@ exports[`Checkbox demo -- group-styleType 1`] = `
22562270
color: #adbaf3;
22572271
}
22582272
2259-
.c18 .c23,
2260-
.c18 .style__RadioTagWrap-sc-25j3mq-3,
22612273
.c18 .c7 {
2262-
margin-right: 8px;
2274+
margin-right: 12px;
22632275
margin-bottom: 8px;
22642276
}
22652277
2266-
.c18 .c23:last-child,
2267-
.c18 .style__RadioTagWrap-sc-25j3mq-3:last-child,
22682278
.c18 .c7:last-child {
22692279
margin-right: 0;
22702280
}

‎src/components/Collapse/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ exports[`Collapse demo -- panel-customTitle 1`] = `
10651065
vertical-align: middle;
10661066
height: 28px;
10671067
padding: 0 8px;
1068-
color: #6b798e;
1068+
color: #0a1633;
10691069
background: #fff;
10701070
border-color: #c3cad9;
10711071
border: none;

‎src/components/Compact/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,26 @@ exports[`Compact demo -- compact 1`] = `
6161
}
6262
6363
.c7 .c8,
64-
.c7 .style__RadioTagWrap-sc-25j3mq-3,
65-
.c7 .style__RadioCardWrap-sc-25j3mq-8 {
64+
.c7 .style__RadioTagWrap-sc-25j3mq-3 {
6665
margin-right: 8px;
6766
margin-bottom: 8px;
6867
}
6968
7069
.c7 .c8:last-child,
71-
.c7 .style__RadioTagWrap-sc-25j3mq-3:last-child,
72-
.c7 .style__RadioCardWrap-sc-25j3mq-8:last-child {
70+
.c7 .style__RadioTagWrap-sc-25j3mq-3:last-child {
7371
margin-right: 0;
7472
}
7573
76-
.c7 .c31+.c31 {
74+
.c7 .c31 {
75+
margin-right: 12px;
76+
margin-bottom: 8px;
77+
}
78+
79+
.c7 .c31:last-child {
80+
margin-right: 0;
81+
}
82+
83+
.c7 .c32+.c32 {
7784
margin-left: -1px;
7885
}
7986
@@ -95,7 +102,7 @@ exports[`Compact demo -- compact 1`] = `
95102
position: relative;
96103
display: inline-block;
97104
vertical-align: middle;
98-
color: #6b798e;
105+
color: #0a1633;
99106
}
100107
101108
.c29 input {
@@ -150,7 +157,7 @@ exports[`Compact demo -- compact 1`] = `
150157
color: #abb4c3;
151158
}
152159
153-
.c29 .c32 {
160+
.c29 .c33 {
154161
width: 28px;
155162
height: 28px;
156163
line-height: 28px;
@@ -178,7 +185,7 @@ exports[`Compact demo -- compact 1`] = `
178185
display: inline-block;
179186
vertical-align: middle;
180187
font-size: 12px;
181-
color: #6b798e;
188+
color: #0a1633;
182189
background-color: #fff;
183190
}
184191
@@ -510,7 +517,7 @@ exports[`Compact demo -- sharedProps 1`] = `
510517
position: relative;
511518
display: inline-block;
512519
vertical-align: middle;
513-
color: #6b798e;
520+
color: #0a1633;
514521
}
515522
516523
.c8 input {
@@ -575,7 +582,7 @@ exports[`Compact demo -- sharedProps 1`] = `
575582
position: relative;
576583
display: inline-block;
577584
vertical-align: middle;
578-
color: #6b798e;
585+
color: #0a1633;
579586
}
580587
581588
.c6 input {
@@ -658,7 +665,7 @@ exports[`Compact demo -- sharedProps 1`] = `
658665
display: inline-block;
659666
vertical-align: middle;
660667
font-size: 12px;
661-
color: #6b798e;
668+
color: #0a1633;
662669
background-color: #fff;
663670
}
664671
@@ -683,7 +690,7 @@ exports[`Compact demo -- sharedProps 1`] = `
683690
display: inline-block;
684691
vertical-align: middle;
685692
font-size: 12px;
686-
color: #6b798e;
693+
color: #0a1633;
687694
background-color: #fff;
688695
}
689696

0 commit comments

Comments
 (0)