diff --git a/.gitignore b/.gitignore index e6413018..29a853c9 100644 --- a/.gitignore +++ b/.gitignore @@ -328,3 +328,4 @@ savedconfig/cider-config.json savedconfig/config.json savedconfig/session.json savedconfig/window-state.json +src/main/base/sample.json diff --git a/src/renderer/less/pages.less b/src/renderer/less/pages.less index 859565b7..9d74de15 100644 --- a/src/renderer/less/pages.less +++ b/src/renderer/less/pages.less @@ -658,6 +658,29 @@ width : 100%; height : 100%; + .playlist-hero { + width : 100%; + transform : translateX(+25%); + position : absolute; + z-index : -1; + top : 0; + left : 0; + right : 0; + bottom : 0; + + .mediaitem-artwork { + -webkit-mask-image: -webkit-radial-gradient(center, circle cover, rgba(0, 0, 0, 1) 50%, rgba(0, 0, 0, 0) 75%); + border-radius : 0px; + } + .hero-tint { + position: absolute; + top : 0; + opacity: 0.6; + width: 100%; + height: 100%; + } + } + >.row { width: calc(100% - 32px); } @@ -677,6 +700,10 @@ flex-shrink : unset; } + .search-input::placeholder { + color: var(--heroplaceholdercolor) + } + .nameEdit { font-weight: 700; font-size : 1.6rem; diff --git a/src/renderer/views/pages/artist.ejs b/src/renderer/views/pages/artist.ejs index c926794f..539393dc 100644 --- a/src/renderer/views/pages/artist.ejs +++ b/src/renderer/views/pages/artist.ejs @@ -25,7 +25,8 @@
+ :style="{ 'color': '#' +hasHeroObject()?.textColor1 ?? ''}" + > @@ -178,11 +179,21 @@ return this.data.attributes?.editorialArtwork?.centeredFullscreenBackground.url } else if(this.data.attributes?.editorialArtwork?.bannerUber) { return this.data.attributes?.editorialArtwork?.bannerUber.url - }else if(this.data.attributes?.editorialArtwork?.subscriptionHero){ + } else if(this.data.attributes?.editorialArtwork?.subscriptionHero){ return this.data.attributes?.editorialArtwork?.subscriptionHero.url } return false; }, + hasHeroObject() { + if(this.data.attributes?.editorialArtwork?.centeredFullscreenBackground){ + return this.data.attributes?.editorialArtwork?.centeredFullscreenBackground + } else if(this.data.attributes?.editorialArtwork?.bannerUber) { + return this.data.attributes?.editorialArtwork?.bannerUber + } else if(this.data.attributes?.editorialArtwork?.subscriptionHero){ + return this.data.attributes?.editorialArtwork?.subscriptionHero + } + return []; + }, isHeaderVisible(visible) { this.headerVisible = visible }, diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 7d2cfd04..2723bc4a 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -8,9 +8,13 @@