From 72257a683797e3d0904beb8d782708e68e0dce64 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Mon, 24 Jan 2022 18:54:24 +0700 Subject: [PATCH 1/7] add some strings --- src/i18n/en_US.jsonc | 4 ++++ src/main/base/store.ts | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 26290d9c..c1f484b7 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -91,6 +91,8 @@ "action.removeFromQueue": "Remove from Queue", "action.removeFromQueue.success": "Removed from Queue", "action.removeFromQueue.error": "Error Removing from Queue", + "action.addToPlaylist": "Add to Playlist", + "action.addToFavorites": "Add to Favorites", "action.follow": "Follow", "action.follow.success": "Followed", "action.follow.error": "Error Following", @@ -102,7 +104,9 @@ "action.startRadio": "Start Radio", "action.goToArtist": "Go to Artist", "action.goToAlbum": "Go to Album", + "action.moveToTop": "Move to top", "action.share": "Share", + "action.rename": "Rename", "action.love": "Love", "action.unlove": "Unlove", "action.dislike": "Dislike", diff --git a/src/main/base/store.ts b/src/main/base/store.ts index b388df7b..66c0a6a4 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -9,7 +9,8 @@ export class ConfigStore { "close_behavior": 0, // 0 = close, 1 = minimize, 2 = minimize to tray "startup_behavior": 0, // 0 = nothing, 1 = open on startup "discord_rpc": 1, // 0 = disabled, 1 = enabled as Cider, 2 = enabled as Apple Music - "discordClearActivityOnPause": 1 // 0 = disabled, 1 = enabled + "discordClearActivityOnPause": 1, // 0 = disabled, 1 = enabled + "language" : "en_US" }, "home": { "followedArtists": [], From aba91e52f10ab4338ca212e98001ddc002798f2b Mon Sep 17 00:00:00 2001 From: vapormusic Date: Mon, 24 Jan 2022 20:05:15 +0700 Subject: [PATCH 2/7] fix artist view --- src/renderer/style.less | 18 ++++++++++++++---- src/renderer/views/pages/artist.ejs | 6 +++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/renderer/style.less b/src/renderer/style.less index 2511b9fe..81dba007 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -3070,6 +3070,12 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { transition: opacity 0.1s var(--appleEase); } + &.animated .artist-header .more-btn-round { + position: absolute; + bottom: 22px !important; + right: 28px; + } + .artist-header { //background: linear-gradient(45deg, var(--keyColor), #0e0e0e); color: white; @@ -3083,6 +3089,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { z-index: 1; } + .artworkContainer { position: absolute; top: 0; @@ -3107,7 +3114,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { .more-btn-round { position: absolute; - bottom: 84px; + bottom: 82px; right: 28px; } @@ -3200,8 +3207,6 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { } } .artist-title { - position: relative; - top: -19px; .artist-play { transform: translateY(3px); @@ -3224,7 +3229,12 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { .artist-body { padding: 0px var(--contentInnerPadding) 0px var(--contentInnerPadding); - margin-top: -137px; + margin-top: -140px; + } + + &.animated > .artist-body { + padding: 0px var(--contentInnerPadding) 0px var(--contentInnerPadding); + margin-top: -57px; } .showmoreless { diff --git a/src/renderer/views/pages/artist.ejs b/src/renderer/views/pages/artist.ejs index e1be6bca..4eac7489 100644 --- a/src/renderer/views/pages/artist.ejs +++ b/src/renderer/views/pages/artist.ejs @@ -1,5 +1,5 @@