diff --git a/pages/leaderboard/leaderboard.wxss b/pages/leaderboard/leaderboard.wxss index d016626..6815695 100644 --- a/pages/leaderboard/leaderboard.wxss +++ b/pages/leaderboard/leaderboard.wxss @@ -8,7 +8,7 @@ /* Period tabs */ .period-tabs { display: flex; - background: #FFFFFF; + background: var(--card-bg); padding: 0 32rpx; border-bottom: 1rpx solid var(--border); position: sticky; @@ -91,7 +91,7 @@ } .rank-item.is-me { - background: var(--primary-bg); + background: rgba(var(--primary-rgb), 0.12); border: 2rpx solid var(--primary); } @@ -106,20 +106,20 @@ font-weight: 700; color: var(--text-secondary); border-radius: 50%; - background: #F5F5F5; + background: var(--bg-soft); flex-shrink: 0; margin-right: 16rpx; } .rank-num.gold { background: #FFF7E6; color: #FA8C16; font-size: 36rpx; } -.rank-num.silver { background: #F0F0F0; color: #8C8C8C; font-size: 36rpx; } +.rank-num.silver { background: var(--bg-soft); color: #8C8C8C; font-size: 36rpx; } .rank-num.bronze { background: #FFF1E6; color: #D46B08; font-size: 36rpx; } .rank-avatar { width: 64rpx; height: 64rpx; border-radius: 50%; - background: #F0F0F0; + background: var(--bg-soft); flex-shrink: 0; margin-right: 16rpx; opacity: 0.6; @@ -162,7 +162,7 @@ right: 24rpx; display: flex; align-items: center; - background: var(--primary-bg); + background: rgba(var(--primary-rgb), 0.12); border: 2rpx solid var(--primary); border-radius: 16rpx; padding: 16rpx 24rpx; diff --git a/pages/settings/settings.wxss b/pages/settings/settings.wxss index 53fe91b..78d39fa 100644 --- a/pages/settings/settings.wxss +++ b/pages/settings/settings.wxss @@ -28,7 +28,7 @@ .theme-item:last-child { border-bottom: none; } .theme-item.active { - background: var(--primary-bg); + background: rgba(var(--primary-rgb), 0.12); margin: 0 -32rpx; padding-left: 32rpx; padding-right: 32rpx; @@ -78,7 +78,7 @@ .plan-item:last-child { border-bottom: none; } .plan-item.active { - background: var(--primary-bg); + background: rgba(var(--primary-rgb), 0.12); margin: 0 -32rpx; padding-left: 32rpx; padding-right: 32rpx; diff --git a/utils/theme.js b/utils/theme.js index ae9e063..13cc739 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -97,8 +97,8 @@ const setTheme = (id) => { const getThemeStyle = (theme, isDark = false) => { const t = theme || getCurrentTheme() const baseVars = isDark - ? '--text:#E5E5E7;--text-secondary:#98989F;--bg:#0F0F12;--bg-gradient-start:#0F0F12;--bg-gradient-end:#14141A;--card-bg:#1C1C1E;--border:#2C2C2E;--success:#30D158;' - : '--text:#333333;--text-secondary:#999999;--bg:#F5F5F5;--bg-gradient-start:#F5F5F5;--bg-gradient-end:#FAFAFA;--card-bg:#FFFFFF;--border:#EEEEEE;--success:#4CAF50;' + ? '--text:#E5E5E7;--text-secondary:#98989F;--bg:#0F0F12;--bg-gradient-start:#0F0F12;--bg-gradient-end:#14141A;--card-bg:#1C1C1E;--bg-soft:#2C2C2E;--border:#2C2C2E;--success:#30D158;' + : '--text:#333333;--text-secondary:#999999;--bg:#F5F5F5;--bg-gradient-start:#F5F5F5;--bg-gradient-end:#FAFAFA;--card-bg:#FFFFFF;--bg-soft:#F0F0F0;--border:#EEEEEE;--success:#4CAF50;' return `${baseVars}--primary:${t.primary};--primary-light:${t.primaryLight};--primary-bg:${t.primaryBg};--primary-rgb:${t.primaryRgb};` }