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

Merge pull request #159 from gms10ur/upcoming

Browse source 
fixed "Confirm?" icons and switched PNG's to SVG's
This commit is contained in:
cryptofyre 2022-01-19 21:33:39 -06:00 • committed by GitHub
commit 622749ee21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/renderer/assets/feather/x-circle-white.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x-circle"><circle cx="12" cy="12" r="10"></circle><line x1="15" y1="9" x2="9" y2="15"></line><line x1="9" y1="9" x2="15" y2="15"></line></svg>
Side by side

After

Width:  |  Height:  |  Size: 339 B

BIN
src/renderer/assets/playPng.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
src/renderer/assets/shufflePng.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3 KiB

11
src/renderer/style.less
View file

@ -2095,7 +2095,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
}
.md-ico-play {
content:url("./assets/playPng.png");
content:url("./assets/play.svg");
width: 10px;
height: 12px;
margin-right: 1px;
@ -2103,15 +2103,16 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
}
.md-ico-shuffle {
content:url("./assets/shufflePng.png");
width: 15px;
height: 13px;
content:url("./assets/shuffle.svg");
width: 17px;
height: 17px;
margin-right: 1px;
margin-bottom: -2px;
align-self: center;
}
.md-ico-remove {
content:url("./assets/feather/x-circlePng.png");
content:url("./assets/feather/x-circle-white.svg");
width: 16px;
height: 16px;
margin-right: 1px;

4
src/renderer/views/pages/cider-playlist.ejs
View file

@ -75,7 +75,7 @@
{{ (!inLibrary) ? "Add to Library" : "Remove from Library" }}
</button>
<button class="md-btn" style="min-width: 180px;" v-if="confirm==true"
@click="(!inLibrary) ? addToLibrary(data.attributes.playParams.id.toString()) : removeFromLibrary(data.attributes.playParams.id.toString()) "> <img class="md-ico-remove">
@click="(!inLibrary) ? addToLibrary(data.attributes.playParams.id.toString()) : removeFromLibrary(data.attributes.playParams.id.toString()) "> <img :class="(!inLibrary) ? 'md-ico-add' : 'md-ico-remove'">
Confirm?
</button>
<button class="more-btn-round" style="float:right;" @click="menu">
@ -111,7 +111,7 @@
{{ (!inLibrary) ? "Add to Library" : "Remove from Library" }}
</button>
<button class="md-btn" style="min-width: 180px;" v-if="confirm==true"
@click="(!inLibrary) ? addToLibrary(data.attributes.playParams.id.toString()) : removeFromLibrary(data.attributes.playParams.id.toString()) "> <img class="md-ico-remove">
@click="(!inLibrary) ? addToLibrary(data.attributes.playParams.id.toString()) : removeFromLibrary(data.attributes.playParams.id.toString()) "> <img :class="(!inLibrary) ? 'md-ico-add' : 'md-ico-remove'">
Confirm?
</button>
</div>