From 7204b514394ef2c2d9019b54e98cf6292f71bf97 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Fri, 13 Sep 2019 14:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E3=80=8A=E6=9C=88?= =?UTF-8?q?=E9=87=8C=E5=AB=A6=E5=A8=A5=E3=80=8B=E7=9A=AE=E8=82=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/renderer/App.vue | 13 +++ src/renderer/assets/images/jqbg.jpg | Bin 0 -> 33577 bytes src/renderer/assets/styles/index.less | 14 ++- src/renderer/assets/styles/variables.less | 96 ++++++++++++++++-- src/renderer/components/core/Aside.vue | 4 +- src/renderer/components/core/Player.vue | 8 +- src/renderer/components/core/Toolbar.vue | 8 -- src/renderer/components/core/View.vue | 9 -- src/renderer/components/material/Checkbox.vue | 4 +- src/renderer/components/material/Select.vue | 4 +- src/renderer/components/material/SongList.vue | 10 +- src/renderer/components/material/Tab.vue | 16 +-- src/renderer/store/state.js | 5 + src/renderer/views/List.vue | 8 +- src/renderer/views/Search.vue | 12 ++- src/renderer/views/Setting.vue | 7 ++ src/renderer/views/SongList.vue | 28 ++--- 18 files changed, 180 insertions(+), 67 deletions(-) create mode 100644 src/renderer/assets/images/jqbg.jpg diff --git a/publish/changeLog.md b/publish/changeLog.md index 02b038cf..4b318509 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,5 +1,6 @@ ### 新增 +- 中秋佳节，祝大家中秋快乐🥮~~新增个性皮肤**《月里嫦娥》**，时间仓促，皮肤还不是很完善，可以试试喜不喜欢~😉 - 新增 MAC 版本退出快捷键支持 - 新增点击播放器中的歌曲标题可以复制标题的功能（遇到好听的歌曲方便分享） diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 867c0eb7..f5b2f4c6 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -225,6 +225,8 @@ body { display: flex; height: 100%; overflow: hidden; + background: @color-theme-bgimg center center no-repeat; + background-size: auto 100%; } #left { @@ -235,6 +237,8 @@ body { flex: auto; display: flex; flex-flow: column nowrap; + transition: background-color @transition-theme; + background-color: @color-theme_2; } #toolbar, #player { flex: none; @@ -243,5 +247,14 @@ body { flex: auto; height: 0; } + +each(@themes, { + #container.@{value} { + background-image: ~'@{color-@{value}-theme-bgimg}'; + #right { + background-color: ~'@{color-@{value}-theme_2}'; + } + } +}) diff --git a/src/renderer/assets/images/jqbg.jpg b/src/renderer/assets/images/jqbg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ae2c0083976df808324476f7644a8fe958ac0c0e GIT binary patch literal 33577 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 literal 0 HcmV?d00001 diff --git a/src/renderer/assets/styles/index.less b/src/renderer/assets/styles/index.less index c41568de..1cb53068 100644 --- a/src/renderer/assets/styles/index.less +++ b/src/renderer/assets/styles/index.less @@ -36,11 +36,11 @@ table { } tbody { tr { - border-top: 1px solid #e0e0e0; + border-top: 1px solid @color-theme_2-line; // border-top: 1px solid rgba(0, 0, 0, 0.12); transition: background-color 0.2s ease; &:hover { - background-color: #eee; + background-color: @color-theme_2-hover; } &:first-child { border-top: none; @@ -172,5 +172,15 @@ each(@themes, { background-color: ~'@{color-@{value}-scrollbar-thumb-hover}'; } } + table { + tbody { + tr { + border-top-color: ~'@{color-@{value}-theme_2-line}'; + &:hover { + background-color: ~'@{color-@{value}-theme_2-hover}'; + } + } + } + } } }) diff --git a/src/renderer/assets/styles/variables.less b/src/renderer/assets/styles/variables.less index 2ca81a5d..4fa465a3 100644 --- a/src/renderer/assets/styles/variables.less +++ b/src/renderer/assets/styles/variables.less @@ -1,21 +1,25 @@ @import './colors.less'; -@themes: green, yellow, blue, red, purple, orange, grey; +@themes: green, yellow, blue, red, purple, orange, grey, midAutumn; // Colors // @color-theme: #03a678; @color-theme: #4daf7c; +@color-theme-bgimg: none; @color-theme-hover: fadeout(lighten(@color-theme, 10%), 30%); @color-theme-active: fadeout(darken(@color-theme, 20%), 60%); @color-theme-font: #fff; @color-theme-font-label: lighten(@color-theme, 35%); -@color-theme_2: #fff; +@color-theme_2: rgba(255, 255, 255, .9); +@color-theme_2-background_2: #fff; @color-theme_2-hover: fadeout(lighten(@color-theme, 10%), 70%); @color-theme_2-active: fadeout(darken(@color-theme, 5%), 70%); @color-theme_2-font: darken(@color-theme_2, 70%); -@color-theme_2-font-label: lighten(@color-theme, 40%); +@color-theme_2-font-label: fadeout(@color-theme_2-font, 50%); +@color-theme_2-line: lighten(@color-theme, 35%); +@color-theme-sidebar: @color-theme; @color-btn: fadeout(darken(@color-theme, 5%), 15%); @color-btn-background: fadeout(lighten(@color-theme, 35%), 70%); @@ -41,6 +45,7 @@ @color-player-status-text: lighten(@color-theme_2-font, 10%); @color-tab-btn-background: fadeout(lighten(@color-theme, 10%), 80%); +@color-tab-btn-background-hover: @color-theme_2-hover; @color-tab-border-top: fadeout(lighten(@color-theme, 5%), 50%); @color-tab-border-bottom: lighten(@color-theme, 5%); @@ -50,15 +55,19 @@ @color-green-theme: #4daf7c; +@color-green-theme-bgimg: none; @color-green-theme-hover: fadeout(lighten(@color-green-theme, 10%), 30%); @color-green-theme-active: fadeout(darken(@color-green-theme, 20%), 60%); @color-green-theme-font: #fff; @color-green-theme-font-label: lighten(@color-green-theme, 35%); @color-green-theme_2: #fff; +@color-green-theme_2-background_2: #fff; @color-green-theme_2-hover: fadeout(lighten(@color-green-theme, 10%), 70%); @color-green-theme_2-active: fadeout(darken(@color-green-theme, 5%), 70%); @color-green-theme_2-font: darken(@color-green-theme_2, 70%); -@color-green-theme_2-font-label: lighten(@color-green-theme, 40%); +@color-green-theme_2-font-label: fadeout(@color-green-theme_2-font, 50%); +@color-green-theme_2-line: lighten(@color-green-theme, 35%); +@color-green-theme-sidebar: @color-green-theme; @color-green-btn: fadeout(darken(@color-green-theme, 5%), 15%); @color-green-btn-background: fadeout(lighten(@color-green-theme, 35%), 70%); @color-green-pagination-background: fadeout(lighten(@color-green-theme, 45%), 30%); @@ -77,20 +86,25 @@ @color-green-player-progress-bar2: lighten(@color-green-theme, 12%); @color-green-player-status-text: lighten(@color-green-theme_2-font, 10%); @color-green-tab-btn-background: fadeout(lighten(@color-green-theme, 10%), 80%); +@color-green-tab-btn-background-hover: @color-green-theme_2-hover; @color-green-tab-border-top: fadeout(lighten(@color-green-theme, 5%), 50%); @color-green-tab-border-bottom: lighten(@color-green-theme, 5%); @color-yellow-theme: #f2d35b; +@color-yellow-theme-bgimg: none; @color-yellow-theme-hover: fadeout(lighten(@color-yellow-theme, 10%), 30%); @color-yellow-theme-active: fadeout(darken(@color-yellow-theme, 20%), 60%); @color-yellow-theme-font: #fff; @color-yellow-theme-font-label: lighten(@color-yellow-theme, 35%); @color-yellow-theme_2: #fff; +@color-yellow-theme_2-background_2: #fff; @color-yellow-theme_2-hover: fadeout(lighten(@color-yellow-theme, 10%), 70%); @color-yellow-theme_2-active: fadeout(darken(@color-yellow-theme, 5%), 70%); @color-yellow-theme_2-font: darken(@color-yellow-theme_2, 70%); -@color-yellow-theme_2-font-label: lighten(@color-yellow-theme, 40%); +@color-yellow-theme_2-font-label: fadeout(@color-yellow-theme_2-font, 50%); +@color-yellow-theme_2-line: lighten(@color-yellow-theme, 35%); +@color-yellow-theme-sidebar: @color-yellow-theme; @color-yellow-btn: fadeout(darken(@color-yellow-theme, 5%), 15%); @color-yellow-btn-background: fadeout(lighten(@color-yellow-theme, 25%), 70%); @color-yellow-pagination-background: fadeout(lighten(@color-yellow-theme, 30%), 30%); @@ -109,19 +123,24 @@ @color-yellow-player-progress-bar2: lighten(@color-yellow-theme, 12%); @color-yellow-player-status-text: lighten(@color-yellow-theme_2-font, 10%); @color-yellow-tab-btn-background: fadeout(lighten(@color-yellow-theme, 10%), 80%); +@color-yellow-tab-btn-background-hover: @color-yellow-theme_2-hover; @color-yellow-tab-border-top: fadeout(lighten(@color-yellow-theme, 5%), 50%); @color-yellow-tab-border-bottom: lighten(@color-yellow-theme, 5%); @color-orange-theme: #f5ab35; +@color-orange-theme-bgimg: none; @color-orange-theme-hover: fadeout(lighten(@color-orange-theme, 10%), 30%); @color-orange-theme-active: fadeout(darken(@color-orange-theme, 20%), 60%); @color-orange-theme-font: #fff; @color-orange-theme-font-label: lighten(@color-orange-theme, 35%); @color-orange-theme_2: #fff; +@color-orange-theme_2-background_2: #fff; @color-orange-theme_2-hover: fadeout(lighten(@color-orange-theme, 10%), 70%); @color-orange-theme_2-active: fadeout(darken(@color-orange-theme, 5%), 70%); @color-orange-theme_2-font: darken(@color-orange-theme_2, 70%); -@color-orange-theme_2-font-label: lighten(@color-orange-theme, 40%); +@color-orange-theme_2-font-label: fadeout(@color-orange-theme_2-font, 50%); +@color-orange-theme_2-line: lighten(@color-orange-theme, 35%); +@color-orange-theme-sidebar: @color-orange-theme; @color-orange-btn: fadeout(darken(@color-orange-theme, 5%), 15%); @color-orange-btn-background: fadeout(lighten(@color-orange-theme, 35%), 70%); @color-orange-pagination-background: fadeout(lighten(@color-orange-theme, 35%), 30%); @@ -140,19 +159,24 @@ @color-orange-player-progress-bar2: lighten(@color-orange-theme, 12%); @color-orange-player-status-text: lighten(@color-orange-theme_2-font, 10%); @color-orange-tab-btn-background: fadeout(lighten(@color-orange-theme, 10%), 80%); +@color-orange-tab-btn-background-hover: @color-orange-theme_2-hover; @color-orange-tab-border-top: fadeout(lighten(@color-orange-theme, 5%), 50%); @color-orange-tab-border-bottom: lighten(@color-orange-theme, 5%); @color-blue-theme: #3498db; +@color-blue-theme-bgimg: none; @color-blue-theme-hover: fadeout(lighten(@color-blue-theme, 10%), 30%); @color-blue-theme-active: fadeout(darken(@color-blue-theme, 20%), 60%); @color-blue-theme-font: #fff; @color-blue-theme-font-label: lighten(@color-blue-theme, 35%); @color-blue-theme_2: #fff; +@color-blue-theme_2-background_2: #fff; @color-blue-theme_2-hover: fadeout(lighten(@color-blue-theme, 10%), 70%); @color-blue-theme_2-active: fadeout(darken(@color-blue-theme, 5%), 70%); @color-blue-theme_2-font: darken(@color-blue-theme_2, 70%); -@color-blue-theme_2-font-label: lighten(@color-blue-theme, 40%); +@color-blue-theme_2-font-label: fadeout(@color-blue-theme_2-font, 50%); +@color-blue-theme_2-line: lighten(@color-blue-theme, 35%); +@color-blue-theme-sidebar: @color-blue-theme; @color-blue-btn: fadeout(darken(@color-blue-theme, 5%), 15%); @color-blue-btn-background: fadeout(lighten(@color-blue-theme, 35%), 70%); @color-blue-pagination-background: fadeout(lighten(@color-blue-theme, 40%), 30%); @@ -171,10 +195,12 @@ @color-blue-player-progress-bar2: lighten(@color-blue-theme, 12%); @color-blue-player-status-text: lighten(@color-blue-theme_2-font, 10%); @color-blue-tab-btn-background: fadeout(lighten(@color-blue-theme, 10%), 80%); +@color-blue-tab-btn-background-hover: @color-blue-theme_2-hover; @color-blue-tab-border-top: fadeout(lighten(@color-blue-theme, 5%), 50%); @color-blue-tab-border-bottom: lighten(@color-blue-theme, 5%); @color-red-theme: #d64541; +@color-red-theme-bgimg: none; @color-red-theme-hover: fadeout(lighten(@color-red-theme, 10%), 30%); @color-red-theme-active: fadeout(darken(@color-red-theme, 20%), 60%); @color-red-theme-font: #fff; @@ -182,8 +208,11 @@ @color-red-theme_2: #fff; @color-red-theme_2-hover: fadeout(lighten(@color-red-theme, 10%), 70%); @color-red-theme_2-active: fadeout(darken(@color-red-theme, 5%), 70%); +@color-red-theme_2-background_2: #fff; @color-red-theme_2-font: darken(@color-red-theme_2, 70%); -@color-red-theme_2-font-label: lighten(@color-red-theme, 40%); +@color-red-theme_2-font-label: fadeout(@color-red-theme_2-font, 50%); +@color-red-theme_2-line: lighten(@color-red-theme, 35%); +@color-red-theme-sidebar: @color-red-theme; @color-red-btn: fadeout(darken(@color-red-theme, 5%), 15%); @color-red-btn-background: fadeout(lighten(@color-red-theme, 35%), 70%); @color-red-pagination-background: fadeout(lighten(@color-red-theme, 40%), 30%); @@ -204,19 +233,24 @@ @color-red-tab-border-top: fadeout(lighten(@color-red-theme, 25%), 70%); @color-red-tab-border-bottom: lighten(@color-red-theme, 35%); @color-red-tab-btn-background: fadeout(lighten(@color-red-theme, 10%), 80%); +@color-red-tab-btn-background-hover: @color-red-theme_2-hover; @color-red-tab-border-top: fadeout(lighten(@color-red-theme, 5%), 50%); @color-red-tab-border-bottom: lighten(@color-red-theme, 5%); @color-purple-theme: #9b59b6; +@color-purple-theme-bgimg: none; @color-purple-theme-hover: fadeout(lighten(@color-purple-theme, 10%), 30%); @color-purple-theme-active: fadeout(darken(@color-purple-theme, 20%), 60%); @color-purple-theme-font: #fff; @color-purple-theme-font-label: lighten(@color-purple-theme, 35%); @color-purple-theme_2: #fff; +@color-purple-theme_2-background_2: #fff; @color-purple-theme_2-hover: fadeout(lighten(@color-purple-theme, 10%), 70%); @color-purple-theme_2-active: fadeout(darken(@color-purple-theme, 5%), 70%); @color-purple-theme_2-font: darken(@color-purple-theme_2, 70%); -@color-purple-theme_2-font-label: lighten(@color-purple-theme, 40%); +@color-purple-theme_2-font-label: fadeout(@color-purple-theme_2-font, 50%); +@color-purple-theme_2-line: lighten(@color-purple-theme, 35%); +@color-purple-theme-sidebar: @color-purple-theme; @color-purple-btn: fadeout(darken(@color-purple-theme, 5%), 15%); @color-purple-btn-background: fadeout(lighten(@color-purple-theme, 35%), 70%); @color-purple-pagination-background: fadeout(lighten(@color-purple-theme, 40%), 30%); @@ -235,19 +269,24 @@ @color-purple-player-progress-bar2: lighten(@color-purple-theme, 12%); @color-purple-player-status-text: lighten(@color-purple-theme_2-font, 10%); @color-purple-tab-btn-background: fadeout(lighten(@color-purple-theme, 10%), 80%); +@color-purple-tab-btn-background-hover: @color-purple-theme_2-hover; @color-purple-tab-border-top: fadeout(lighten(@color-purple-theme, 5%), 50%); @color-purple-tab-border-bottom: lighten(@color-purple-theme, 5%); @color-grey-theme: #6c7a89; +@color-grey-theme-bgimg: none; @color-grey-theme-hover: fadeout(lighten(@color-grey-theme, 10%), 30%); @color-grey-theme-active: fadeout(darken(@color-grey-theme, 20%), 60%); @color-grey-theme-font: #fff; @color-grey-theme-font-label: lighten(@color-grey-theme, 35%); @color-grey-theme_2: #fff; +@color-grey-theme_2-background_2: #fff; @color-grey-theme_2-hover: fadeout(lighten(@color-grey-theme, 10%), 70%); @color-grey-theme_2-active: fadeout(darken(@color-grey-theme, 5%), 70%); @color-grey-theme_2-font: darken(@color-grey-theme_2, 70%); -@color-grey-theme_2-font-label: lighten(@color-grey-theme, 40%); +@color-grey-theme_2-font-label: fadeout(@color-grey-theme_2-font, 50%); +@color-grey-theme_2-line: lighten(@color-grey-theme, 35%); +@color-grey-theme-sidebar: @color-grey-theme; @color-grey-btn: fadeout(darken(@color-grey-theme, 5%), 15%); @color-grey-btn-background: fadeout(lighten(@color-grey-theme, 35%), 70%); @color-grey-pagination-background: fadeout(lighten(@color-grey-theme, 45%), 30%); @@ -266,9 +305,46 @@ @color-grey-player-progress-bar2: lighten(@color-grey-theme, 12%); @color-grey-player-status-text: lighten(@color-grey-theme_2-font, 10%); @color-grey-tab-btn-background: fadeout(lighten(@color-grey-theme, 10%), 80%); +@color-grey-tab-btn-background-hover: @color-grey-theme_2-hover; @color-grey-tab-border-top: fadeout(lighten(@color-grey-theme, 5%), 50%); @color-grey-tab-border-bottom: lighten(@color-grey-theme, 5%); +@color-midAutumn-theme: rgba(74, 55, 82, 0.9); +@color-midAutumn-theme-bgimg: url(../images/jqbg.jpg); +@color-midAutumn-theme-hover: fadeout(lighten(@color-midAutumn-theme, 10%), 30%); +@color-midAutumn-theme-active: fadeout(lighten(@color-midAutumn-theme, 15%), 60%); +@color-midAutumn-theme-font: rgba(246, 233, 255, 0.9); +@color-midAutumn-theme-font-label: fadeout(lighten(@color-midAutumn-theme, 20%), 20%); +@color-midAutumn-theme_2: rgba(255, 255, 255, .93); +@color-midAutumn-theme_2-background_2: #eeedef; +@color-midAutumn-theme_2-hover: fadeout(lighten(@color-midAutumn-theme, 10%), 65%); +@color-midAutumn-theme_2-active: fadeout(darken(@color-midAutumn-theme, 5%), 70%); +@color-midAutumn-theme_2-font: darken(@color-midAutumn-theme_2, 70%); +@color-midAutumn-theme_2-font-label: lighten(@color-midAutumn-theme, 40%); +@color-midAutumn-theme_2-line: lighten(@color-midAutumn-theme, 54%); +@color-midAutumn-theme-sidebar: rgba(255, 255, 255, 0); +@color-midAutumn-btn: fadeout(darken(@color-midAutumn-theme, 5%), 15%); +@color-midAutumn-btn-background: fadeout(lighten(@color-midAutumn-theme, 35%), 70%); +@color-midAutumn-pagination-background: fadeout(lighten(@color-midAutumn-theme, 45%), 50%); +@color-midAutumn-pagination-hover: fadeout(lighten(@color-midAutumn-theme, 10%), 70%); +@color-midAutumn-pagination-active: fadeout(darken(@color-midAutumn-theme, 10%), 70%); +@color-midAutumn-pagination-select: fadeout(lighten(@color-midAutumn-theme, 10%), 55%); +@color-midAutumn-search-form-background: fadeout(lighten(@color-midAutumn-theme, 50%), 10%); +@color-midAutumn-search-list-hover: fadeout(darken(@color-midAutumn-theme, 10%), 70%); +@color-midAutumn-scrollbar-track: fadeout(@color-midAutumn-theme, 80%); +@color-midAutumn-scrollbar-thumb: fadeout(@color-midAutumn-theme, 60%); +@color-midAutumn-scrollbar-thumb-hover: fadeout(@color-midAutumn-theme, 40%); +@color-midAutumn-player-pic-c1: fadeout(@color-midAutumn-theme_2, 50%); +@color-midAutumn-player-pic-c2: darken(@color-midAutumn-theme_2, 30%); +@color-midAutumn-player-progress: darken(@color-midAutumn-theme_2, 6%); +@color-midAutumn-player-progress-bar1: darken(@color-midAutumn-theme_2, 12%); +@color-midAutumn-player-progress-bar2: lighten(@color-midAutumn-theme, 12%); +@color-midAutumn-player-status-text: lighten(@color-midAutumn-theme_2-font, 10%); +@color-midAutumn-tab-btn-background: fadeout(lighten(@color-midAutumn-theme, 10%), 80%); +@color-midAutumn-tab-btn-background-hover: @color-midAutumn-theme_2-hover; +@color-midAutumn-tab-border-top: fadeout(lighten(@color-midAutumn-theme, 5%), 50%); +@color-midAutumn-tab-border-bottom: lighten(@color-midAutumn-theme, 5%); + // Width @width-app-left: 180px; diff --git a/src/renderer/components/core/Aside.vue b/src/renderer/components/core/Aside.vue index b07cbe27..b66722e5 100644 --- a/src/renderer/components/core/Aside.vue +++ b/src/renderer/components/core/Aside.vue @@ -57,7 +57,7 @@ export default { // box-shadow: 0 0 5px rgba(0, 0, 0, .3); transition: @transition-theme; transition-property: background-color; - background-color: @color-theme; + background-color: @color-theme-sidebar; // background-color: @color-aside-background; // border-right: 2px solid @color-theme; -webkit-app-region: drag; @@ -122,7 +122,7 @@ export default { each(@themes, { :global(#container.@{value}) { .aside { - background-color: ~'@{color-@{value}-theme}'; + background-color: ~'@{color-@{value}-theme-sidebar}'; } .logo { color: ~'@{color-@{value}-theme-font}'; diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index 10557bd1..9df562ce 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -471,8 +471,7 @@ export default { height: @height-player; // background-color: rgb(245, 245, 245); transition: @transition-theme; - transition-property: background-color, border-color; - background-color: @color-theme_2; + transition-property: border-color; border-top: 2px solid @color-theme; box-sizing: border-box; display: flex; @@ -496,7 +495,7 @@ export default { max-height: 100%; transition: @transition-theme; transition-property: border-color; - border: 2px solid @color-theme_2; + border: 2px solid @color-theme_2-background_2; } } .right { @@ -669,13 +668,12 @@ export default { each(@themes, { :global(#container.@{value}) { .player { - background-color: ~'@{color-@{value}-theme_2}'; border-top-color: ~'@{color-@{value}-theme}'; } .left { color: ~'@{color-@{value}-theme}'; img { - border-color: ~'@{color-@{value}-theme_2}'; + border-color: ~'@{color-@{value}-theme_2-background_2}'; } } .play-btn { diff --git a/src/renderer/components/core/Toolbar.vue b/src/renderer/components/core/Toolbar.vue index 77c7dd57..8b201914 100644 --- a/src/renderer/components/core/Toolbar.vue +++ b/src/renderer/components/core/Toolbar.vue @@ -48,7 +48,6 @@ export default { display: flex; height: @height-toolbar; justify-content: flex-end; - background-color: @color-theme_2; align-items: center; padding-left: 15px; -webkit-app-region: drag; @@ -58,13 +57,6 @@ export default { .input { -webkit-app-region: no-drag; } -each(@themes, { - :global(#container.@{value}) { - .toolbar { - background-color: ~'@{color-@{value}-theme_2}'; - } - } -}) // img { // flex: none; diff --git a/src/renderer/components/core/View.vue b/src/renderer/components/core/View.vue index aa5d716e..1572e82c 100644 --- a/src/renderer/components/core/View.vue +++ b/src/renderer/components/core/View.vue @@ -13,7 +13,6 @@ div(:class="$style.view") .view { position: relative; - background-color: @color-theme_2; > * { position: absolute; width: 100%; @@ -22,12 +21,4 @@ div(:class="$style.view") // overflow: hidden; } -each(@themes, { - :global(#container.@{value}) { - .view { - background-color: ~'@{color-@{value}-theme_2}'; - } - } -}) - diff --git a/src/renderer/components/material/Checkbox.vue b/src/renderer/components/material/Checkbox.vue index 67f5193d..44a0932b 100644 --- a/src/renderer/components/material/Checkbox.vue +++ b/src/renderer/components/material/Checkbox.vue @@ -156,7 +156,7 @@ export default { bottom: 0; left: 0; right: 0; - border: 1px solid #ccc; + border: 1px solid @color-theme_2-font-label; transition: border-color 0.2s ease; border-radius: 15%; } @@ -196,7 +196,7 @@ each(@themes, { color: ~'@{color-@{value}-theme}'; // border: 1px solid #ccc; &:after { - border-color: #ccc; + border-color: ~'@{color-@{value}-theme_2-font-label}'; } } } diff --git a/src/renderer/components/material/Select.vue b/src/renderer/components/material/Select.vue index 878c9d63..322536f0 100644 --- a/src/renderer/components/material/Select.vue +++ b/src/renderer/components/material/Select.vue @@ -90,7 +90,7 @@ export default { border-left: 2px solid @color-tab-border-bottom; box-sizing: border-box; text-align: center; - border-top-left-radius: 3px; + border-top-left-radius: 4px; color: @color-btn; cursor: pointer; @@ -108,7 +108,7 @@ export default { left: 0; border-bottom: 2px solid @color-tab-border-bottom; border-left: 2px solid @color-tab-border-bottom; - border-bottom-left-radius: 3px; + border-bottom-left-radius: 4px; background-color: @color-theme_2; overflow: hidden; opacity: 0; diff --git a/src/renderer/components/material/SongList.vue b/src/renderer/components/material/SongList.vue index 084dfec2..83117389 100644 --- a/src/renderer/components/material/SongList.vue +++ b/src/renderer/components/material/SongList.vue @@ -175,7 +175,6 @@ export default { height: 100%; display: flex; flex-flow: column nowrap; - background-color: @color-theme_2; } .list { @@ -220,16 +219,17 @@ export default { p { font-size: 24px; - color: #ccc; + color: @color-theme_2-font-label; } } each(@themes, { :global(#container.@{value}) { - .thead { - background-color: ~'@color-@{value}-theme_2'; + .noitem { + p { + color: ~'@{color-@{value}-theme_2-font-label}'; + } } } }) - diff --git a/src/renderer/components/material/Tab.vue b/src/renderer/components/material/Tab.vue index 90e2f656..babb6471 100644 --- a/src/renderer/components/material/Tab.vue +++ b/src/renderer/components/material/Tab.vue @@ -95,15 +95,15 @@ export default { margin-left: 0; button { border-top-left-radius: 3px; - // border-bottom-left-radius: 3px; + // border-bottom-left-radius: 4px; } } &:last-child { border-right: 2px solid @color-tab-border-top; - border-top-right-radius: 3px; + border-top-right-radius: 4px; button { border-top-right-radius: 3px; - // border-bottom-right-radius: 3px; + // border-bottom-right-radius: 4px; } } button { @@ -122,7 +122,7 @@ export default { // border-left-color: @color-theme_2-hover; // border-right-color: @color-theme_2-hover; button { - background-color: @color-theme_2-hover; + background-color: @color-tab-btn-background-hover; } } &:active { @@ -133,7 +133,7 @@ export default { } } &.active { - border-bottom-color: @color-theme_2; + border-bottom-color: @color-theme_2-background_2; border-top-color: @color-tab-border-bottom; border-left-color: @color-tab-border-bottom; border-right-color: @color-tab-border-bottom; @@ -144,7 +144,7 @@ export default { width: 0; } button { - background-color: @color-theme_2; + background-color: @color-theme_2-background_2; } } } @@ -193,7 +193,7 @@ each(@themes, { // border-left-color: ~'@{color-@{value}-theme_2-hover}'; // border-right-color: ~'@{color-@{value}-theme_2-hover}'; button { - background-color: ~'@{color-@{value}-theme_2-hover}'; + background-color: ~'@{color-@{value}-tab-btn-background-hover}'; } } &:active { @@ -209,7 +209,7 @@ each(@themes, { border-left-color: ~'@{color-@{value}-tab-border-bottom}'; border-right-color: ~'@{color-@{value}-tab-border-bottom}'; button { - background-color: ~'@{color-@{value}-theme_2}'; + background-color: ~'@{color-@{value}-theme_2-background_2}'; } } } diff --git a/src/renderer/store/state.js b/src/renderer/store/state.js index 62d13a3c..892c3d8b 100644 --- a/src/renderer/store/state.js +++ b/src/renderer/store/state.js @@ -44,6 +44,11 @@ export default { name: '灰常美丽', class: 'grey', }, + { + id: 7, + name: '月里嫦娥', + class: 'midAutumn', + }, ], version: { version, diff --git a/src/renderer/views/List.vue b/src/renderer/views/List.vue index f384268c..db7dbada 100644 --- a/src/renderer/views/List.vue +++ b/src/renderer/views/List.vue @@ -257,7 +257,7 @@ export default { p { font-size: 24px; - color: #ccc; + color: @color-theme_2-font-label; } } @@ -270,6 +270,12 @@ each(@themes, { } } } + .no-item { + p { + color: ~'@{color-@{value}-theme_2-font-label}'; + } + } } }) + diff --git a/src/renderer/views/Search.vue b/src/renderer/views/Search.vue index 989b0b0d..651be8a7 100644 --- a/src/renderer/views/Search.vue +++ b/src/renderer/views/Search.vue @@ -254,7 +254,17 @@ export default { p { font-size: 24px; - color: #ccc; + color: @color-theme_2-font-label; } } + +each(@themes, { + :global(#container.@{value}) { + .noitem { + p { + color: ~'@{color-@{value}-theme_2-font-label}'; + } + } + } +}) diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue index 9d5db917..04838050 100644 --- a/src/renderer/views/Setting.vue +++ b/src/renderer/views/Setting.vue @@ -479,7 +479,9 @@ export default { .theme { display: flex; + flex-flow: row wrap; // padding: 0 15px; + margin-bottom: -20px; li { display: flex; @@ -489,6 +491,7 @@ export default { // color: @color-theme; margin-right: 30px; transition: color .3s ease; + margin-bottom: 20px; &:last-child { margin-right: 0; @@ -509,6 +512,9 @@ export default { width: 100%; height: 100%; border-radius: 4px; + background-position: center; + background-size: auto 100%; + background-repeat: no-repeat; } } @@ -517,6 +523,7 @@ export default { span { &:after { background-color: ~'@{color-@{value}-theme}'; + background-image: ~'@{color-@{value}-theme-bgimg}'; } } } diff --git a/src/renderer/views/SongList.vue b/src/renderer/views/SongList.vue index 8256d8c0..c2de7eeb 100644 --- a/src/renderer/views/SongList.vue +++ b/src/renderer/views/SongList.vue @@ -1,12 +1,8 @@