Skip to content

Commit 929995d

Browse files
authored
feat:暗色主题适配 (#3044)
1 parent 989072d commit 929995d

File tree

14 files changed

+56
-50
lines changed

14 files changed

+56
-50
lines changed

examples/sites/demos/pc/app/image/lazy-composition-api.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ const srcList = ref([
2323
.demo-image__lazy {
2424
height: 300px;
2525
overflow-y: auto;
26-
background-color: #f5f5f5;
2726
}
2827
.demo-image__lazy .tiny-image {
2928
display: block;

examples/sites/demos/pc/app/image/lazy.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ export default {
3131
.demo-image__lazy {
3232
height: 300px;
3333
overflow-y: auto;
34-
background-color: #f5f5f5;
3534
}
3635
.demo-image__lazy .tiny-image {
3736
display: block;

examples/sites/demos/pc/app/loading/basic-usage-composition-api.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ onMounted(() => {
2626
#tiny-basic-loading1 {
2727
width: 100%;
2828
height: 120px;
29-
border: 1px solid beige;
3029
margin-top: 10px;
3130
}
3231
</style>

examples/sites/demos/pc/app/loading/basic-usage.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export default {
3434
#tiny-basic-loading1 {
3535
width: 100%;
3636
height: 120px;
37-
border: 1px solid beige;
3837
margin-top: 10px;
3938
}
4039
</style>

examples/sites/demos/pc/app/milestone/basic-usage-composition-api.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ const statusMap = ref({
2525
// 对应 status = completed
2626
completed: '#1890ff',
2727
// 对应 status = doing
28-
doing: '#e8faff',
28+
doing: '#86edff',
2929
// 对应 status = back
30-
back: '#edf7df',
30+
back: '#93fda6',
3131
// 对应 status = end
32-
end: '#faad14',
32+
end: '#faad18',
3333
// 对应 status = cancel
34-
cancel: '#f230301A'
34+
cancel: '#f230305A'
3535
})
3636
3737
// 数据源

examples/sites/demos/pc/app/milestone/basic-usage.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ test('基本用法', async ({ page }) => {
3636
'box-shadow': 'none'
3737
},
3838
{
39-
'color': 'rgba(242, 48, 48, 0.1)',
39+
'color': 'rgba(242, 48, 48, 0.353)',
4040
'box-shadow': 'none'
4141
},
4242
{
43-
'color': 'rgb(237, 247, 223)',
43+
'color': 'rgb(147, 253, 166)',
4444
'box-shadow': 'none'
4545
},
4646
{
47-
'color': 'rgb(250, 173, 20)',
47+
'color': 'rgb(250, 173, 24)',
4848
'box-shadow': 'none'
4949
}
5050
]

examples/sites/demos/pc/app/milestone/show-number.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,27 @@ test('序号显示', async ({ page }) => {
2222
]
2323
const iconStyles = [
2424
{
25-
'color': 'rgb(179, 214, 255)',
25+
'color': 'rgb(25, 25, 25)',
2626
'box-shadow': 'none'
2727
},
2828
{
29-
'color': 'rgb(179, 214, 255)',
29+
'color': 'rgb(25, 25, 25)',
3030
'box-shadow': 'none'
3131
},
3232
{
3333
'color': 'rgb(255, 255, 255)',
3434
'box-shadow': 'none'
3535
},
3636
{
37-
'color': 'rgb(217, 217, 217)',
37+
'color': 'rgb(25, 25, 25)',
3838
'box-shadow': 'none'
3939
},
4040
{
41-
'color': 'rgb(245, 34, 45)',
41+
'color': 'rgb(25, 25, 25)',
4242
'box-shadow': 'none'
4343
},
4444
{
45-
'color': 'rgb(250, 173, 20)',
45+
'color': 'rgb(25, 25, 25)',
4646
'box-shadow': 'none'
4747
}
4848
]

examples/sites/demos/pc/app/milestone/solid-style.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,27 @@ test('实心显示', async ({ page }) => {
2222
]
2323
const iconStyles = [
2424
{
25-
'color': 'rgb(179, 214, 255)',
25+
'color': 'rgb(25, 25, 25)',
2626
'box-shadow': 'none'
2727
},
2828
{
29-
'color': 'rgb(179, 214, 255)',
29+
'color': 'rgb(25, 25, 25)',
3030
'box-shadow': 'none'
3131
},
3232
{
3333
'color': 'rgb(255, 255, 255)',
3434
'box-shadow': 'none'
3535
},
3636
{
37-
'color': 'rgb(217, 217, 217)',
37+
'color': 'rgb(25, 25, 25)',
3838
'box-shadow': 'none'
3939
},
4040
{
41-
'color': 'rgb(245, 34, 45)',
41+
'color': 'rgb(25, 25, 25)',
4242
'box-shadow': 'none'
4343
},
4444
{
45-
'color': 'rgb(250, 173, 20)',
45+
'color': 'rgb(25, 25, 25)',
4646
'box-shadow': 'none'
4747
}
4848
]

packages/renderless/src/milestone/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ export const getMileIcon =
7575
if (statusColor) {
7676
return {
7777
'background-color': props.solid || status === constants.STATUS_MAP.DOING ? statusColor : '',
78-
color: (props.solid
79-
&& status !== constants.STATUS_MAP.COMPLETED
80-
|| status === constants.STATUS_MAP.DOING)
81-
? '#FFFFFF' : statusColor,
78+
color:
79+
(props.solid && status !== constants.STATUS_MAP.COMPLETED) || status === constants.STATUS_MAP.DOING
80+
? '#fff'
81+
: statusColor,
8282
'border-color': statusColor,
8383
boxShadow: 'unset'
8484
}

packages/theme/src/calendar-view/index.less

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
width: 100%;
2222
height: auto;
2323
padding-top: var(--tv-CalendarView-padding);
24-
border: 1px solid #ebebeb;
24+
border: 1px solid var(--tv-CalendarView-date-border-color);
2525
background-color: var(--tv-CalendarView-bg-color);
2626
overflow: auto;
27+
border-bottom: none;
2728

2829
&__header {
2930
display: flex;
@@ -49,7 +50,7 @@
4950
height: 32px;
5051

5152
&:hover {
52-
background-color: #ededed;
53+
background-color: var(--tv-CalendarView-radio-icon-bg-hover);
5354
}
5455

5556
svg {
@@ -124,7 +125,7 @@
124125
&__main {
125126
width: 100%;
126127
overflow: hidden;
127-
border-top: 1px solid #ebebeb;
128+
border-top: 1px solid var(--tv-CalendarView-date-border-color);
128129

129130
.main-container {
130131
width: 100%;
@@ -135,15 +136,15 @@
135136
width: 100%;
136137
display: flex;
137138
justify-content: space-around;
138-
border-bottom: 1px solid #ebebeb;
139+
border-bottom: 1px solid var(--tv-CalendarView-date-border-color);
139140

140141
> li {
141142
font-size: var(--tv-CalendarView-main-li-font-size);
142143
padding: var(--tv-CalendarView-main-li-padding) 0;
143144
position: relative;
144145
height: 80px;
145146
overflow: hidden;
146-
border-right: 1px solid #ebebeb;
147+
border-right: 1px solid var(--tv-CalendarView-date-border-color);
147148
background-color: var(--tv-CalendarView-main-li-bg-color);
148149

149150
&.is-selected {
@@ -184,6 +185,10 @@
184185
}
185186
}
186187

188+
ul li:last-of-type {
189+
border-right: none;
190+
}
191+
187192
.day-selected {
188193
position: absolute;
189194
top: 0;

0 commit comments

Comments
 (0)