From 208aa7cc1a28555641ed9ae15ac9628eeac7b439 Mon Sep 17 00:00:00 2001 From: BTMuli Date: Fri, 1 Sep 2023 22:06:58 +0800 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20confirm=20=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/index.css | 3 +- src/assets/themes/dark.css | 5 +++ src/assets/themes/default.css | 5 +++ src/components/func/confirm.vue | 72 +++++++++++++++------------------ 4 files changed, 44 insertions(+), 41 deletions(-) diff --git a/src/assets/index.css b/src/assets/index.css index 78705dbe..06f90fca 100644 --- a/src/assets/index.css +++ b/src/assets/index.css @@ -49,7 +49,8 @@ --tgc-blue-3: #4b5466; /* Genshin icon bg */ --tgc-green-1: #238636; /* Github web btn */ --tgc-pink-1: #fb7299; /* Bilibili btn bg */ - --tgc-yellow: #ffcd0c; /* Genshin btn bg */ + --tgc-yellow-1: #ffcd0c; /* Genshin btn bg */ + --tgc-yellow-2: #f4d8a8; /* Genshin confirm text */ } html { diff --git a/src/assets/themes/dark.css b/src/assets/themes/dark.css index a94d4d9d..592ec33a 100644 --- a/src/assets/themes/dark.css +++ b/src/assets/themes/dark.css @@ -17,12 +17,17 @@ html.dark { --box-bg-1: var(--tgc-dark-5); --box-bg-2: var(--tgc-dark-6); --box-bg-3: var(--tgc-dark-7); + --box-bg-4: var(--tgc-dark-7); + + /* box bg transparent */ + --box-bg-t-4: var(--tgc-white-1); /* text */ --box-text-1: var(--tgc-white-1); --box-text-2: var(--tgc-white-2); --box-text-3: var(--tgc-blue-1); --box-text-4: var(--tgc-white-8); + --box-text-5: var(--tgc-yellow-1); /* box-shadow */ --common-shadow-1: rgb(255 255 255 / 10%); diff --git a/src/assets/themes/default.css b/src/assets/themes/default.css index a2f0d892..b7579ef0 100644 --- a/src/assets/themes/default.css +++ b/src/assets/themes/default.css @@ -17,12 +17,17 @@ html.default { --box-bg-1: var(--tgc-white-3); --box-bg-2: var(--tgc-white-7); --box-bg-3: var(--tgc-white-9); + --box-bg-4: var(--tgc-white-1); + + /* box bg transparent */ + --box-bg-t-4: var(--tgc-dark-7); /* box text */ --box-text-1: var(--tgc-dark-5); --box-text-2: var(--tgc-dark-2); --box-text-3: var(--tgc-blue-2); --box-text-4: var(--tgc-blue-3); + --box-text-5: var(--tgc-yellow-2); /* box-shadow */ --common-shadow-1: rgb(0 0 0 / 10%); diff --git a/src/components/func/confirm.vue b/src/components/func/confirm.vue index 387fe030..f4fe7fad 100644 --- a/src/components/func/confirm.vue +++ b/src/components/func/confirm.vue @@ -16,13 +16,15 @@
- - +
@@ -172,27 +174,27 @@ defineExpose({ height: 100%; align-items: center; justify-content: center; - backdrop-filter: blur(3px); - background: rgb(0 0 0 / 50%); + backdrop-filter: blur(10px); + background: var(--common-shadow-t-1); } .confirm-box { display: flex; - width: 40vw; - height: 20vh; + width: 520px; + height: 240px; flex-direction: column; align-items: center; justify-content: space-between; padding: 10px; - border-radius: 10px; - background: var(--content-bg-2); - box-shadow: 0 0 10px var(--common-shadow-2); + border: 1px solid var(--common-shadow-1); + border-radius: 5px; + background: var(--box-bg-4); + color: var(--box-text-1); } .confirm-title { width: 100%; - border-bottom: 1px solid var(--btn-bg-2); - color: var(--content-text-2); + border-bottom: 1px solid var(--common-shadow-4); font-family: var(--font-title); font-size: 30px; text-align: center; @@ -211,9 +213,8 @@ defineExpose({ width: 100%; align-items: center; justify-content: center; - color: var(--content-text-2); - font-family: Genshin-Light, serif; - font-size: 20px; + font-family: var(--font-text); + font-size: 16px; gap: 10px; } @@ -221,9 +222,10 @@ defineExpose({ width: 50%; height: 100%; padding: 5px; + border: 1px solid var(--common-shadow-4); border-radius: 5px; - background: var(--btn-bg-3); - color: var(--btn-text-1); + background: inherit; + color: var(--box-text-1); } .confirm-btn-box { @@ -236,25 +238,15 @@ defineExpose({ .confirm-btn { position: relative; display: flex; - width: 30%; - min-width: 150px; - min-height: 30px; + width: 180px; + height: 60px; align-items: center; - border-radius: 50px; - background: var(--btn-bg-2); - color: var(--btn-text-1); - font-family: var(--font-text); -} - -.btn-icon { - width: 20px; - height: 20px; - margin: 5px; -} - -.btn-text { - position: absolute; - width: 100%; - text-align: center; + justify-content: center; + border: 1px solid var(--common-shadow-4); + border-radius: 5px; + color: var(--box-text-5); + cursor: pointer; + font-family: var(--font-title); + font-size: 20px; }