Skip to content

Commit 4b4a5e2

Browse files
liyuan-mengliyuan-meng
authored
Merge pull request #775 from ShuyunFF2E/feat-theme-color
修改色值
2 parents 3bec3a0 + 64b3a4a commit 4b4a5e2

17 files changed

Lines changed: 400 additions & 301 deletions

File tree

‎docs/color.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
.color-palette-title {
1919
margin: 0 0 24px;
20-
color: rgba(0, 0, 0, 0.85);
20+
color: rgba(0, 0, 0, 0.88);
2121
font-weight: 500;
2222
font-size: 22px;
2323
text-transform: capitalize;
2424
}
2525

2626
.color-palette-sub-title {
2727
margin: 0 0 24px;
28-
color: rgba(0, 0, 0, 0.65);
28+
color: rgba(0, 0, 0, 0.60);
2929
font-size: 18px;
3030
text-transform: capitalize;
3131
}

‎docs/default.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,11 @@ const theme = [
310310
},
311311
{
312312
name: 'grey-8',
313-
text: ' rgba(0, 0, 0, 0.65)',
313+
text: ' rgba(0, 0, 0, 0.60)',
314314
},
315315
{
316316
name: 'grey-9',
317-
text: ' rgba(0, 0, 0, 0.85)',
317+
text: ' rgba(0, 0, 0, 0.88)',
318318
},
319319
{
320320
name: 'grey-0',
@@ -348,7 +348,7 @@ class ButtonDemo extends React.Component {
348348
background: item.text,
349349
color:
350350
index < 3
351-
? 'rgba(0, 0, 0, 0.85)'
351+
? 'rgba(0, 0, 0, 0.88)'
352352
: 'rgb(255, 255, 255)',
353353
}}
354354
onClick={() => onClickHandler(item.text)}

