From c9fb2f185183ad44056571e09bcf3e3db4a71ebf Mon Sep 17 00:00:00 2001 From: mackt <1033530438@qq.com> Date: Sat, 6 Apr 2024 21:13:10 +0800 Subject: [PATCH] update: Replace brand color. --- public/img/audio-player/play.svg | 2 +- public/img/icon/audio-playing.svg | 6 +++--- public/img/icon/love-active.svg | 2 +- public/img/icon/thumb-active.svg | 2 +- src/app/about/page.tsx | 2 +- src/app/mylist/page.tsx | 2 +- src/components/Category.tsx | 2 +- src/components/Collect.tsx | 2 +- src/components/Comment/ButtonBar.tsx | 6 +++--- src/components/Comment/CommentHeader.tsx | 6 +++--- src/components/Header/HeaderAvatar.tsx | 2 +- src/components/Journal/HotJournalCard.tsx | 4 ++-- src/components/Journal/JournalItem.tsx | 8 ++++---- src/components/Journal/JournalList.tsx | 2 +- src/components/Song/SongCard.tsx | 4 ++-- src/components/Thumb.tsx | 2 +- src/components/common/Button.tsx | 2 +- uno.config.ts | 11 ++++------- 18 files changed, 32 insertions(+), 35 deletions(-) diff --git a/public/img/audio-player/play.svg b/public/img/audio-player/play.svg index 28e89bb..74ef673 100644 --- a/public/img/audio-player/play.svg +++ b/public/img/audio-player/play.svg @@ -1,5 +1,5 @@ - + diff --git a/public/img/icon/audio-playing.svg b/public/img/icon/audio-playing.svg index b3c93d4..15df3d2 100644 --- a/public/img/icon/audio-playing.svg +++ b/public/img/icon/audio-playing.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/public/img/icon/love-active.svg b/public/img/icon/love-active.svg index e47a576..4599131 100644 --- a/public/img/icon/love-active.svg +++ b/public/img/icon/love-active.svg @@ -1,3 +1,3 @@ - + diff --git a/public/img/icon/thumb-active.svg b/public/img/icon/thumb-active.svg index f78158f..9d87f9e 100644 --- a/public/img/icon/thumb-active.svg +++ b/public/img/icon/thumb-active.svg @@ -1,3 +1,3 @@ - + diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx index 8d4ba94..ae045c9 100644 --- a/src/app/about/page.tsx +++ b/src/app/about/page.tsx @@ -72,7 +72,7 @@ export default async function About() {

如果你也想加入我们，无论是提供技术、资金或是其他任何方式的支持，都可以加微信号  - indier + indier  联系到我们。
感谢音乐，感谢遇见，感谢所有的贡献者。还有感谢那些途中参与过，给予我们帮助的人们。所有的奉献都值得被铭记。

diff --git a/src/app/mylist/page.tsx b/src/app/mylist/page.tsx index 415f4c6..0358497 100644 --- a/src/app/mylist/page.tsx +++ b/src/app/mylist/page.tsx @@ -71,7 +71,7 @@ export default function Journal() { ))} -
+
播放全部
{/* List */} diff --git a/src/components/Category.tsx b/src/components/Category.tsx index d3df260..c163c05 100644 --- a/src/components/Category.tsx +++ b/src/components/Category.tsx @@ -25,7 +25,7 @@ const Category = async ({ current = '' }: { current?: string }) => { {item.nameCh} diff --git a/src/components/Collect.tsx b/src/components/Collect.tsx index 3a845a0..3b938a7 100644 --- a/src/components/Collect.tsx +++ b/src/components/Collect.tsx @@ -31,7 +31,7 @@ export default function Collect({ active, id, type, size = 24, text = '' }: Prop return (
{/* 文案 */} - {!!text &&

{text}

} + {!!text &&

{text}

} {/* 图标 */}
{/* 回复 */}
回复
{/* 展开回复 */} {commentCount > 1 && !showAll && ( -
+
展开{commentCount}条回复
)} @@ -59,7 +59,7 @@ export default function ButtonBar({
{displayThumbupCount > 0 && (
{displayThumbupCount}
diff --git a/src/components/Comment/CommentHeader.tsx b/src/components/Comment/CommentHeader.tsx index e0330d9..739996b 100644 --- a/src/components/Comment/CommentHeader.tsx +++ b/src/components/Comment/CommentHeader.tsx @@ -18,14 +18,14 @@ export default function CommentHeader({
onChange('hot')} > 热门
-
|
+
|
onChange('new')} > 最新 diff --git a/src/components/Header/HeaderAvatar.tsx b/src/components/Header/HeaderAvatar.tsx index 170d042..b27fd09 100644 --- a/src/components/Header/HeaderAvatar.tsx +++ b/src/components/Header/HeaderAvatar.tsx @@ -19,7 +19,7 @@ export default function HeaderAvatar({ className }: { className?: string }) { ) : (
)}
-

+

{commentList[0].content}

@@ -41,7 +41,7 @@ export default function JournalItem({ {/* 评论 & 收藏 */}
comment -

+

{totalCommentReply}

love -

+

{totalCommentReply}

diff --git a/src/components/Journal/JournalList.tsx b/src/components/Journal/JournalList.tsx index 16829cb..0a205b4 100644 --- a/src/components/Journal/JournalList.tsx +++ b/src/components/Journal/JournalList.tsx @@ -37,7 +37,7 @@ const JournalList = async ({ categoryId, nameCh, journalNoRange, pageNum, pageSi
{nameCh}
FM -

电台

+

电台

diff --git a/src/components/Song/SongCard.tsx b/src/components/Song/SongCard.tsx index a5c6ba6..8eea813 100644 --- a/src/components/Song/SongCard.tsx +++ b/src/components/Song/SongCard.tsx @@ -11,8 +11,8 @@ export default function JournalItem({ id, title, pic, artist, haveCollect }: Son
{title}
-
{title}
-
{artist}
+
{title}
+
{artist}
diff --git a/src/components/Thumb.tsx b/src/components/Thumb.tsx index 42d4132..1353ee8 100644 --- a/src/components/Thumb.tsx +++ b/src/components/Thumb.tsx @@ -29,7 +29,7 @@ export default function Collect({ active, id, type, size = 24, text = '' }: Prop return (
{/* 文案 */} - {!!text &&

{text}

} + {!!text &&

{text}

} {/* 图标 */}
= ({ }) => { const buttonColorList = { default: { default: 'bg-blue text-[#000]', disabled: 'opacity-50' }, - primary: { default: 'bg-[#B44343] text-[#fff]', disabled: 'opacity-50' }, + primary: { default: 'bg-brand text-[#fff]', disabled: 'opacity-50' }, black: { default: 'bg-[#000] text-[#fff]', disabled: 'opacity-10' }, }; diff --git a/uno.config.ts b/uno.config.ts index e2a6bdc..da95625 100644 --- a/uno.config.ts +++ b/uno.config.ts @@ -12,10 +12,7 @@ export default defineConfig({ }), ], - rules: [ - ['bg-theme', { 'background-color': '#B44343' }], - ['text-flow', { 'text-overflow': 'ellipsis', 'white-space': 'nowrap', overflow: 'hidden' }], - ], + rules: [['text-flow', { 'text-overflow': 'ellipsis', 'white-space': 'nowrap', overflow: 'hidden' }]], shortcuts: { 'switch-animation': 'transition duration-300', @@ -24,9 +21,9 @@ export default defineConfig({ 'text-base': 'text-[rgba(0,0,0,0.95)] dark:text-[#f0f0f0] switch-animation', 'switch-label-base': 'bg-gray-200 dark:bg-gray-800 switch-animation', 'switch-span-base': 'bg-white dark:bg-gray-300 switch-animation', - 'text-theme': 'text-[#B44343]', + 'text-brand': 'text-[#C43737]', 'text-overflow': 'overflow-hidden whitespace-nowrap truncate', - 'border-theme': 'border-[#B44343]', - 'bg-theme': 'bg-[#B44343]', + 'border-brand': 'border-[#C43737]', + 'bg-brand': 'bg-[#C43737]', }, });