From 845288795e4a1775bb611026cce15ad9925134bb Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 27 Aug 2023 02:30:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/assets/css/style.scss | 10 ++++++++-- src/components/Toolbar/SettingModal.vue | 2 +- src/components/Toolbar/Toolbar.vue | 2 +- src/components/Tooltip.vue | 4 ++-- src/components/Type.vue | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/App.vue b/src/App.vue index 64b6bd2b..e0e6fe83 100644 --- a/src/App.vue +++ b/src/App.vue @@ -55,7 +55,7 @@ onMounted(() => { font-size: 14rem; display: flex; justify-content: center; - background-color: var(--color-main-bg); + //background-color: var(--color-main-bg); .center { width: 70vw; diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss index 74f1d53c..9199ae34 100644 --- a/src/assets/css/style.scss +++ b/src/assets/css/style.scss @@ -8,6 +8,7 @@ --color-main-bg: rgb(226, 226, 226); --color-second-bg: rgb(238, 240, 244); --color-header-bg: white; + --color-tooltip-bg: white; --color-font-1: black; --color-font-2: gray; --color-font-active-1: white; @@ -19,9 +20,14 @@ } html[data-theme='dark'] { - --color-main-bg: rgba(0, 5, 24, 1); + //--color-main-bg: rgba(0, 5, 24, 1); + --color-main-bg: rgba(14,18,23, 1); + //--color-main-bg: rgba(17,24,39, 1); --color-second-bg: rgb(60, 63, 65); - --color-header-bg: white; + --color-header-bg: rgb(60, 63, 65); + //--color-tooltip-bg: rgb(60, 63, 65); + --color-tooltip-bg: #252525; + --color-font-1: white; } $anim-time: 0.3s; diff --git a/src/components/Toolbar/SettingModal.vue b/src/components/Toolbar/SettingModal.vue index d052070e..af5d0a03 100644 --- a/src/components/Toolbar/SettingModal.vue +++ b/src/components/Toolbar/SettingModal.vue @@ -247,7 +247,7 @@ const emit = defineEmits([ } .content { - background: white; + background: var(--color-header-bg); flex: 1; height: 100%; padding: 0 $space; diff --git a/src/components/Toolbar/Toolbar.vue b/src/components/Toolbar/Toolbar.vue index 6d45b1f2..fb27b215 100644 --- a/src/components/Toolbar/Toolbar.vue +++ b/src/components/Toolbar/Toolbar.vue @@ -135,7 +135,7 @@ header { .info { font-size: 18rem; - color: black; + color: var(--color-font-1); display: flex; justify-content: center; align-items: center; diff --git a/src/components/Tooltip.vue b/src/components/Tooltip.vue index 0a46be27..2334224c 100644 --- a/src/components/Tooltip.vue +++ b/src/components/Tooltip.vue @@ -75,7 +75,7 @@ export default { border-radius: 4rem; padding: 10rem; color: var(--color-font-1); - background: var(--color-header-bg); - box-shadow: 1px 1px 6px #bbbbbb; + background: var(--color-tooltip-bg); + //box-shadow: 1px 1px 6px #bbbbbb; } diff --git a/src/components/Type.vue b/src/components/Type.vue index d557b889..5ace5af2 100644 --- a/src/components/Type.vue +++ b/src/components/Type.vue @@ -311,7 +311,7 @@ function format(val: number, suffix: string = '') { width: var(--toolbar-width); box-sizing: border-box; border-radius: 10rem; - background: white; + background: var(--color-header-bg); padding: 2rem 10rem 10rem 10rem; margin-top: 20rem; transition: all .3s;