From 5e3cd1a63ea9da5c4bb481641f6a84b49df53e8f Mon Sep 17 00:00:00 2001 From: KUN1007 Date: Tue, 6 Jun 2023 16:05:37 +0800 Subject: [PATCH] fix scroll, add color --- src/language/en.ts | 2 +- src/styles/theme/color-list.scss | 2 +- src/styles/theme/color.scss | 1 + .../article/content/ArticleContent.vue | 21 ++++++++---------- src/views/balance/components/Form.vue | 22 ++++++++----------- src/views/donate/Donate.vue | 9 -------- src/views/kungalgame/KUNGalgame.vue | 10 +++++++++ src/views/kungalgamer/content/Topic.vue | 21 ++++++++---------- src/views/non-moe/NonMoe.vue | 2 -- src/views/ranking/components/Form.vue | 21 ++++++++---------- src/views/ranking/components/Temp.vue | 2 -- src/views/update-log/components/History.vue | 21 ++++++++---------- 12 files changed, 58 insertions(+), 76 deletions(-) diff --git a/src/language/en.ts b/src/language/en.ts index d5cfaf0c..c86e398a 100644 --- a/src/language/en.ts +++ b/src/language/en.ts @@ -69,7 +69,7 @@ export default { }, nonMoe: { log: 'Non-moe Record', - title: 'All the non-moe behavior were recorded here, please do not do that', + title: `All the non-moe behavior were recorded here, don't do that`, reason: 'reason', consequence: 'consequence', moemoepoint: 'moemoepoint', diff --git a/src/styles/theme/color-list.scss b/src/styles/theme/color-list.scss index 24df25c6..0b256a93 100644 --- a/src/styles/theme/color-list.scss +++ b/src/styles/theme/color-list.scss @@ -92,7 +92,7 @@ $kungalgame-pink-4: #e85aad; */ // $kungalgame-trans-black: #1f2328; // $kungalgame-trans-white-1: #fffffff7; -// $kungalgame-trans-white-2: #ffffffd9; +$kungalgame-trans-white-2: #ffffffd9; // $kungalgame-trans-white-3: #ffffffc7; // $kungalgame-trans-white-4: #ffffffa1; $kungalgame-trans-white-5: #ffffff8e; diff --git a/src/styles/theme/color.scss b/src/styles/theme/color.scss index bdfcdec6..c8e6a8b2 100644 --- a/src/styles/theme/color.scss +++ b/src/styles/theme/color.scss @@ -51,6 +51,7 @@ html { */ + --kungalgame-trans-white-2: #ffffffd9; --kungalgame-trans-white-5: #ffffff8e; /* 这个白色是占位符，不然会导致塌陷 */ --kungalgame-trans-white-9: #ffffff00; diff --git a/src/views/Home/content/article/content/ArticleContent.vue b/src/views/Home/content/article/content/ArticleContent.vue index 9c4a51e6..9121ac88 100644 --- a/src/views/Home/content/article/content/ArticleContent.vue +++ b/src/views/Home/content/article/content/ArticleContent.vue @@ -39,17 +39,14 @@ import SingleTopic from './topic/SingleTopic.vue' /* 帖子区域弹性盒 */ display: flex; flex-direction: column; -} -/* 帖子区滚动条 */ -.topic-container::-webkit-scrollbar { - display: inline; - width: 4px; - height: 0; - background-color: var(--kungalgame-red-2); - border-radius: 2px; -} -.topic-container::-webkit-scrollbar-thumb { - background: var(--kungalgame-blue-4); - border-radius: 2px; + &::-webkit-scrollbar { + display: inline; + width: 4px; + height: 0; + } + &::-webkit-scrollbar-thumb { + background: var(--kungalgame-blue-4); + border-radius: 2px; + } } diff --git a/src/views/balance/components/Form.vue b/src/views/balance/components/Form.vue index 0b87e2ae..a7229c1d 100644 --- a/src/views/balance/components/Form.vue +++ b/src/views/balance/components/Form.vue @@ -53,6 +53,15 @@ const total = props.isIncome ? 'totalIncome' : 'totalExpenditure' padding: 10px; /* y 轴溢出滚动 */ overflow-y: scroll; + &::-webkit-scrollbar { + display: inline; + width: 4px; + height: 0; + } + &::-webkit-scrollbar-thumb { + background: var(--kungalgame-blue-4); + border-radius: 2px; + } } /* 总收入 */ .sum { @@ -67,19 +76,6 @@ const total = props.isIncome ? 'totalIncome' : 'totalExpenditure' background-color: var(--kungalgame-trans-blue-0); } } - -/* 滚动条的样式 */ -.container::-webkit-scrollbar { - display: inline; - width: 4px; - height: 0; - background-color: var(--kungalgame-red-2); - border-radius: 2px; -} -.container::-webkit-scrollbar-thumb { - background: var(--kungalgame-blue-4); - border-radius: 2px; -} /* 支出的样式 */ .expenditure-form { border: 1px solid var(--kungalgame-red-4); diff --git a/src/views/donate/Donate.vue b/src/views/donate/Donate.vue index 1432a128..dcd7ea22 100644 --- a/src/views/donate/Donate.vue +++ b/src/views/donate/Donate.vue @@ -21,15 +21,6 @@ diff --git a/src/views/non-moe/NonMoe.vue b/src/views/non-moe/NonMoe.vue index 0100223f..9aeac80a 100644 --- a/src/views/non-moe/NonMoe.vue +++ b/src/views/non-moe/NonMoe.vue @@ -102,8 +102,6 @@ import KUNGalgameFooter from '@/components/KUNGalgameFooter.vue' display: inline; width: 4px; height: 0; - background-color: var(--kungalgame-red-2); - border-radius: 2px; } &::-webkit-scrollbar-thumb { background: var(--kungalgame-blue-4); diff --git a/src/views/ranking/components/Form.vue b/src/views/ranking/components/Form.vue index 9fec2051..9b8d9a04 100644 --- a/src/views/ranking/components/Form.vue +++ b/src/views/ranking/components/Form.vue @@ -80,17 +80,14 @@ import KUNgalgamer from './KUNGalgamer.vue' flex-direction: column; margin-right: 10px; overflow-y: scroll; -} -/* 滚动条的样式 */ -.kungalgamer-container::-webkit-scrollbar { - display: inline; - width: 4px; - height: 0; - background-color: var(--kungalgame-red-2); - border-radius: 2px; -} -.kungalgamer-container::-webkit-scrollbar-thumb { - background: var(--kungalgame-blue-4); - border-radius: 2px; + &::-webkit-scrollbar { + display: inline; + width: 4px; + height: 0; + } + &::-webkit-scrollbar-thumb { + background: var(--kungalgame-blue-4); + border-radius: 2px; + } } diff --git a/src/views/ranking/components/Temp.vue b/src/views/ranking/components/Temp.vue index e38c184a..2f65cc9b 100644 --- a/src/views/ranking/components/Temp.vue +++ b/src/views/ranking/components/Temp.vue @@ -83,8 +83,6 @@ import Topic from './Topic.vue' display: inline; width: 4px; height: 0; - background-color: var(--kungalgame-red-2); - border-radius: 2px; } .topic-container::-webkit-scrollbar-thumb { background: var(--kungalgame-blue-4); diff --git a/src/views/update-log/components/History.vue b/src/views/update-log/components/History.vue index e1eb3e56..e8615255 100644 --- a/src/views/update-log/components/History.vue +++ b/src/views/update-log/components/History.vue @@ -26,17 +26,14 @@ import SingleHistory from './SingleLog.vue' flex-direction: column; /* y 轴溢出滚动 */ overflow-y: scroll; -} -/* 帖子区滚动条 */ -.history-list::-webkit-scrollbar { - display: inline; - width: 4px; - height: 0; - background-color: var(--kungalgame-red-2); - border-radius: 2px; -} -.history-list::-webkit-scrollbar-thumb { - background: var(--kungalgame-blue-4); - border-radius: 2px; + &::-webkit-scrollbar { + display: inline; + width: 4px; + height: 0; + } + &::-webkit-scrollbar-thumb { + background: var(--kungalgame-blue-4); + border-radius: 2px; + } }