okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ciderapp:upcoming' into upcoming

Browse source
This commit is contained in:
yazninja 2022-01-24 22:37:23 +08:00 • committed by GitHub
commit 3ed73054ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 135 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/renderer/index.js
View file

@ -3325,10 +3325,12 @@ const app = new Vue({
if (flag) {
this.tmpWidth = window.innerWidth;
this.tmpHeight = window.innerHeight;
ipcRenderer.send('setFullScreen', false);
ipcRenderer.send('windowresize', 364, 364, false)
ipcRenderer.send('unmaximize');
ipcRenderer.send('windowmin', 250, 250)
ipcRenderer.send('windowresize', 300, 300, false)
app.appMode = 'mini';
} else {
ipcRenderer.send('windowmin', 844, 410)
ipcRenderer.send('windowresize', this.tmpWidth, this.tmpHeight, false)
app.appMode = 'player';
}

18
src/renderer/style.less
View file

@ -3075,6 +3075,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;
@ -3088,6 +3094,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
z-index: 1;
}
.artworkContainer {
position: absolute;
top: 0;
@ -3112,7 +3119,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
.more-btn-round {
position: absolute;
bottom: 84px;
bottom: 82px;
right: 28px;
}
@ -3205,8 +3212,6 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
}
}
.artist-title {
position: relative;
top: -19px;
.artist-play {
transform: translateY(3px);
@ -3229,7 +3234,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 {

6
src/renderer/views/pages/artist.ejs
View file

@ -1,5 +1,5 @@
<script type="text/x-template" id="cider-artist">
<div class="content-inner artist-page">
<div class="content-inner artist-page" :class="[data.attributes.editorialVideo && (data.attributes.editorialVideo.motionArtistWide16x9 || data.attributes.editorialVideo.motionArtistFullscreen16x9) ? 'animated' : '']">
<div class="artist-header" :key="data.id" v-observe-visibility="{callback: isHeaderVisible}">
<animatedartwork-view
:priority="true"
@ -73,7 +73,7 @@
<h3>Top Songs</h3>
</div>
<div class="col-auto flex-center" v-if="data.views['top-songs'].data.length >= 10" style="padding:0;">
<button class="cd-btn-seeall" @click="app.showArtistView(data.id, data.attributes.name + ' - Top Songs', 'top-songs')">See All</button>
<button class="cd-btn-seeall" @click="app.showArtistView(data.id, data.attributes.name + ' - Top Songs', 'top-songs')">{{app.getLz('term.seeAll')}}</button>
</div>
</div>
<mediaitem-list-item
@ -104,7 +104,7 @@
</h3>
</div>
<div class="col-auto flex-center" v-if="data.views[view].data.length >= 10">
<button class="cd-btn-seeall" @click="app.showArtistView(data.id, data.attributes.name + ' - ' + data.views[view].attributes.title, view)">See All</button>
<button class="cd-btn-seeall" @click="app.showArtistView(data.id, data.attributes.name + ' - ' + data.views[view].attributes.title, view)">{{app.getLz('term.seeAll')}}</button>
</div>
</div>
<template v-if="!((data.views[view].attributes.title ?