From 2ab135d9ee5d36e08e3ed7202f179e9c6fa48e40 Mon Sep 17 00:00:00 2001
From: jakubekgranie
Date: Sun, 5 Nov 2023 12:52:50 +0100
Subject: [PATCH] RegUpd 66
- Minor changes to xp buttons and the loading screen.
---
CSS/cssdata-shatterwares2.css | 2 +-
JS/animationutil.js | 10 +++++-----
index.html | 26 ++++++++++----------------
3 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/CSS/cssdata-shatterwares2.css b/CSS/cssdata-shatterwares2.css
index e676b4b..66de21f 100644
--- a/CSS/cssdata-shatterwares2.css
+++ b/CSS/cssdata-shatterwares2.css
@@ -913,7 +913,7 @@ html{
cursor: none;
}
.anim-alternateOpacityShift{
- animation: opacityShift 0.5s ease forwards alternate-reverse;
+ animation: opacityShift 0.25s ease forwards alternate-reverse;
}
.shwph-tab{
width: 32vw;
diff --git a/JS/animationutil.js b/JS/animationutil.js
index 407f028..974b171 100644
--- a/JS/animationutil.js
+++ b/JS/animationutil.js
@@ -15,7 +15,7 @@ window.onload = () => {
// after full site load -> remove user interaction limitations
document.getElementsByTagName("style")[0].remove();
animationForwarder('skip', 'load', 'anim-alternateOpacityShift', 0);
- animationForwarder('skip', 'load', 'dp-none', 500);
+ animationForwarder('skip', 'load', 'dp-none', 250);
// scramble animation
const waitTime = 50; //defines animation's length (waitTime * length + 0.2s)
@@ -41,7 +41,7 @@ window.onload = () => {
nodeList[i].innerHTML = slogan[i]; // separated so all symbols would be scrambled initially (look up)
}, waitTime * i);
}
- }, 250); // setTimeout used to belate the main animation (loading screen's fadeOut might make it partially invisible)
+ }, 150); // setTimeout used to belate the main animation (loading screen's fadeOut might make it partially invisible)
}
function anFrwdPreset(){
@@ -174,18 +174,18 @@ function toggleUpdateScreenVisibility(){
anFrwdDoubleExec('updateScreen', 'updateNotes', 'skip', 'updateStar', animOShift, 100, 'anim-fadeInTL', 100);
}
-function xpWindow(id, button = 0){
+function xpWindow(id, button){
const xp = [document.getElementById("xp-" + id), document.getElementById("xp-item-title-" + id), document.getElementById("xp-content-" + id), document.getElementById("xp-minimize-" + id), document.getElementById("xp-close-" + id)];
const minimize = ["first", "second", "third"]; //all variations
const trueMinimize = minimize[id - 1] + "-minimize"; //tailor to the window id
- if(button == 1){
+ if(button == 0){
xp[3].onclick = function() {null};
xp[0].classList.add(trueMinimize);
setTimeout(() => {xp[0].classList.remove(trueMinimize)}, 150);
setTimeout(() => {xp[3].onclick = function() {xpWindow(id, true)}}, 300);
}
- if(button == 2){
+ if(button == 1){
xp[0].style.display = "none";
}
}
\ No newline at end of file
diff --git a/index.html b/index.html
index 11efb90..28100a0 100644
--- a/index.html
+++ b/index.html
@@ -104,19 +104,17 @@ DRAFT
(Github) Update Log - shatterwares.com
- RegUpd 65 [11.4.2023]
+ RegUpd 66 [11.5.2023]
// ShWHP
-
- Started rehauling the ShWPH section;
- - Rearranged certain artifacts' placement.
-
- // Windows XP icons are the courtesy of Faisal Akhtar's web Windows XP implementation.
+
- Minor changes to xp buttons and the loading screen.
+
@@ -329,9 +323,9 @@
@@ -347,9 +341,9 @@