From 4debd354a79117d58af7570bfef1b67c74410521 Mon Sep 17 00:00:00 2001 From: BTMuli Date: Sat, 2 Sep 2023 22:42:08 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E5=AE=8C=E5=96=84=20box-b?= =?UTF-8?q?g=20=E5=B1=82=E7=BA=A7=EF=BC=8C=E5=87=8F=E5=B0=91=20border?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/themes/dark.css | 18 ++++----- src/assets/themes/default.css | 17 ++++----- src/components/gachaRecord/gro-dataview.vue | 3 +- src/components/home/t-calendar.vue | 1 - src/components/home/t-pool.vue | 1 - src/components/home/t-position.vue | 1 - src/components/main/t-subline.vue | 12 ++++-- src/components/userAbyss/tua-detail-level.vue | 1 - src/components/userAbyss/tua-detail.vue | 1 - src/components/userAbyss/tua-overview.vue | 3 +- src/components/userCharacter/tuc-role-box.vue | 6 +-- .../userRecord/tur-overview-sub.vue | 1 - src/components/userRecord/tur-world-sub.vue | 1 - src/pages/User/Gacha.vue | 3 +- src/pages/User/Record.vue | 1 - src/pages/common/Achievements.vue | 20 ++++------ src/pages/common/Config.vue | 37 +++++++++---------- src/plugins/Mys/utils/parsePost.ts | 6 +-- src/utils/TGShare.ts | 2 +- 19 files changed, 60 insertions(+), 75 deletions(-) diff --git a/src/assets/themes/dark.css b/src/assets/themes/dark.css index 77dd5c7d..5311da8b 100644 --- a/src/assets/themes/dark.css +++ b/src/assets/themes/dark.css @@ -8,16 +8,16 @@ /* dark mode */ html.dark { /* app container */ - --app-page-bg: var(--tgc-dark-8); - --app-page-content: var(--tgc-white-3); - --app-side-bg: var(--tgc-dark-3); - --app-side-content: var(--tgc-white-4); + --app-page-bg: #000000; /* (0, 0, 0) */ + --app-page-content: #d0d0d0; + --app-side-bg: #151c26; + --app-side-content: #dddddd; - /* content */ - --box-bg-1: var(--tgc-dark-4); - --box-bg-2: var(--tgc-dark-6); - --box-bg-3: var(--tgc-dark-7); - --box-bg-4: var(--tgc-dark-7); + /* box container */ + --box-bg-1: #21252b; + --box-bg-2: #323844; + --box-bg-3: #282c34; + --box-bg-4: #3d424b; /* box bg transparent */ --box-bg-t-1: var(--tgc-white-3); diff --git a/src/assets/themes/default.css b/src/assets/themes/default.css index fa02f065..094ca817 100644 --- a/src/assets/themes/default.css +++ b/src/assets/themes/default.css @@ -8,17 +8,16 @@ /* default(light) theme */ html.default { /* app container */ - --app-page-bg: var(--tgc-white-1); - --app-page-content: var(--tgc-dark-7); - --app-side-bg: var(--tgc-white-5); - --app-side-content: var(--tgc-dark-8); + --app-page-bg: #ffffff; + --app-page-content: #2f2f2f; + --app-side-bg: #f2f2f2; + --app-side-content: #222222; /* box container */ - /* page-bg > box-bg-1 > box-bg-2 */ - --box-bg-1: var(--tgc-white-3); /* with box-text-1 */ - --box-bg-2: var(--tgc-white-4); - --box-bg-3: var(--tgc-white-9); - --box-bg-4: var(--tgc-white-1); + --box-bg-1: #efefef; + --box-bg-2: #f6f8fa; + --box-bg-3: #dee4e9; + --box-bg-4: #f5f5f5; /* box bg transparent */ --box-bg-t-1: var(--tgc-dark-5); diff --git a/src/components/gachaRecord/gro-dataview.vue b/src/components/gachaRecord/gro-dataview.vue index 23870ff6..d61c5a8e 100644 --- a/src/components/gachaRecord/gro-dataview.vue +++ b/src/components/gachaRecord/gro-dataview.vue @@ -189,7 +189,7 @@ function getIcon(itemId: string, type: string): string { // 监听数据变化 watch( () => props.dataVal, - (newVal) => { + () => { star5List.value = []; star4List.value = []; reset5count.value = 0; @@ -207,7 +207,6 @@ watch( .gro-dv-container { height: 100%; padding: 10px; - border: 1px solid var(--common-shadow-2); border-radius: 5px; background: var(--box-bg-2); } diff --git a/src/components/home/t-calendar.vue b/src/components/home/t-calendar.vue index dc9c820c..65878b14 100644 --- a/src/components/home/t-calendar.vue +++ b/src/components/home/t-calendar.vue @@ -183,7 +183,6 @@ async function share(): Promise { display: flex; flex-direction: column; padding: 10px; - border: 1px solid var(--common-shadow-2); border-radius: 5px; background: var(--box-bg-1); gap: 5px; diff --git a/src/components/home/t-pool.vue b/src/components/home/t-pool.vue index 3eb0a6aa..992ff011 100644 --- a/src/components/home/t-pool.vue +++ b/src/components/home/t-pool.vue @@ -200,7 +200,6 @@ onUnmounted(() => { display: flex; flex-direction: column; padding: 10px; - border: 1px solid var(--common-shadow-2); border-radius: 5px; background: var(--box-bg-1); gap: 10px; diff --git a/src/components/home/t-position.vue b/src/components/home/t-position.vue index 615ce15d..a0eec066 100644 --- a/src/components/home/t-position.vue +++ b/src/components/home/t-position.vue @@ -129,7 +129,6 @@ onUnmounted(() => { diff --git a/src/components/userAbyss/tua-detail-level.vue b/src/components/userAbyss/tua-detail-level.vue index 932bed75..8865c463 100644 --- a/src/components/userAbyss/tua-detail-level.vue +++ b/src/components/userAbyss/tua-detail-level.vue @@ -25,7 +25,6 @@ const props = defineProps(); display: flex; flex-direction: column; padding: 10px; - border: 1px inset var(--common-shadow-2); border-radius: 5px; margin-top: 10px; background: var(--box-bg-2); diff --git a/src/components/userAbyss/tua-detail.vue b/src/components/userAbyss/tua-detail.vue index 8108c799..391678fd 100644 --- a/src/components/userAbyss/tua-detail.vue +++ b/src/components/userAbyss/tua-detail.vue @@ -27,7 +27,6 @@ const props = defineProps(); diff --git a/src/plugins/Mys/utils/parsePost.ts b/src/plugins/Mys/utils/parsePost.ts index 22393f8e..1a5c92ed 100644 --- a/src/plugins/Mys/utils/parsePost.ts +++ b/src/plugins/Mys/utils/parsePost.ts @@ -2,7 +2,7 @@ * @file plugins Mys utils parsePost.ts * @description 用于解析Mys数据的工具 * @author BTMuli - * @since Alpha v0.2.1 + * @since Beta v0.3.0 */ /** @@ -189,7 +189,7 @@ function parseUnknown(data: TGApp.Plugins.Mys.Post.StructuredContent): HTMLDivEl /** * @description 解析文本 - * @since Alpha v0.1.3 + * @since Beta v0.3.0 * @param {TGApp.Plugins.Mys.Post.StructuredContent} data Mys数据 * @returns {HTMLSpanElement} 解析后的文本 */ @@ -206,7 +206,7 @@ function parseText(data: TGApp.Plugins.Mys.Post.StructuredContent): HTMLSpanElem if (data.attributes.color) { let colorGet = data.attributes.color; // 如果 colorGet 在 darkColorList 中，就设置为对应的颜色 - if (isColorSimilar("#ece5d8", colorGet) || isColorSimilar("#2a2a2a", colorGet)) { + if (isColorSimilar("#ffffff", colorGet) || isColorSimilar("#000000", colorGet)) { colorGet = "var(--post-default-text)"; } text.style.color = colorGet; diff --git a/src/utils/TGShare.ts b/src/utils/TGShare.ts index f6caa388..8d63678b 100644 --- a/src/utils/TGShare.ts +++ b/src/utils/TGShare.ts @@ -68,7 +68,7 @@ function getShareImgBgColor(): string { theme = JSON.parse(theme).theme; } if (theme === "dark") { - return "#0d1117"; + return "#000000"; } else { return "#ffffff"; }