diff --git a/frontend/.yarn/install-state.gz b/frontend/.yarn/install-state.gz index 684e9ba..2f3047b 100644 Binary files a/frontend/.yarn/install-state.gz and b/frontend/.yarn/install-state.gz differ diff --git a/frontend/src/views/Plans.vue b/frontend/src/views/Plans.vue index 7b8b728..1d48585 100644 --- a/frontend/src/views/Plans.vue +++ b/frontend/src/views/Plans.vue @@ -853,7 +853,7 @@ const getSimpleTaskTagColor = (taskName: string) => { '红票-5': 'volcano', '技能-5': 'cyan', '经验-6/5': 'gold', - '碳-5': 'none', + '碳-5': 'default', '奶/盾芯片': 'green', '奶/盾芯片组': 'green', '术/狙芯片': 'purple', diff --git a/frontend/src/views/Scheduler.vue b/frontend/src/views/Scheduler.vue index f76d448..eda4096 100644 --- a/frontend/src/views/Scheduler.vue +++ b/frontend/src/views/Scheduler.vue @@ -941,10 +941,15 @@ onUnmounted(() => { display: flex; justify-content: space-between; align-items: center; +<<<<<<< Updated upstream margin-bottom: 16px; padding: 16px; border-radius: 8px; border: 1px solid var(--ant-color-border); +======= + padding: 8px 16px; + border-bottom: 1px solid #d9d9d9; +>>>>>>> Stashed changes } .left-actions {