Skip to content

Commit

Permalink
Merge pull request #22 from LucasHazardous/dev
Browse files Browse the repository at this point in the history
2.10.13
  • Loading branch information
LucasHazardous authored Jan 2, 2023
2 parents b4813e5 + a23d54e commit b843c2c
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 20 deletions.
Binary file modified img/example1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/example2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/example3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/example4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "music-player",
"version": "2.10.12",
"version": "2.10.13",
"description": "Desktop Electron app for playing and downloading music.",
"main": "./src/main.js",
"scripts": {
Expand Down
9 changes: 5 additions & 4 deletions src/public/assets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ body {

.dark {
background-color: hsl(0, 0%, 21%);
color: hsl(171, 100%, 41%) !important;
}

.dark.panel-block:not(:last-child) {
Expand All @@ -83,8 +82,9 @@ body {
}

.dark-control-nav {
box-shadow: 0 4px 30px rgba(255, 255, 255, 0.25) !important;
border: 1px solid rgba(255, 255, 255, 0) !important;
box-shadow: 0 4px 30px rgba(0, 0, 0, 0.05) !important;
border: 1px solid rgba(255, 255, 255, 0.02) !important;
background: rgba(255, 255, 255, 0.04) !important;
}

.dark-background {
Expand All @@ -105,7 +105,8 @@ body {

.card-footer-item,
#downloadField::placeholder,
#downloadField {
#downloadField,
a {
color: hsl(171, 100%, 41%) !important;
}

Expand Down
16 changes: 3 additions & 13 deletions src/public/pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,10 @@
</head>

<body class="p-4">
<audio src="" id="audioElement" class="is-hidden"></audio>
<h1 id="updateInfo" class="notification is-primary is-hidden">Update info<button class="delete is-hidden" aria-label="delete" id="closeUpdateInfoBtn"></button></h1>
<div id="controls" class="p-3 mb-3">
<audio src="" id="audioElement" class="is-hidden"></audio>
<div class="is-flex is-align-content-center">
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 22 22">
<path fill-rule="evenodd"
d="M8.5 2a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-1 0v-11a.5.5 0 0 1 .5-.5zm-2 2a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 .5-.5zm4 0a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 .5-.5zm-6 1.5A.5.5 0 0 1 5 6v4a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm8 0a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm-10 1A.5.5 0 0 1 3 7v2a.5.5 0 0 1-1 0V7a.5.5 0 0 1 .5-.5zm12 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0V7a.5.5 0 0 1 .5-.5z" />
</svg>
<input type="range" id="volumeChanger" class="slider" min="0" max="100" value="100">
</div>
<input type="range" id="volumeChanger" class="slider mb-3" min="0" max="100" value="100">

<div id="config" class="card">
<footer class="card-footer">
Expand Down Expand Up @@ -51,11 +45,7 @@ <h1 id="updateInfo" class="notification is-primary is-hidden">Update info<button
<button class="button is-primary is-large is-outlined column m-4" id="playButton"></button>
<button class="button is-primary column is-flex is-align-content-center" id="rightBtn">&gt;</button>
</div>
<div class="is-flex is-align-content-center mx-3">
<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 22 22">
<path d="M8 3.5a.5.5 0 0 0-1 0V9a.5.5 0 0 0 .252.434l3.5 2a.5.5 0 0 0 .496-.868L8 8.71V3.5z"/>
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm7-8A7 7 0 1 1 1 8a7 7 0 0 1 14 0z"/>
</svg>
<div class="mx-3">
<input type="range" id="timeControl" class="slider" min="0" max="100" value="0">
</div>
</div>
Expand Down

0 comments on commit b843c2c

Please sign in to comment.