diff --git a/src/assets/css/anno-parser.css b/src/assets/css/anno-parser.css index 25b0c4df..21b5b3c5 100644 --- a/src/assets/css/anno-parser.css +++ b/src/assets/css/anno-parser.css @@ -6,25 +6,25 @@ */ .anno-body { - margin: 0 auto; width: 800px; + margin: 0 auto; font-family: var(--font-text); } .anno-title { - font-family: var(--font-title); color: var(--common-text-title); + font-family: var(--font-title); font-size: 24px; } .anno-subtitle { - font-size: 16px; color: var(--common-text-quote); + font-size: 16px; } .anno-img { - max-width: 100%; width: 800px; + max-width: 100%; height: auto; border-radius: 10px; margin-bottom: 10px; @@ -46,13 +46,13 @@ } .anno-content :deep(p) { - line-height: 2; color: #4b5366; + line-height: 2; } .anno-content :deep(details) { - border: #35acce 2px solid; padding: 10px; + border: #35acce 2px solid; border-radius: 10px; margin: 10px; } @@ -71,6 +71,6 @@ } .anno-content :deep(td) { - line-height: 2; padding-left: 10px; + line-height: 2; } diff --git a/src/assets/css/post-parser.css b/src/assets/css/post-parser.css index 2e11f821..35f8ded5 100644 --- a/src/assets/css/post-parser.css +++ b/src/assets/css/post-parser.css @@ -6,21 +6,21 @@ */ .mys-post-body { - margin: 0 auto; width: 800px; - font-family: var(--font-text); + margin: 0 auto; color: var(--post-default-text); + font-family: var(--font-text); } .mys-post-title { - font-family: var(--font-title); color: var(--common-text-title); + font-family: var(--font-title); font-size: 24px; } .mys-post-subtitle { - font-size: 16px; color: var(--common-text-quote); + font-size: 16px; } .mys-post-content { @@ -41,8 +41,8 @@ } :deep(.mys-post-details) { - border: #35acce 2px solid; padding: 10px; + border: #35acce 2px solid; border-radius: 10px; } @@ -61,8 +61,8 @@ } :deep(.mys-post-img) { - max-width: 100%; width: 800px; + max-width: 100%; height: auto; border-radius: 10px; } @@ -74,31 +74,31 @@ } :deep(.mys-post-iframe) { + overflow: hidden; width: 800px; height: 450px; - overflow: hidden; border: 0; border-radius: 10px; } :deep(.mys-post-link-card) { + display: flex; width: 800px; height: 200px; padding: 10px; border-radius: 10px; - display: flex; background: var(--content-bg-2); } :deep(.mys-post-unknown) { width: 800px; + padding: 10px; + border: 2px solid #485466; + border-radius: 10px; + margin: 10px auto; background: #5b738f; color: #faf7e8; font-family: Consolas, monospace; - border-radius: 10px; - padding: 10px; - margin: 10px auto; - border: 2px solid #485466; } :deep(.mys-post-link-card-cover) { @@ -108,36 +108,36 @@ } :deep(.mys-post-link-card-cover) img { - max-width: 400px; width: auto; + max-width: 400px; height: 180px; border-radius: 10px; } :deep(.mys-post-link-card-content) { width: 100%; - padding-left: 20px; height: 180px; + padding-left: 20px; } :deep(.mys-post-link-card-title) { - font-size: 20px; - font-family: Genshin, serif; - color: #546d8b; height: 150px; + color: #546d8b; + font-family: Genshin, serif; + font-size: 20px; } :deep(.mys-post-link-card-price) { + display: inline-block; + color: #ff6d6d; font-size: 20px; font-weight: bold; - color: #ff6d6d; - display: inline-block; } :deep(.mys-post-link-card-btn) { display: inline-block; - float: right; - color: #00c3ff; margin-right: 20px; + color: #00c3ff; + float: right; text-decoration: none; } diff --git a/src/assets/index.css b/src/assets/index.css index 73019329..0bdd7eb5 100644 --- a/src/assets/index.css +++ b/src/assets/index.css @@ -39,13 +39,13 @@ html { } ::-webkit-scrollbar-track { - background: #faf7e8; border-radius: 5px; + background: #faf7e8; } ::-webkit-scrollbar-thumb { - background: #686868; border-radius: 5px; + background: #686868; } ::-webkit-scrollbar-thumb:hover { @@ -63,10 +63,10 @@ html { /* card action 内的按钮 */ .card-btn { - background: #4a5366; - color: #ece5d8; border-radius: 50px; margin-left: 5px; + background: #4a5366; + color: #ece5d8; } .card-btn img { diff --git a/src/assets/themes/dark.css b/src/assets/themes/dark.css index 7d3248e5..04e5cdd1 100644 --- a/src/assets/themes/dark.css +++ b/src/assets/themes/dark.css @@ -17,7 +17,7 @@ html.dark { --common-bg-1: #3d424b; /* 一级背景色 */ --common-bgt-1: #faf7e8; /* 一级背景色对应的文本色 */ --common-bg-2: #3b3d3b; /* button 背景色 */ - --common-bgt-2: #faf7e8; /* button 背景色对应的文本色 */ + --common-bgt-2: #fec90b; /* button 背景色对应的文本色 */ /* text */ --common-text-title: var(--common-color-white); /* title */ diff --git a/src/assets/themes/default.css b/src/assets/themes/default.css index 28ba7fc0..0fef919b 100644 --- a/src/assets/themes/default.css +++ b/src/assets/themes/default.css @@ -17,7 +17,7 @@ html.default { --common-bg-1: #faf7e8; /* 一级背景色 */ --common-bgt-1: #3d424b; /* 一级背景色对应的文本色 */ --common-bg-2: #fec90b; /* button 背景色 */ - --common-bgt-2: #393b40; /* button 背景色对应的文本色 */ + --common-bgt-2: #5b738f; /* button 背景色对应的文本色 */ --common-text-title: #393b40; /* title */ --common-text-content: var(--common-color-blue-2); /* text */ diff --git a/src/components/main/t-backTop.vue b/src/components/main/t-backTop.vue index 87c7f366..e91b6dbb 100644 --- a/src/components/main/t-backTop.vue +++ b/src/components/main/t-backTop.vue @@ -61,16 +61,16 @@ onMounted(() => { .back-top:hover { border-radius: 50%; + box-shadow: 0 0 10px 5px var(--back-top-shadow); cursor: pointer; transform: scale(0.9); transition: all 0.3s ease-in-out; - box-shadow: 0 0 10px 5px var(--back-top-shadow); } .back-top img { - transition: all 0.3s ease-in-out; width: 60px; height: 60px; + transition: all 0.3s ease-in-out; } /* 动画 */ diff --git a/src/components/main/t-calendar.vue b/src/components/main/t-calendar.vue index 7181c140..756819f8 100644 --- a/src/components/main/t-calendar.vue +++ b/src/components/main/t-calendar.vue @@ -148,21 +148,21 @@ function getContents(day: number): void { diff --git a/src/components/main/t-itembox-2.vue b/src/components/main/t-itembox-2.vue index 220c914c..b7285887 100644 --- a/src/components/main/t-itembox-2.vue +++ b/src/components/main/t-itembox-2.vue @@ -37,30 +37,30 @@ const props = defineProps(); diff --git a/src/components/main/t-itembox.vue b/src/components/main/t-itembox.vue index 052a64d0..34ccc551 100644 --- a/src/components/main/t-itembox.vue +++ b/src/components/main/t-itembox.vue @@ -78,10 +78,10 @@ const getOuterFont = computed(() => `${props.modelValue.outerHeight / 2}px`); position: absolute; top: 0; left: 0; + overflow: hidden; width: v-bind(modelValue[ "size"]); height: v-bind(modelValue[ "size"]); border-radius: 5px; - overflow: hidden; } .tib-bg img { @@ -92,9 +92,9 @@ const getOuterFont = computed(() => `${props.modelValue.outerHeight / 2}px`); .tib-icon { position: relative; + overflow: hidden; width: v-bind(modelValue[ "size"]); height: v-bind(modelValue[ "size"]); - overflow: hidden; border-radius: 5px; } @@ -108,25 +108,25 @@ const getOuterFont = computed(() => `${props.modelValue.outerHeight / 2}px`); position: absolute; top: 0; left: 0; + display: flex; width: v-bind(modelValue[ "size"]); height: v-bind(modelValue[ "size"]); - border-radius: 5px; - display: flex; - justify-content: center; - align-items: center; flex-direction: column; + align-items: center; + justify-content: center; + border-radius: 5px; } .tib-lt { position: absolute; top: 0; left: 0; - padding: 5px; + display: flex; width: v-bind(modelValue[ "ltSize"]); height: v-bind(modelValue[ "ltSize"]); - display: flex; - justify-content: center; align-items: center; + justify-content: center; + padding: 5px; } .tib-lt img { @@ -139,33 +139,33 @@ const getOuterFont = computed(() => `${props.modelValue.outerHeight / 2}px`); position: absolute; top: 0; right: 0; + display: flex; width: v-bind(modelValue[ "rtSize"]); height: v-bind(modelValue[ "rtSize"]); - background: rgb(0 0 0 / 40%); - border-top-right-radius: 5px; - border-bottom-left-radius: 5px; - display: flex; - justify-content: center; align-items: center; - font-family: var(--font-title); + justify-content: center; + background: rgb(0 0 0 / 40%); + border-bottom-left-radius: 5px; + border-top-right-radius: 5px; color: var(--common-color-white); + font-family: var(--font-title); } .tib-inner { position: absolute; bottom: 0; left: 0; + display: flex; width: 100%; height: v-bind(getInnerHeight); - display: flex; - justify-content: center; align-items: center; + justify-content: center; background: rgb(20 20 20 / 40%); border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; color: var(--common-color-white); - font-size: v-bind(getInnerFont); font-family: var(--font-title); + font-size: v-bind(getInnerFont); } .tib-inner img { @@ -179,8 +179,8 @@ const getOuterFont = computed(() => `${props.modelValue.outerHeight / 2}px`); bottom: 0; width: 100%; height: v-bind(getOuterHeight); - text-align: center; color: var(--common-text-title); font-size: v-bind(getOuterFont); + text-align: center; } diff --git a/src/components/main/t-overlay.vue b/src/components/main/t-overlay.vue index cab1d7ca..77d1cb21 100644 --- a/src/components/main/t-overlay.vue +++ b/src/components/main/t-overlay.vue @@ -86,15 +86,15 @@ watch( .tolo-box { position: fixed; - left: 0; + z-index: 100; top: 0; + left: 0; + display: flex; width: 100%; height: 100%; - display: flex; - justify-content: center; align-items: center; - background: rgb(0 0 0 / 50%); + justify-content: center; backdrop-filter: blur(v-bind(blurVal)); - z-index: 100; + background: rgb(0 0 0 / 50%); } diff --git a/src/components/main/t-pool.vue b/src/components/main/t-pool.vue index 94682547..4efb3a8f 100644 --- a/src/components/main/t-pool.vue +++ b/src/components/main/t-pool.vue @@ -219,45 +219,45 @@ onUnmounted(() => { diff --git a/src/components/main/t-sidebar.vue b/src/components/main/t-sidebar.vue index fbe41065..9f95d649 100644 --- a/src/components/main/t-sidebar.vue +++ b/src/components/main/t-sidebar.vue @@ -195,27 +195,27 @@ async function switchTheme() { } .side-list { - font-family: var(--font-title); height: 100%; + font-family: var(--font-title); } .bottom-menu { position: absolute; - width: 100%; bottom: 0; + width: 100%; } .side-icon { width: 24px; height: 24px; - margin-right: 32px; border-radius: 5px; + margin-right: 32px; } .side-icon-mini { width: 36px; height: 36px; - transform: translateX(-6px); margin-right: 20px; + transform: translateX(-6px); } diff --git a/src/components/main/t-subline.vue b/src/components/main/t-subline.vue index 62d1a603..ae9a6ceb 100644 --- a/src/components/main/t-subline.vue +++ b/src/components/main/t-subline.vue @@ -15,15 +15,15 @@ defineProps({ diff --git a/src/components/overlay/to-channel.vue b/src/components/overlay/to-channel.vue index 1e75794b..dd4c3223 100644 --- a/src/components/overlay/to-channel.vue +++ b/src/components/overlay/to-channel.vue @@ -105,32 +105,32 @@ function toChannel(link: string) { } .toc-top { + padding: 10px; border-radius: 5px; background: rgb(255 255 255 / 30%); - padding: 10px; } .toc-title { + color: var(--common-color-blue); font-family: var(--font-title); font-size: 20px; - color: var(--common-color-blue); } .toc-list { - margin-top: 10px; display: grid; - grid-template-columns: repeat(2, 1fr); + margin-top: 10px; grid-gap: 10px; + grid-template-columns: repeat(2, 1fr); } .toc-list-item { - cursor: pointer; display: flex; - background: rgb(0 0 0 / 20%); - border-radius: 5px; align-items: center; justify-content: start; + border-radius: 5px; + background: rgb(0 0 0 / 20%); color: var(--common-color-black); + cursor: pointer; transition: all 0.5s linear; } @@ -142,34 +142,34 @@ function toChannel(link: string) { .toc-list-item img { width: 45px; height: 45px; - border-top-left-radius: 5px; - border-bottom-left-radius: 5px; margin-right: 10px; + border-bottom-left-radius: 5px; + border-top-left-radius: 5px; } .toc-list-item span { + margin-right: 10px; font-family: var(--font-title); font-size: 16px; - margin-right: 10px; } .toc-close { - height: 60px; - width: 100%; display: flex; - justify-content: center; + width: 100%; + height: 60px; align-items: center; + justify-content: center; } .toc-close-btn { - border-radius: 50%; + display: flex; width: 30px; height: 30px; + align-items: center; + justify-content: center; + border-radius: 50%; background: rgb(255 255 255 / 30%); color: #faf7e8; cursor: pointer; - display: flex; - justify-content: center; - align-items: center; } diff --git a/src/components/overlay/to-confirm.vue b/src/components/overlay/to-confirm.vue index 2baf1c4a..31737ee4 100644 --- a/src/components/overlay/to-confirm.vue +++ b/src/components/overlay/to-confirm.vue @@ -97,83 +97,83 @@ const onConfirm = () => { diff --git a/src/components/overlay/to-loading.vue b/src/components/overlay/to-loading.vue index 466a3bd9..ac61c45d 100644 --- a/src/components/overlay/to-loading.vue +++ b/src/components/overlay/to-loading.vue @@ -56,54 +56,54 @@ watch( min-width: 800px; min-height: 300px; padding: 15px; + border-radius: 15px; background: rgb(255 255 255 / 5%); box-shadow: 0 0 10px rgb(0 0 0 / 50%); - border-radius: 15px; } .tol-box { - width: 100%; - padding: 10px; display: flex; + width: 100%; box-sizing: content-box; - border: #f4d8a8 1px solid; - color: #f4d8a8; - border-radius: 5px; flex-direction: column; - justify-content: center; align-items: center; + justify-content: center; + padding: 10px; + border: #f4d8a8 1px solid; + border-radius: 5px; + color: #f4d8a8; } .tol-title { + display: flex; width: 100%; height: 50px; - display: flex; - justify-content: center; align-items: center; - font-size: 2rem; + justify-content: center; font-family: Genshin, serif; + font-size: 2rem; font-weight: 600; } .tol-subtitle { width: 100%; - text-align: center; - font-size: 1rem; height: 25px; font-family: Genshin-Light, serif; + font-size: 1rem; + text-align: center; } .tol-img { + display: flex; width: 100%; height: 200px; - display: flex; - justify-content: center; align-items: center; + justify-content: center; } .tol-img:deep(img) { - max-height: 200px; max-width: 100%; + max-height: 200px; border-radius: 5px; } diff --git a/src/components/userAbyss/tua-detail-battle.vue b/src/components/userAbyss/tua-detail-battle.vue index a4bf51a3..88ba2508 100644 --- a/src/components/userAbyss/tua-detail-battle.vue +++ b/src/components/userAbyss/tua-detail-battle.vue @@ -22,15 +22,15 @@ const props = defineProps(); diff --git a/src/components/userAbyss/tua-detail-level.vue b/src/components/userAbyss/tua-detail-level.vue index bab2c1cf..f43b5000 100644 --- a/src/components/userAbyss/tua-detail-level.vue +++ b/src/components/userAbyss/tua-detail-level.vue @@ -17,9 +17,9 @@ const props = defineProps(); diff --git a/src/components/userAbyss/tua-detail-title.vue b/src/components/userAbyss/tua-detail-title.vue index 6b4b5c9a..de34061d 100644 --- a/src/components/userAbyss/tua-detail-title.vue +++ b/src/components/userAbyss/tua-detail-title.vue @@ -36,25 +36,25 @@ const getFontSize: ComputedRef = computed(() => { diff --git a/src/components/userAbyss/tua-detail.vue b/src/components/userAbyss/tua-detail.vue index accf3aa8..10da882f 100644 --- a/src/components/userAbyss/tua-detail.vue +++ b/src/components/userAbyss/tua-detail.vue @@ -27,10 +27,10 @@ const props = defineProps(); diff --git a/src/components/userCharacter/tuc-detail-constellation.vue b/src/components/userCharacter/tuc-detail-constellation.vue index 877d848e..c241405f 100644 --- a/src/components/userCharacter/tuc-detail-constellation.vue +++ b/src/components/userCharacter/tuc-detail-constellation.vue @@ -17,31 +17,31 @@ defineProps(); diff --git a/src/components/userCharacter/tuc-detail-relic.vue b/src/components/userCharacter/tuc-detail-relic.vue index 10c8c3f2..1d8d26d3 100644 --- a/src/components/userCharacter/tuc-detail-relic.vue +++ b/src/components/userCharacter/tuc-detail-relic.vue @@ -21,19 +21,19 @@ const props = defineProps(); diff --git a/src/components/userRecord/tur-home-grid.vue b/src/components/userRecord/tur-home-grid.vue index 0e1f7515..cec9dc3f 100644 --- a/src/components/userRecord/tur-home-grid.vue +++ b/src/components/userRecord/tur-home-grid.vue @@ -24,8 +24,8 @@ const homes = computed(() => { diff --git a/src/components/userRecord/tur-home-sub.vue b/src/components/userRecord/tur-home-sub.vue index 93f02864..7bf3db1b 100644 --- a/src/components/userRecord/tur-home-sub.vue +++ b/src/components/userRecord/tur-home-sub.vue @@ -57,27 +57,27 @@ onMounted(async () => { diff --git a/src/components/userRecord/tur-overview-sub.vue b/src/components/userRecord/tur-overview-sub.vue index 5336db46..6d9bff61 100644 --- a/src/components/userRecord/tur-overview-sub.vue +++ b/src/components/userRecord/tur-overview-sub.vue @@ -22,27 +22,27 @@ defineProps(); diff --git a/src/components/userRecord/tur-world-sub.vue b/src/components/userRecord/tur-world-sub.vue index 3df48920..ba0ead34 100644 --- a/src/components/userRecord/tur-world-sub.vue +++ b/src/components/userRecord/tur-world-sub.vue @@ -82,11 +82,11 @@ async function listenOnTheme() { diff --git a/src/pages/Config.vue b/src/pages/Config.vue index aaf596c9..799338c4 100644 --- a/src/pages/Config.vue +++ b/src/pages/Config.vue @@ -666,27 +666,27 @@ async function updateDB() { diff --git a/src/pages/User/Abyss.vue b/src/pages/User/Abyss.vue index ece7dd97..56369fa9 100644 --- a/src/pages/User/Abyss.vue +++ b/src/pages/User/Abyss.vue @@ -142,19 +142,19 @@ async function shareAbyss(): Promise { diff --git a/src/pages/User/Characters.vue b/src/pages/User/Characters.vue index da0c0c2b..9e8197cf 100644 --- a/src/pages/User/Characters.vue +++ b/src/pages/User/Characters.vue @@ -122,39 +122,39 @@ function selectRole(role: TGApp.Sqlite.Character.UserRole) { diff --git a/src/pages/User/Record.vue b/src/pages/User/Record.vue index 0c393a5e..1d4ca1cc 100644 --- a/src/pages/User/Record.vue +++ b/src/pages/User/Record.vue @@ -115,32 +115,32 @@ function getTheme() { diff --git a/src/pages/WIKI/Abyss.vue b/src/pages/WIKI/Abyss.vue index 4c193636..d721e1aa 100644 --- a/src/pages/WIKI/Abyss.vue +++ b/src/pages/WIKI/Abyss.vue @@ -29,17 +29,17 @@ function getUpdated() { diff --git a/src/pages/WIKI/GCG.vue b/src/pages/WIKI/GCG.vue index 66122491..5c086a8d 100644 --- a/src/pages/WIKI/GCG.vue +++ b/src/pages/WIKI/GCG.vue @@ -175,18 +175,18 @@ async function searchCard() { diff --git a/src/pages/WIKI/Weapon.vue b/src/pages/WIKI/Weapon.vue index c939df22..f772a920 100644 --- a/src/pages/WIKI/Weapon.vue +++ b/src/pages/WIKI/Weapon.vue @@ -33,8 +33,8 @@ function toOuter(item: TGApp.App.Weapon.WikiBriefInfo) { diff --git a/src/views/t-anno-json.vue b/src/views/t-anno-json.vue index 0c13f76d..0d78f988 100644 --- a/src/views/t-anno-json.vue +++ b/src/views/t-anno-json.vue @@ -60,11 +60,11 @@ onMounted(async () => { } .anno-title { - font-size: 20px; + margin: 20px 0; color: #546d8b; font-family: Genshin-Light, serif; + font-size: 20px; font-weight: 600; - margin: 20px 0; } .jv-container { diff --git a/src/views/t-lottery.vue b/src/views/t-lottery.vue index 86351412..c5ab7321 100644 --- a/src/views/t-lottery.vue +++ b/src/views/t-lottery.vue @@ -158,34 +158,34 @@ onUpdated(() => {