‎docs/setColor.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ class ButtonDemo extends React.Component {
209209
style={{
210210
background: item,
211211
color:
212-
index < 4 ? 'rgba(0, 0, 0, 0.85)' : 'rgb(255, 255, 255)',
212+
index < 4 ? 'rgba(0, 0, 0, 0.88)' : 'rgb(255, 255, 255)',
213213
}}
214214
onClick={() => onClickHandler(item)}
215215
>
@@ -247,7 +247,7 @@ class ButtonDemo extends React.Component {
247247
background: item.text,
248248
color:
249249
index < 3
250-
? 'rgba(0, 0, 0, 0.85)'
250+
? 'rgba(0, 0, 0, 0.88)'
251251
: 'rgb(255, 255, 255)',
252252
}}
253253
onClick={(evt) => onClickHandler(evt, item.text)}
@@ -270,5 +270,5 @@ class ButtonDemo extends React.Component {
270270
);
271271
}
272272
}
273-
export default ButtonDemo
273+
export default ButtonDemo;
274274
```

‎src/components/c-cascader/index.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ input::-webkit-search-cancel-button {
292292
overflow: hidden;
293293
white-space: pre;
294294
text-overflow: ellipsis;
295-
color: rgba(0, 0, 0, 0.65);
295+
color: rgba(0, 0, 0, 0.60);
296296
max-width: 120px;
297297
}
298298

‎src/components/c-dropdown/index.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
font-size: 14px;
7878
font-family: PingFangSC-Regular, PingFang SC;
7979
font-weight: 400;
80-
color: rgba(0, 0, 0, 0.85);
80+
color: rgba(0, 0, 0, 0.88);
8181
line-height: 20px;
8282
padding: 6px 12px;
8383
min-width: 60px;

‎src/components/c-menu/index.less‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@lightColor: #fff;
2020
@darkColor: @blue-7;
2121
@darkActive: rgba(255, 255, 255, 0.1);
22-
@titleBold: rgba(0, 0, 0, 0.85);
22+
@titleBold: rgba(0, 0, 0, 0.88);
2323

2424
.root-cloud-menu-prefix {
2525
padding: 16px 8px;
@@ -117,7 +117,7 @@
117117
padding-left: 0;
118118
padding-right: 0;
119119
list-style: none;
120-
color: rgba(0, 0, 0, 0.65);
120+
color: rgba(0, 0, 0, 0.60);
121121
border-radius: 0;
122122

123123
.@{prefix}-cmenu-item.@{prefix}-cmenu-item-disabled {
@@ -569,7 +569,7 @@
569569
}
570570
}
571571
.text {
572-
color: rgba(0, 0, 0, 0.85);
572+
color: rgba(0, 0, 0, 0.88);
573573
}
574574
}
575575
.@{menuDark} .@{inlineCollapsed} {

‎src/components/c-picker/style/panel.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
padding: 2px 8px;
101101
font-size: 14px;
102102
font-weight: 400;
103-
color: rgba(0, 0, 0, 0.85);
103+
color: rgba(0, 0, 0, 0.88);
104104
line-height: 20px;
105105
cursor: pointer;
106106
transition: background-color .3s;

‎src/components/c-table/demos/custom-column-tag.md‎

Lines changed: 47 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,66 @@ const data = [
1212
name: '手机号优先继续发送1',
1313
createTime: '2021/12/14 10:19:02',
1414
creator: 'liyuan.meng',
15-
category: [{ status: 'primary-tag', text: '标签文字' }, { status: 'default-tag', text: '标签文字' }]
15+
category: [
16+
{ status: 'primary-tag', text: '标签文字' },
17+
{ status: 'default-tag', text: '标签文字' },
18+
],
1619
},
1720
{
1821
id: '121410328',
1922
name: 'ouid疲劳度3',
2023
createTime: '2021/12/13 15:47:33 ',
2124
creator: 'jiaojiao.diao',
22-
category: [{ status: 'primary-tag', text: '标签文字' }, { status: 'error-tag', text: '标签文字' }]
25+
category: [
26+
{ status: 'primary-tag', text: '标签文字' },
27+
{ status: 'error-tag', text: '标签文字' },
28+
],
2329
},
2430
{
2531
id: '121410329',
2632
name: '继续发送手机1',
2733
createTime: '2021/12/13 15:36:42',
2834
creator: 'nan.run',
29-
category: [{ status: 'warn-tag', text: '标签文字' }, { status: 'primary-tag', text: '标签文字' }]
35+
category: [
36+
{ status: 'warn-tag', text: '标签文字' },
37+
{ status: 'primary-tag', text: '标签文字' },
38+
],
3039
},
3140
{
3241
id: '121408294',
3342
name: '继续发送手机2',
3443
createTime: '2021/12/13 11:14:40',
3544
creator: 'xiaotong.fan',
36-
category: [{ status: 'success-tag', text: '标签文字' }]
45+
category: [{ status: 'success-tag', text: '标签文字' }],
3746
},
3847
{
3948
id: '121407191',
4049
name: '继续发送手机3',
4150
createTime: '2021/12/13 11:03:05',
4251
creator: 'zhenxiao.guo',
43-
category: [{ status: 'default-tag', text: '标签文字' }, { status: 'warn-tag', text: '标签文字' }]
52+
category: [
53+
{ status: 'default-tag', text: '标签文字' },
54+
{ status: 'warn-tag', text: '标签文字' },
55+
],
4456
},
4557
];
4658

4759
const columns = [
4860
{ title: '活动ID', dataIndex: 'id' },
4961
{
50-
title: '活动名称', dataIndex: 'name', width: 140, render: val => {
51-
return <CTable.TextTpl value={val} />
52-
}
62+
title: '活动名称',
63+
dataIndex: 'name',
64+
width: 140,
65+
render: (val) => {
66+
return <CTable.TextTpl value={val} />;
67+
},
5368
},
5469
{
55-
title: '创建时间', dataIndex: 'createTime', render: val => {
56-
return <CTable.TimeTpl value={val} />
57-
}
70+
title: '创建时间',
71+
dataIndex: 'createTime',
72+
render: (val) => {
73+
return <CTable.TimeTpl value={val} />;
74+
},
5875
},
5976
{
6077
title: '活动分类',
@@ -64,46 +81,50 @@ const columns = [
6481
const styleConfig = {
6582
'primary-tag': {
6683
background: 'rgba(245, 248, 255, 1)',
67-
color: 'rgba(51, 82, 204, 1)'
84+
color: 'rgba(51, 82, 204, 1)',
6885
},
6986
'warn-tag': {
7087
background: 'rgba(255, 249, 219, 1)',
71-
color: 'rgba(217, 152, 0, 1)'
88+
color: 'rgba(217, 152, 0, 1)',
7289
},
7390
'error-tag': {
7491
background: 'rgba(255, 237, 237, 1)',
75-
color: 'rgba(189, 53, 53, 1)'
92+
color: 'rgba(189, 53, 53, 1)',
7693
},
7794
'default-tag': {
7895
background: 'rgba(245, 245, 245, 1)',
79-
color: 'rgba(0, 0, 0, 0.65)'
96+
color: 'rgba(0, 0, 0, 0.65)',
8097
},
8198
'success-tag': {
8299
background: 'rgba(229, 249, 231, 1)',
83-
color: 'rgba(0, 143, 57, 1)'
84-
}
100+
color: 'rgba(0, 143, 57, 1)',
101+
},
85102
};
86103

87104
return (
88105
<div>
89106
{category.map((x, index) => (
90-
<span key={index} style={{ padding: '4px 8px', marginRight: 12, ...styleConfig[x.status] }}>
91-
{x.text}
92-
</span>
107+
<span
108+
key={index}
109+
style={{
110+
padding: '4px 8px',
111+
marginRight: 12,
112+
...styleConfig[x.status],
113+
}}
114+
>
115+
{x.text}
116+
</span>
93117
))}
94118
</div>
95-
)
96-
}
119+
);
120+
},
97121
},
98122
{ title: '创建人', dataIndex: 'creator' },
99123
];
100124

101125
export default function CTableDemo() {
102126
return (
103-
<CTable
104-
columnData={columns}
105-
ajaxData={{ totals: data.length, data }}
106-
/>
127+
<CTable columnData={columns} ajaxData={{ totals: data.length, data }} />
107128
);
108129
}
109130
```

0 commit comments

Comments
 (0)