diff --git a/src/renderer/assets/styles/variables.less b/src/renderer/assets/styles/variables.less index 0b271fb8..e13dc2c3 100644 --- a/src/renderer/assets/styles/variables.less +++ b/src/renderer/assets/styles/variables.less @@ -49,7 +49,7 @@ @color-player-pic-c2: darken(@color-theme_2, 30%); @color-player-progress: darken(@color-theme_2, 6%); @color-player-progress-bar1: darken(@color-theme_2, 12%); -@color-player-progress-bar2: lighten(@color-theme, 12%); +@color-player-progress-bar2: fadeout(lighten(@color-theme, 12%), 20%); @color-player-status-text: lighten(@color-theme_2-font, 32%); @color-player-detail-lyric: fadeout(@color-theme_2-font, 40%); @color-player-detail-lyric-active: darken(@color-theme, 2%); @@ -114,7 +114,7 @@ @color-green-player-pic-c2: darken(@color-green-theme_2, 30%); @color-green-player-progress: darken(@color-green-theme_2, 6%); @color-green-player-progress-bar1: darken(@color-green-theme_2, 12%); -@color-green-player-progress-bar2: lighten(@color-green-theme, 12%); +@color-green-player-progress-bar2: fadeout(lighten(@color-green-theme, 12%), 20%); @color-green-player-status-text: lighten(@color-green-theme_2-font, 32%); @color-green-player-detail-lyric: fadeout(@color-green-theme_2-font, 40%); @color-green-player-detail-lyric-active: darken(@color-green-theme, 2%); @@ -174,7 +174,7 @@ @color-yellow-player-pic-c2: darken(@color-yellow-theme_2, 30%); @color-yellow-player-progress: darken(@color-yellow-theme_2, 6%); @color-yellow-player-progress-bar1: darken(@color-yellow-theme_2, 12%); -@color-yellow-player-progress-bar2: lighten(@color-yellow-theme, 2%); +@color-yellow-player-progress-bar2: fadeout(lighten(@color-yellow-theme, 2%), 20%); @color-yellow-player-status-text: lighten(@color-yellow-theme_2-font, 32%); @color-yellow-player-detail-lyric: fadeout(@color-yellow-theme_2-font, 40%); @color-yellow-player-detail-lyric-active: darken(@color-yellow-theme, 7%); @@ -233,7 +233,7 @@ @color-orange-player-pic-c2: darken(@color-orange-theme_2, 30%); @color-orange-player-progress: darken(@color-orange-theme_2, 6%); @color-orange-player-progress-bar1: darken(@color-orange-theme_2, 12%); -@color-orange-player-progress-bar2: lighten(@color-orange-theme, 12%); +@color-orange-player-progress-bar2: fadeout(lighten(@color-orange-theme, 12%), 20%); @color-orange-player-status-text: lighten(@color-orange-theme_2-font, 32%); @color-orange-player-detail-lyric: fadeout(@color-orange-theme_2-font, 40%); @color-orange-player-detail-lyric-active: darken(@color-orange-theme, 7%); @@ -292,7 +292,7 @@ @color-blue-player-pic-c2: darken(@color-blue-theme_2, 30%); @color-blue-player-progress: darken(@color-blue-theme_2, 6%); @color-blue-player-progress-bar1: darken(@color-blue-theme_2, 12%); -@color-blue-player-progress-bar2: lighten(@color-blue-theme, 12%); +@color-blue-player-progress-bar2: fadeout(lighten(@color-blue-theme, 12%), 20%); @color-blue-player-status-text: lighten(@color-blue-theme_2-font, 32%); @color-blue-player-detail-lyric: fadeout(@color-blue-theme_2-font, 40%); @color-blue-player-detail-lyric-active: darken(@color-blue-theme, 2%); @@ -351,7 +351,7 @@ @color-red-player-pic-c2: darken(@color-red-theme_2, 30%); @color-red-player-progress: darken(@color-red-theme_2, 6%); @color-red-player-progress-bar1: darken(@color-red-theme_2, 12%); -@color-red-player-progress-bar2: lighten(@color-red-theme, 12%); +@color-red-player-progress-bar2: fadeout(lighten(@color-red-theme, 12%), 20%); @color-red-player-status-text: lighten(@color-red-theme_2-font, 32%); @color-red-player-detail-lyric: fadeout(@color-red-theme_2-font, 40%); @color-red-player-detail-lyric-active: lighten(@color-red-theme, 2%); @@ -412,7 +412,7 @@ @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-progress-bar2: fadeout(lighten(@color-pink-theme, 2%), 20%); @color-pink-player-status-text: lighten(@color-pink-theme_2-font, 32%); @color-pink-player-detail-lyric: fadeout(@color-pink-theme_2-font, 40%); @color-pink-player-detail-lyric-active: darken(@color-pink-theme, 2%); @@ -471,7 +471,7 @@ @color-purple-player-pic-c2: darken(@color-purple-theme_2, 30%); @color-purple-player-progress: darken(@color-purple-theme_2, 6%); @color-purple-player-progress-bar1: darken(@color-purple-theme_2, 12%); -@color-purple-player-progress-bar2: lighten(@color-purple-theme, 12%); +@color-purple-player-progress-bar2: fadeout(lighten(@color-purple-theme, 12%), 20%); @color-purple-player-status-text: lighten(@color-purple-theme_2-font, 32%); @color-purple-player-detail-lyric: fadeout(@color-purple-theme_2-font, 40%); @color-purple-player-detail-lyric-active: darken(@color-purple-theme, 2%); @@ -530,7 +530,7 @@ @color-grey-player-pic-c2: darken(@color-grey-theme_2, 30%); @color-grey-player-progress: darken(@color-grey-theme_2, 6%); @color-grey-player-progress-bar1: darken(@color-grey-theme_2, 12%); -@color-grey-player-progress-bar2: lighten(@color-grey-theme, 12%); +@color-grey-player-progress-bar2: fadeout(lighten(@color-grey-theme, 12%), 20%); @color-grey-player-status-text: lighten(@color-grey-theme_2-font, 32%); @color-grey-player-detail-lyric: fadeout(@color-grey-theme_2-font, 55%); @color-grey-player-detail-lyric-active: darken(@color-grey-theme, 3%); @@ -590,7 +590,7 @@ @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-progress-bar2: fadeout(lighten(@color-ming-theme, 12%), 20%); @color-ming-player-status-text: lighten(@color-ming-theme_2-font, 32%); @color-ming-player-detail-lyric: fadeout(@color-ming-theme_2-font, 50%); @color-ming-player-detail-lyric-active: lighten(@color-ming-theme, 2%); @@ -652,7 +652,7 @@ @color-blue2-player-pic-c2: darken(@color-blue2-theme_2, 30%); @color-blue2-player-progress: darken(@color-blue2-theme_2, 6%); @color-blue2-player-progress-bar1: darken(@color-blue2-theme_2, 12%); -@color-blue2-player-progress-bar2: lighten(@color-blue2-theme, 12%); +@color-blue2-player-progress-bar2: fadeout(lighten(@color-blue2-theme, 12%), 20%); @color-blue2-player-status-text: lighten(@color-blue2-theme_2-font, 32%); @color-blue2-player-detail-lyric: fadeout(@color-blue2-theme_2-font, 50%); @color-blue2-player-detail-lyric-active: darken(@color-blue2-theme, 2%); @@ -712,7 +712,7 @@ @color-black-player-pic-c2: lighten(@color-black-theme_2, 30%); @color-black-player-progress: lighten(@color-black-theme_2, 6%); @color-black-player-progress-bar1: lighten(@color-black-theme_2, 12%); -@color-black-player-progress-bar2: lighten(@color-black-theme, 12%); +@color-black-player-progress-bar2: fadeout(lighten(@color-black-theme, 12%), 20%); @color-black-player-status-text: darken(@color-black-theme_2-font, 20%); @color-black-player-detail-lyric: fadeout(darken(@color-black-theme_2-font, 30%), 10%); @color-black-player-detail-lyric-active: lighten(@color-black-theme, 50%); @@ -772,7 +772,7 @@ @color-mid_autumn-player-pic-c2: darken(@color-mid_autumn-theme_2, 30%); @color-mid_autumn-player-progress: darken(@color-mid_autumn-theme_2, 10%); @color-mid_autumn-player-progress-bar1: darken(@color-mid_autumn-theme_2, 12%); -@color-mid_autumn-player-progress-bar2: lighten(@color-mid_autumn-theme, 12%); +@color-mid_autumn-player-progress-bar2: fadeout(lighten(@color-mid_autumn-theme, 12%), 20%); @color-mid_autumn-player-status-text: lighten(@color-mid_autumn-theme_2-font, 32%); @color-mid_autumn-player-detail-lyric: fadeout(@color-mid_autumn-theme_2-font, 40%); @color-mid_autumn-player-detail-lyric-active: lighten(@color-mid_autumn-theme, 7%); @@ -832,7 +832,7 @@ @color-mid_autumn-player-pic-c2: darken(@color-mid_autumn-theme_2, 30%); @color-mid_autumn-player-progress: darken(@color-mid_autumn-theme_2, 10%); @color-mid_autumn-player-progress-bar1: darken(@color-mid_autumn-theme_2, 12%); -@color-mid_autumn-player-progress-bar2: lighten(@color-mid_autumn-theme, 12%); +@color-mid_autumn-player-progress-bar2: fadeout(lighten(@color-mid_autumn-theme, 12%), 20%); @color-mid_autumn-player-status-text: lighten(@color-mid_autumn-theme_2-font, 32%); @color-mid_autumn-player-detail-lyric: lighten(@color-mid_autumn-theme, 7%); @color-mid_autumn-player-detail-lyric-active: lighten(@color-mid_autumn-theme, 7%); @@ -891,7 +891,7 @@ @color-naruto-player-pic-c2: darken(@color-naruto-theme_2, 30%); @color-naruto-player-progress: darken(@color-naruto-theme_2, 10%); @color-naruto-player-progress-bar1: darken(@color-naruto-theme_2, 12%); -@color-naruto-player-progress-bar2: lighten(@color-naruto-theme, 12%); +@color-naruto-player-progress-bar2: fadeout(lighten(@color-naruto-theme, 12%), 20%); @color-naruto-player-status-text: lighten(@color-naruto-theme_2-font, 32%); @color-naruto-player-detail-lyric: fadeout(@color-naruto-theme_2-font, 36%); @color-naruto-player-detail-lyric-active: darken(@color-naruto-theme, 7%); @@ -950,7 +950,7 @@ @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, 5%); -@color-happy_new_year-player-progress-bar2: lighten(@color-happy_new_year-theme, 5%); +@color-happy_new_year-player-progress-bar2: fadeout(lighten(@color-happy_new_year-theme, 5%), 20%); @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, 36%); @color-happy_new_year-player-detail-lyric-active: darken(@color-happy_new_year-theme, 7%); diff --git a/src/renderer/components/common/ProgressBar.vue b/src/renderer/components/common/ProgressBar.vue index 7ce08a96..0dfe2c3b 100644 --- a/src/renderer/components/common/ProgressBar.vue +++ b/src/renderer/components/common/ProgressBar.vue @@ -125,15 +125,13 @@ export default { .progress-bar2 { background-color: @color-player-progress-bar2; - // box-shadow: 0 0 2px rgba(0, 0, 0, 0.3); - opacity: 0.8; will-change: transform; } .progress-bar3 { background-color: @color-player-progress-bar2; box-shadow: 0 0 2px rgba(0, 0, 0, 0.3); - opacity: 0.3; + opacity: 0.5; } .bar-transition {