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:
Maikiwi 2022-01-24 23:50:23 -08:00 • committed by GitHub
commit 9c70cb8211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
resources/icons/icon.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 303 KiB

After

Width:  |  Height:  |  Size: 295 KiB

Before After
Before After

12
src/renderer/index.js
View file

@ -3397,9 +3397,19 @@ const app = new Vue({
this.webremoteurl = await ipcRenderer.invoke('showQR','')
//this.modals.qrcode = true;
},
checkMarquee() {
if(isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') == true) {
document.getElementsByClassName('song-artist')[0].classList.add('marquee');
document.getElementsByClassName('song-artist')[1].classList.add('marquee-after');
}
if(isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') == true) {
document.getElementsByClassName('song-name')[0].classList.add('marquee');
document.getElementsByClassName('song-name')[1].classList.add('marquee-after');
}
}
}
}
})
Vue.component('animated-number', {

49
src/renderer/style.less
View file

@ -1112,27 +1112,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
}
.app-chrome .app-chrome-item > .app-playback-controls .song-artist {
font-weight: 400;
font-size: 12px;
text-align: center;
/*height: 1.2em;
line-height: 1.2em;*/
z-index: 1;
max-width: 360px;
.song-artist-normal {
height: inherit;
}
&.song-artist-marquee {
> marquee {
margin-bottom: -3px;
}
}
}
.app-chrome .app-chrome-item > .app-playback-controls .song-progress {
@bgColor: transparent;
@ -1256,7 +1236,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
overflow: hidden;
}
.app-chrome .app-chrome-item > .app-playback-controls .playback-info > div {
.app-chrome .app-chrome-item > .app-playback-controls .playback-info > .song-progress{
width: 100%;
}
@ -1267,6 +1247,31 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
display: flex;
position: relative;
}
.app-chrome .app-chrome-item > .app-playback-controls .song-artist-album {
font-weight: 400;
font-size: 12px;
text-align: center;
/*height: 1.2em;
line-height: 1.2em;*/
z-index: 1;
align-items: center;
justify-content: center;
width: 80%;
max-width: 340px;
overflow: hidden;
.song-artist-normal {
height: inherit;
}
&.song-artist-marquee {
> marquee {
margin-bottom: -3px;
}
}
}
.display--small {
display: none !important;
@ -4570,7 +4575,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
.queue-col {
width: 60vh;
height: 50vh;
height: 62vh;
.queue-title {
opacity: 0.6;

2
src/renderer/views/components/libraryartist-item.ejs
View file

@ -121,7 +121,7 @@
"action": function () {
if (!self.item.attributes.url && self.item.relationships){
if (self.item.relationships.catalog){
app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.copyToClipboard((u.length && u.length > 0)? u[0].attributes.url : u.attributes.url)})
app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0)? u.data.data[0].attributes.url : u.data.data.attributes.url)})
}
} else {
self.app.copyToClipboard(self.item.attributes.url)}

2
src/renderer/views/components/mediaitem-list-item.ejs
View file

@ -400,7 +400,7 @@
"action": function () {
if (!self.item.attributes.url && self.item.relationships){
if (self.item.relationships.catalog){
app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.copyToClipboard((u.length && u.length > 0)? u[0].attributes.url : u.attributes.url)})
app.mkapi(self.item.attributes.playParams.kind, false, self.item.relationships.catalog.data[0].id).then(u => {self.app.copyToClipboard((u.data.data.length && u.data.data.length > 0)? u.data.data[0].attributes.url : u.data.data.attributes.url)})
}
}else {
self.app.copyToClipboard(self.item.attributes.url)}

2
src/renderer/views/main.ejs
View file

@ -96,7 +96,7 @@
style="display: inline-block"></div>
</div>
<!-- :class="[isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') ? 'marquee' : '']" -->
<div class="song-artist"
<div class="song-artist-album"
style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap;">
<div class="item-navigate song-artist" style="display: inline-block"
@click="getNowPlayingItemDetailed(`artist`)">