diff --git a/publish/changeLog.md b/publish/changeLog.md index 5e3eeb08..fa8d4695 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -17,6 +17,7 @@ - 优化歌单详情、排行榜名右键的播放按钮的播放机制，现在不用等待整个列表（多页时）加载完成才能播放了 - 为播放详情页、桌面歌词添加延迟滚动，播放详情页略微减小已激活歌词的缩放大小及桌面歌词翻译大小 - 修改右边控制按钮为windows风格 +- 更新了新年皮肤的背景与配色，欢迎体验~ ### 修复 diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js index 347189fa..e505c020 100644 --- a/src/common/defaultSetting.js +++ b/src/common/defaultSetting.js @@ -110,7 +110,10 @@ const overwriteSetting = { } // 使用新年皮肤 -if (new Date().getMonth() < 2) defaultSetting.themeId = 9 +if (new Date().getMonth() < 2) { + defaultSetting.themeId = 9 + defaultSetting.desktopLyric.theme = 3 +} exports.defaultSetting = defaultSetting diff --git a/src/renderer/assets/images/xnkl.jpg b/src/renderer/assets/images/xnkl.jpg deleted file mode 100644 index da617b90..00000000 Binary files a/src/renderer/assets/images/xnkl.jpg and /dev/null differ diff --git a/src/renderer/assets/images/xnkl.png b/src/renderer/assets/images/xnkl.png new file mode 100644 index 00000000..13681d79 Binary files /dev/null and b/src/renderer/assets/images/xnkl.png differ diff --git a/src/renderer/assets/styles/variables.less b/src/renderer/assets/styles/variables.less index 97bf28df..835ce7da 100644 --- a/src/renderer/assets/styles/variables.less +++ b/src/renderer/assets/styles/variables.less @@ -913,63 +913,63 @@ @color-naruto-badge-info: lighten(@color-naruto-theme, 10%); @color-naruto-badge-info-font: #fff; -@color-happy_new_year-theme: rgb(252, 57, 57); -@color-happy_new_year-theme-bgimg: url(../images/xnkl.jpg); +@color-happy_new_year-theme: rgba(192, 57, 43, 1); +@color-happy_new_year-theme-bgimg: url(../images/xnkl.png); @color-happy_new_year-theme-bgposition: center; @color-happy_new_year-theme-bgsize: cover; @color-happy_new_year-theme-hover: fadeout(lighten(@color-happy_new_year-theme, 10%), 45%); @color-happy_new_year-theme-active: fadeout(lighten(@color-happy_new_year-theme, 15%), 60%); -@color-happy_new_year-theme-font: rgba(255, 255, 255, 0.9); -@color-happy_new_year-theme-font-label: fadeout(lighten(@color-happy_new_year-theme, 20%), 20%); -@color-happy_new_year-theme_2: rgba(255, 199, 199, 0.8); -@color-happy_new_year-theme_2-background_1: #f2a4a4; +@color-happy_new_year-theme-font: rgba(148, 67, 67, 0.9); +@color-happy_new_year-theme-font-label: fadeout(darken(@color-happy_new_year-theme, 20%), 20%); +@color-happy_new_year-theme_2: rgba(255, 255, 255, 0.8); +@color-happy_new_year-theme_2-background_1: #fef9f2; @color-happy_new_year-theme_2-background_2: fadeout(@color-happy_new_year-theme_2-background_1, 2%); -@color-happy_new_year-theme_2-hover: fadeout(lighten(@color-happy_new_year-theme, 10%), 65%); -@color-happy_new_year-theme_2-active: fadeout(lighten(@color-happy_new_year-theme, 10%), 55%); -@color-happy_new_year-theme_2-font: darken(@color-happy_new_year-theme_2, 90%); -@color-happy_new_year-theme_2-font-label: desaturate(darken(@color-happy_new_year-theme, 5%), 50%); +@color-happy_new_year-theme_2-hover: fadeout(lighten(@color-happy_new_year-theme, 10%), 75%); +@color-happy_new_year-theme_2-active: fadeout(lighten(@color-happy_new_year-theme, 10%), 65%); +@color-happy_new_year-theme_2-font: darken(desaturate(@color-happy_new_year-theme_2, 70%), 90%); +@color-happy_new_year-theme_2-font-label: desaturate(lighten(@color-happy_new_year-theme, 10%), 45%); // @color-happy_new_year-theme_2-line: transparent; -@color-happy_new_year-theme_2-line: fadeout(lighten(@color-happy_new_year-theme, 16%), 70%); -@color-happy_new_year-reply-floor: fadeout(lighten(@color-happy_new_year-theme, 12%), 85%); -@color-happy_new_year-theme-sidebar: rgba(119, 37, 18, 0.1); -@color-happy_new_year-btn: desaturate(@color-happy_new_year-theme, 10%); -@color-happy_new_year-btn-background: fadeout(lighten(@color-happy_new_year-theme, 15%), 60%); +@color-happy_new_year-theme_2-line: fadeout(lighten(@color-happy_new_year-theme, 36%), 80%); +@color-happy_new_year-reply-floor: fadeout(lighten(@color-happy_new_year-theme, 12%), 90%); +@color-happy_new_year-theme-sidebar: rgba(255, 255, 255, .3); +@color-happy_new_year-btn: lighten(@color-happy_new_year-theme, 2%); +@color-happy_new_year-btn-background: fadeout(lighten(@color-happy_new_year-theme, 35%), 70%); @color-happy_new_year-btn-hover: fadeout(lighten(@color-happy_new_year-theme, 5%), 70%); @color-happy_new_year-btn-active: fadeout(darken(@color-happy_new_year-theme, 5%), 70%); @color-happy_new_year-btn-select: fadeout(lighten(@color-happy_new_year-theme, 5%), 50%); -@color-happy_new_year-pagination-background: fadeout(lighten(@color-happy_new_year-theme, 15%), 40%); -@color-happy_new_year-pagination-hover: fadeout(lighten(@color-happy_new_year-theme, 10%), 70%); +@color-happy_new_year-pagination-background: fadeout(lighten(@color-happy_new_year-theme, 20%), 70%); +@color-happy_new_year-pagination-hover: fadeout(lighten(@color-happy_new_year-theme, 10%), 60%); @color-happy_new_year-pagination-active: fadeout(darken(@color-happy_new_year-theme, 10%), 70%); -@color-happy_new_year-pagination-select: fadeout(lighten(@color-happy_new_year-theme, 10%), 55%); -@color-happy_new_year-search-form-background: fadeout(lighten(@color-happy_new_year-theme, 15%), 20%); -@color-happy_new_year-search-list-hover: fadeout(darken(@color-happy_new_year-theme, 10%), 50%); -@color-happy_new_year-scrollbar-track: fadeout(lighten(@color-happy_new_year-theme, 6%), 75%); -@color-happy_new_year-scrollbar-thumb: fadeout(lighten(@color-happy_new_year-theme, 6%), 50%); -@color-happy_new_year-scrollbar-thumb-hover: fadeout(lighten(@color-happy_new_year-theme, 6%), 35%); +@color-happy_new_year-pagination-select: fadeout(lighten(@color-happy_new_year-theme, 10%), 50%); +@color-happy_new_year-search-form-background: fadeout(lighten(@color-happy_new_year-theme, 30%), 20%); +@color-happy_new_year-search-list-hover: fadeout(darken(@color-happy_new_year-theme, 10%), 65%); +@color-happy_new_year-scrollbar-track: fadeout(lighten(@color-happy_new_year-theme, 10%), 70%); +@color-happy_new_year-scrollbar-thumb: fadeout(lighten(@color-happy_new_year-theme, 10%), 50%); +@color-happy_new_year-scrollbar-thumb-hover: fadeout(lighten(@color-happy_new_year-theme, 10%), 35%); @color-happy_new_year-player-pic-c1: fadeout(@color-happy_new_year-theme_2, 50%); @color-happy_new_year-player-pic-c2: darken(@color-happy_new_year-theme_2, 30%); @color-happy_new_year-player-progress: darken(@color-happy_new_year-theme_2, 10%); -@color-happy_new_year-player-progress-bar1: darken(@color-happy_new_year-theme_2, 12%); -@color-happy_new_year-player-progress-bar2: lighten(@color-happy_new_year-theme, 9%); +@color-happy_new_year-player-progress-bar1: darken(@color-happy_new_year-theme_2, 5%); +@color-happy_new_year-player-progress-bar2: lighten(@color-happy_new_year-theme, 5%); @color-happy_new_year-player-status-text: lighten(@color-happy_new_year-theme_2-font, 32%); -@color-happy_new_year-player-detail-lyric: fadeout(@color-happy_new_year-theme_2-font, 40%); -@color-happy_new_year-player-detail-lyric-active: darken(@color-happy_new_year-theme, 2%); +@color-happy_new_year-player-detail-lyric: fadeout(@color-happy_new_year-theme_2-font, 36%); +@color-happy_new_year-player-detail-lyric-active: darken(@color-happy_new_year-theme, 7%); @color-happy_new_year-player-detail-play-btn: lighten(@color-happy_new_year-theme, 7%); @color-happy_new_year-tab-btn-background: fadeout(lighten(@color-happy_new_year-theme, 10%), 80%); @color-happy_new_year-tab-btn-background-hover: @color-happy_new_year-theme_2-hover; @color-happy_new_year-tab-border-top: fadeout(lighten(@color-happy_new_year-theme, 5%), 50%); @color-happy_new_year-tab-border-bottom: lighten(@color-happy_new_year-theme, 5%); -@color-happy_new_year-hideBtn: #64a130; -@color-happy_new_year-minBtn: #c4943b; +@color-happy_new_year-hideBtn: #3bc2b2; +@color-happy_new_year-minBtn: #85c43b; @color-happy_new_year-maxBtn: #e7aa36; @color-happy_new_year-closeBtn: #ea6e4d; @color-happy_new_year-hideBtn-hover: fadeout(@color-hideBtn, 10%); @color-happy_new_year-minBtn-hover: fadeout(@color-happy_new_year-minBtn, 10%); @color-happy_new_year-maxBtn-hover: fadeout(@color-happy_new_year-maxBtn, 10%); @color-happy_new_year-closeBtn-hover: fadeout(@color-happy_new_year-closeBtn, 10%); -@color-happy_new_year-badge-success: @color-happy_new_year-theme; +@color-happy_new_year-badge-success: lighten(@color-happy_new_year-theme, 10%); @color-happy_new_year-badge-success-font: #fff; -@color-happy_new_year-badge-info: #c4943b; +@color-happy_new_year-badge-info: #dfbb6b; @color-happy_new_year-badge-info-font: #fff; diff --git a/src/renderer/components/common/AudioVisualizer.vue b/src/renderer/components/common/AudioVisualizer.vue index 5cd8352b..afacdfb7 100644 --- a/src/renderer/components/common/AudioVisualizer.vue +++ b/src/renderer/components/common/AudioVisualizer.vue @@ -24,7 +24,7 @@ const themes = { black: 'rgba(39,39,39,.26)', mid_autumn: 'rgba(74,55,82,.05)', naruto: 'rgba(87,144,167,.1)', - happy_new_year: 'rgba(252,57,57,.1)', + happy_new_year: 'rgba(192,57,43,.1)', } export default { setup() {