Skip to content

Commit a7abd69

Browse files
authored
Merge branch 'main' into codex/add-automatic-light-color-calculation-38yt8c
2 parents fb869f4 + 2b0ddcd commit a7abd69

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/views/ThemeEditor.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
/>
1919
<el-switch
2020
v-model="autoColorCalc"
21-
active-text="色值自动计算"
22-
inactive-text="手动"
21+
active-text="自动计算"
22+
inactive-text="手动设置"
2323
style="margin-right: 10px"
2424
/>
2525
<el-button @click="saveObjectAsCss('cssVar.css')">导出</el-button>
@@ -378,6 +378,7 @@ const mixColor = (color1: string, color2: string, weight: number) => {
378378
.padStart(2, '0')}${b.toString(16).padStart(2, '0')}`
379379
}
380380
381+
381382
const recomputeColorVars = (cssVar: string, base: string) => {
382383
const match = cssVar.match(/^--el-color-(\w+)$/)
383384
if (!match) return

0 commit comments

Comments
 (0)