From d57cfa90fc7b3ff6c41ab8631e774d3fb3ad2420 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sun, 26 Apr 2020 13:01:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B0=E7=9A=AE=E8=82=A4?= =?UTF-8?q?=E2=80=9C=E7=B2=89=E5=A6=86=E7=8E=89=E7=90=A2=E2=80=9D=E3=80=81?= =?UTF-8?q?=E2=80=9C=E9=9D=92=E5=87=BA=E4=BA=8E=E9=BB=91=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/renderer/assets/styles/variables.less | 103 +++++++++++++++++++++- src/renderer/lang/cns/store/state.json | 2 + src/renderer/lang/cnt/store/state.json | 2 + src/renderer/lang/en/store/state.json | 2 + src/renderer/store/getters.js | 3 +- src/renderer/store/state.js | 10 +++ 7 files changed, 121 insertions(+), 2 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 5527ef9d..2e3016f4 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -6,6 +6,7 @@ - 新增打开酷狗源用户歌单 - 新增使用协议 - 新增虾米音源 +- 新增新皮肤“粉妆玉琢”、“青出于黑”，可去体验下~ ### 优化 diff --git a/src/renderer/assets/styles/variables.less b/src/renderer/assets/styles/variables.less index b33da89b..c32b34cd 100644 --- a/src/renderer/assets/styles/variables.less +++ b/src/renderer/assets/styles/variables.less @@ -1,6 +1,6 @@ @import './colors.less'; -@themes: green, yellow, blue, red, purple, orange, grey, mid_autumn, naruto, happy_new_year; +@themes: green, yellow, blue, red, pink, purple, orange, grey, ming, mid_autumn, naruto, happy_new_year; // Colors @@ -315,6 +315,55 @@ @color-red-badge-info: #dfbb6b; @color-red-badge-info-font: #fff; +@color-pink-theme: #f1828d; +@color-pink-theme-bgimg: none; +@color-pink-theme-bgposition: center; +@color-pink-theme-bgsize: auto auto; +@color-pink-theme-hover: fadeout(lighten(@color-pink-theme, 10%), 30%); +@color-pink-theme-active: fadeout(darken(@color-pink-theme, 20%), 60%); +@color-pink-theme-font: #fff; +@color-pink-theme-font-label: lighten(@color-pink-theme, 35%); +@color-pink-theme_2: #fff; +@color-pink-theme_2-background_1: #fff; +@color-pink-theme_2-background_2: fadeout(@color-pink-theme_2-background_1, 2%); +@color-pink-theme_2-hover: fadeout(lighten(@color-pink-theme, 10%), 60%); +@color-pink-theme_2-active: fadeout(darken(@color-pink-theme, 5%), 60%); +@color-pink-theme_2-font: darken(@color-pink-theme_2, 70%); +@color-pink-theme_2-font-label: fadeout(@color-pink-theme_2-font, 40%); +@color-pink-theme_2-line: lighten(@color-pink-theme, 25%); +@color-pink-theme-sidebar: @color-pink-theme; +@color-pink-btn: fadeout(darken(@color-pink-theme, 5%), 5%); +@color-pink-btn-background: fadeout(lighten(@color-pink-theme, 20%), 50%); +@color-pink-pagination-background: fadeout(lighten(@color-pink-theme, 23%), 25%); +@color-pink-pagination-hover: fadeout(lighten(@color-pink-theme, 5%), 70%); +@color-pink-pagination-active: fadeout(darken(@color-pink-theme, 5%), 70%); +@color-pink-pagination-select: fadeout(lighten(@color-pink-theme, 5%), 50%); +@color-pink-search-form-background: fadeout(lighten(@color-pink-theme, 20%), 10%); +@color-pink-search-list-hover: fadeout(darken(@color-pink-theme, 10%), 60%); +@color-pink-scrollbar-track: fadeout(@color-pink-theme, 60%); +@color-pink-scrollbar-thumb: fadeout(@color-pink-theme, 45%); +@color-pink-scrollbar-thumb-hover: fadeout(@color-pink-theme, 30%); +@color-pink-player-pic-c1: fadeout(@color-pink-theme_2, 50%); +@color-pink-player-pic-c2: darken(@color-pink-theme_2, 30%); +@color-pink-player-progress: darken(@color-pink-theme_2, 6%); +@color-pink-player-progress-bar1: darken(@color-pink-theme_2, 12%); +@color-pink-player-progress-bar2: lighten(@color-pink-theme, 2%); +@color-pink-player-status-text: lighten(@color-pink-theme_2-font, 10%); +@color-pink-tab-btn-background: fadeout(lighten(@color-pink-theme, 10%), 70%); +@color-pink-tab-btn-background-hover: @color-pink-theme_2-hover; +@color-pink-tab-border-top: fadeout(lighten(@color-pink-theme, 5%), 40%); +@color-pink-tab-border-bottom: @color-pink-theme; +@color-pink-minBtn: #85c43b; +@color-pink-maxBtn: #e7aa36; +@color-pink-closeBtn: #ea6e4d; +@color-pink-minBtn-hover: fadeout(@color-pink-minBtn, 10%); +@color-pink-maxBtn-hover: fadeout(@color-pink-maxBtn, 10%); +@color-pink-closeBtn-hover: fadeout(@color-pink-closeBtn, 10%); +@color-pink-badge-success: lighten(@color-pink-theme, 10%); +@color-pink-badge-success-font: #fff; +@color-pink-badge-info: #f5b684; +@color-pink-badge-info-font: #fff; + @color-purple-theme: #9b59b6; @color-purple-theme-bgimg: none; @color-purple-theme-bgposition: center; @@ -413,6 +462,58 @@ @color-grey-badge-info: #b19b9f; @color-grey-badge-info-font: #fff; + +@color-ming-theme: #336e7b; +@color-ming-theme-bgimg: none; +@color-ming-theme-bgposition: center; +@color-ming-theme-bgsize: auto auto; +@color-ming-theme-hover: fadeout(lighten(@color-ming-theme, 7%), 30%); +@color-ming-theme-active: fadeout(darken(@color-ming-theme, 20%), 60%); +@color-ming-theme-font: #fff; +@color-ming-theme-font-label: lighten(@color-ming-theme, 35%); +@color-ming-theme_2: #fff; +@color-ming-theme_2-hover: fadeout(lighten(@color-ming-theme, 10%), 75%); +@color-ming-theme_2-active: fadeout(darken(@color-ming-theme, 5%), 70%); +@color-ming-theme_2-background_1: #fff; +@color-ming-theme_2-background_2: fadeout(@color-ming-theme_2-background_1, 2%); +@color-ming-theme_2-font: darken(@color-ming-theme_2, 70%); +@color-ming-theme_2-font-label: fadeout(@color-ming-theme_2-font, 40%); +@color-ming-theme_2-line: lighten(@color-ming-theme, 58%); +@color-ming-theme-sidebar: @color-ming-theme; +@color-ming-btn: fadeout(darken(@color-ming-theme, 5%), 20%); +@color-ming-btn-background: fadeout(lighten(@color-ming-theme, 35%), 75%); +@color-ming-pagination-background: fadeout(lighten(@color-ming-theme, 50%), 35%); +@color-ming-pagination-hover: fadeout(lighten(@color-ming-theme, 15%), 70%); +@color-ming-pagination-active: fadeout(darken(@color-ming-theme, 15%), 70%); +@color-ming-pagination-select: fadeout(lighten(@color-ming-theme, 15%), 50%); +@color-ming-search-form-background: fadeout(lighten(@color-ming-theme, 45%), 15%); +@color-ming-search-list-hover: fadeout(darken(@color-ming-theme, 10%), 70%); +@color-ming-scrollbar-track: fadeout(@color-ming-theme, 80%); +@color-ming-scrollbar-thumb: fadeout(@color-ming-theme, 60%); +@color-ming-scrollbar-thumb-hover: fadeout(@color-ming-theme, 40%); +@color-ming-player-pic-c1: fadeout(@color-ming-theme_2, 50%); +@color-ming-player-pic-c2: darken(@color-ming-theme_2, 30%); +@color-ming-player-progress: darken(@color-ming-theme_2, 6%); +@color-ming-player-progress-bar1: darken(@color-ming-theme_2, 12%); +@color-ming-player-progress-bar2: lighten(@color-ming-theme, 12%); +@color-ming-player-status-text: lighten(@color-ming-theme_2-font, 10%); +@color-ming-tab-border-top: fadeout(lighten(@color-ming-theme, 25%), 70%); +@color-ming-tab-border-bottom: lighten(@color-ming-theme, 35%); +@color-ming-tab-btn-background: fadeout(lighten(@color-ming-theme, 10%), 80%); +@color-ming-tab-btn-background-hover: @color-ming-theme_2-hover; +@color-ming-tab-border-top: fadeout(lighten(@color-ming-theme, 5%), 50%); +@color-ming-tab-border-bottom: lighten(@color-ming-theme, 5%); +@color-ming-minBtn: #85c43b; +@color-ming-maxBtn: #e7aa36; +@color-ming-closeBtn: #ea6e4d; +@color-ming-minBtn-hover: fadeout(@color-ming-minBtn, 10%); +@color-ming-maxBtn-hover: fadeout(@color-ming-maxBtn, 10%); +@color-ming-closeBtn-hover: fadeout(@color-ming-closeBtn, 10%); +@color-ming-badge-success: lighten(@color-ming-theme, 10%); +@color-ming-badge-success-font: #fff; +@color-ming-badge-info: #304574; +@color-ming-badge-info-font: #fff; + @color-mid_autumn-theme: rgba(74, 55, 82, 1); @color-mid_autumn-theme-bgimg: url(../images/jqbg.jpg); @color-mid_autumn-theme-bgposition: center; diff --git a/src/renderer/lang/cns/store/state.json b/src/renderer/lang/cns/store/state.json index 310b0074..8614aa40 100644 --- a/src/renderer/lang/cns/store/state.json +++ b/src/renderer/lang/cns/store/state.json @@ -4,8 +4,10 @@ "theme_yellow": "信口雌黄", "theme_orange": "橙黄橘绿", "theme_red": "热情似火", + "theme_pink": "粉装玉琢", "theme_purple": "重斤球紫", "theme_grey": "灰常美丽", + "theme_ming": "青出于黑", "theme_mid_autumn": "月里嫦娥", "theme_naruto": "木叶之村", "theme_happy_new_year": "新年快乐", diff --git a/src/renderer/lang/cnt/store/state.json b/src/renderer/lang/cnt/store/state.json index 49fbab2d..38c5689c 100644 --- a/src/renderer/lang/cnt/store/state.json +++ b/src/renderer/lang/cnt/store/state.json @@ -4,8 +4,10 @@ "theme_yellow": "信口雌黃", "theme_orange": "橙黃橘綠", "theme_red": "熱情似火", + "theme_pink": "粉裝玉琢", "theme_purple": "重斤球紫", "theme_grey": "灰常美麗", + "theme_ming": "青出於黑", "theme_mid_autumn": "月裡嫦娥", "theme_naruto": "木葉之村", "theme_happy_new_year": "新年快樂", diff --git a/src/renderer/lang/en/store/state.json b/src/renderer/lang/en/store/state.json index 9dc31705..074b919c 100644 --- a/src/renderer/lang/en/store/state.json +++ b/src/renderer/lang/en/store/state.json @@ -4,8 +4,10 @@ "theme_yellow": "Yellow", "theme_orange": "Orange", "theme_red": "Red", + "theme_pink": "Pink", "theme_purple": "Purple", "theme_grey": "Grey", + "theme_ming": "Ming", "theme_mid_autumn": "Mid-Autumn", "theme_naruto": "Naruto", "theme_happy_new_year": "New Year", diff --git a/src/renderer/store/getters.js b/src/renderer/store/getters.js index f8db3cf1..17036604 100644 --- a/src/renderer/store/getters.js +++ b/src/renderer/store/getters.js @@ -2,7 +2,8 @@ import music from '../utils/music' export default { theme(state) { - return (state.themes[state.setting.themeId] && state.themes[state.setting.themeId].class) || '' + let theme = state.themes.find(theme => theme.id == state.setting.themeId) + return (theme && theme.class) || '' }, themes(state) { return { diff --git a/src/renderer/store/state.js b/src/renderer/store/state.js index 22c1c514..8c1cffae 100644 --- a/src/renderer/store/state.js +++ b/src/renderer/store/state.js @@ -59,6 +59,11 @@ export default { name: '热情似火', class: 'red', }, + { + id: 10, + name: '粉装玉琢', + class: 'pink', + }, { id: 5, name: '重斤球紫', @@ -69,6 +74,11 @@ export default { name: '灰常美丽', class: 'grey', }, + { + id: 11, + name: '青出于黑', + class: 'ming', + }, { id: 7, name: '月里嫦娥',