Skip to content

Commit

Permalink
Bottom Bar change, Leaderboard bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
FukutoTojido committed Oct 13, 2021
1 parent 30ad94e commit c8915f3
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 22 deletions.
34 changes: 22 additions & 12 deletions css/bottom.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:root {
--bottom-bar-distance: 400px;
--bottom-bar-distance: 430px;
}

#bottom {
Expand Down Expand Up @@ -127,11 +127,11 @@
position: absolute;
padding: 10px 0px 10px 0px;
text-align: center;
border-radius: 30px;
/* border-radius: 30px;
border-style: solid;
border-width: 8px;
border-color: #15151e;
bottom: 10px;
border-color: #15151e; */
bottom: 20px;
width: 150px;
color: white;
font-size: 25px;
Expand All @@ -141,18 +141,18 @@
overflow: hidden;
text-overflow: ellipsis;
text-shadow: 0 2px 5px rgba(0, 0, 0, 1);
left: 625px;
left: 580px;
}

#pp {
position: absolute;
padding: 10px 0px 10px 0px;
text-align: center;
border-radius: 30px;
/* border-radius: 30px;
border-style: solid;
border-width: 8px;
border-color: #15151e;
bottom: 10px;
border-color: #15151e; */
bottom: 20px;
width: 150px;
color: white;
font-size: 25px;
Expand All @@ -162,7 +162,7 @@
overflow: hidden;
text-overflow: ellipsis;
text-shadow: 0 2px 5px rgba(0, 0, 0, 1);
right: 625px;
right: 580px;
}

#accInfo {
Expand Down Expand Up @@ -290,19 +290,29 @@

.bottomBar {
position: absolute;
bottom: 40px;
width: 220px;
padding: 5px;
bottom: 0px;
width: 400px;
height: 67px;
border-radius: 10px;
background-color: #15151e;
mask-size: 100%;
mask-repeat: no-repeat;
mask-position: center;
-webkit-mask-size: 100%;
-webkit-mask-repeat: no-repeat;
-webkit-mask-position: center;
}

#comboBar {
left: var(--bottom-bar-distance);
mask-image: url('../static/bottombar1.png');
-webkit-mask-image: url('../static/bottombar1.png');
}

#ppBar {
right: var(--bottom-bar-distance);
mask-image: url('../static/bottombar2.png');
-webkit-mask-image: url('../static/bottombar2.png');
}

#recorderContainer {
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
<div id="h50" class="odometer"></div>
<div id="h0" class="odometer"></div>
</div>
<div id="combo" class="odometer combo"></div>
<div id="pp" class="odometer pp"></div>
<div id="comboBar" class="bottomBar"></div>
<div id="ppBar" class="bottomBar"></div>
<div id="combo" class="odometer combo"></div>
<div id="pp" class="odometer pp"></div>
</div>
<div id="URIndex" class="odometer"><b></b></div>
<div id="URbar">
Expand Down Expand Up @@ -199,7 +199,7 @@
<defs>
<clipPath id="myClip">
<polygon points="1536,972 1920,972 1920,1080 1536,1080"/>
<polygon points="800,1030 1120,1030 1120,1080, 800,1080" />
<polygon points="750,1030 1170,1030 1170,1080, 750,1080" />
</clipPath>
</defs>
</svg>
Expand Down
14 changes: 7 additions & 7 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -853,14 +853,14 @@ async function setupUser(name) {
tickRight.style.boxShadow = `0 0 10px 3px hsl(${avatarColor[1]})`;

document.getElementById("comboBar").style.backgroundColor = `hsl(${avatarColor[0]})`;
document.getElementById("comboBar").style.boxShadow = `0 0 10px 3px hsl(${avatarColor[0]})`;
// document.getElementById("comboBar").style.filter = `drop-shadow(0 0 10px hsl(${avatarColor[0]}))`;
document.getElementById("ppBar").style.backgroundColor = `hsl(${avatarColor[1]})`;
document.getElementById("ppBar").style.boxShadow = `0 0 10px 3px hsl(${avatarColor[1]})`;
// document.getElementById("ppBar").style.boxShadow = `0 0 10px 3px hsl(${avatarColor[1]})`;

combo.style.borderColor = `hsl(${avatarColor[0]})`;
combo.style.boxShadow = `0 0 10px 3px hsl(${avatarColor[0]})`;
pp.style.borderColor = `hsl(${avatarColor[1]})`;
pp.style.boxShadow = `0 0 10px 3px hsl(${avatarColor[1]})`;
// combo.style.borderColor = `hsl(${avatarColor[0]})`;
// combo.style.boxShadow = `0 0 10px 3px hsl(${avatarColor[0]})`;
// pp.style.borderColor = `hsl(${avatarColor[1]})`;
// pp.style.boxShadow = `0 0 10px 3px hsl(${avatarColor[1]})`;
}
}

Expand Down Expand Up @@ -945,7 +945,7 @@ grader = (h300, h100, h50, h0, isHD) => {
return `<div id="gradeOurplayer" style="width: 50px; color: #de3950; filter: drop-shadow(0 0 5px #de3950)">X</div>`;
break;
}
playerGradeLB.innerHTML = `<div id=grade${i}" style="width: 50px; color: #ffffff; filter: drop-shadow(0 0 5px #ffffff)">X</div>`;
return `<div id="gradeOurplayer" style="width: 50px; color: #ffffff; filter: drop-shadow(0 0 5px #ffffff)">X</div>`;
break;
case (acc > 90 && h50 / maxCombo < 0.01 && h0 === 0):
if (isHD === -1) {
Expand Down
Binary file added static/bottombar1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions static/bottombar1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/bottombar2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions static/bottombar2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c8915f3

Please sign in to comment.