RegUpd 66

- Minor changes to xp buttons and the loading screen.
jakubekgranie · Nov 5, 2023 · 2ab135d · 2ab135d
1 parent cee234a
commit 2ab135d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 22 deletions.
diff --git 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
@@ -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";
     }
 }
diff --git a/index.html b/index.html
@@ -104,31 +104,25 @@ <h1 class="nonstandard-draft-head grd-draft1 gradient-text"><b>DRAFT&nbsp;</b></
                     <!-- Update Data - Name-->
                     <div class="ff-belanosima">
                         <h2 class="mg-none fw-500 mg-b-8px">(Github) Update Log - shatterwares.com</h2>
-                        <h2 class="mg-none fw-500 fc-grayed">RegUpd 65 [11.4.2023]</h2>
+                        <h2 class="mg-none fw-500 fc-grayed">RegUpd 66 [11.5.2023]</h2>
                     </div>
                     <!-- Update Data - Name-->
                 </div>
                 <!-- Update Data - must be kept updated! -->
                 <div class="brad-40px w-100p update-notes-text ff-monospace ov-h bs-bb scroll-alternative">
                     <h1 class="mg-b-20px">// ShWHP</h1>
-                    <p class="mg-none paragraph-notes mg-b-20px wsp-p-l">- Started rehauling the ShWPH section;
-                        - Rearranged certain artifacts' placement.
-
-                        // Windows XP icons are the courtesy of Faisal Akhtar's web Windows XP implementation.
+                    <p class="mg-none paragraph-notes mg-b-20px wsp-p-l">- Minor changes to xp buttons and the loading screen.
                     </p>
 
+                    <!--
                     <h1 class="header-notes header-notes-subsequent">.2</h1>
                     <h1 class="header-notes">// ShWHP</h1>
                     <p class="mg-none paragraph-notes mg-b-20px wsp-p-l">- Added text shadow to the XP item text;
                         - Added a placeholder video;
                         - Fixed the anchors not behaving correctly.
 
                     </p>
-
-                    <h1 class="header-notes header-notes-subsequent">.3</h1>
-                    <h1 class="header-notes">// ShWHP</h1>
-                    <p class="mg-none paragraph-notes mg-b-20px wsp-p-l">- Countinuing development of the xp/ShWPH tabs.
-                    </p>
+                    -->
                 </div>
                 <!-- Update Data - must be kept updated! -->
             </div>
@@ -329,9 +323,9 @@ <h1 id="headermission" class="mg-none t-ss-heading op-0">The mission<span class=
                             <p id="xp-item-title-1" class="xp-item-title xp-margin mg-none">Internet Explorer - www.shatterwares.com/shwph/index.html</p>
                         </div>
                         <div class="fx">
-                            <div id="xp-minimize-1" class="xp-icon xp-margin minimize cur-sel" onclick="xpWindow(1, 1)"></div>
+                            <div id="xp-minimize-1" class="xp-icon xp-margin minimize cur-sel" onclick="xpWindow(1, 0)"></div>
                             <div class="xp-icon xp-margin maximize cur-sel"></div>
-                            <div id="xp-close-1" class="xp-icon xp-margin close cur-sel" onclick="xpWindow(1, 2)"></div>
+                            <div id="xp-close-1" class="xp-icon xp-margin close cur-sel" onclick="xpWindow(1, 1)"></div>
                         </div>
                     </div>
                 </div>
@@ -347,9 +341,9 @@ <h1 id="headermission" class="mg-none t-ss-heading op-0">The mission<span class=
                             <p id="xp-item-title-2" class="xp-item-title xp-margin mg-none">Internet Explorer - www.shatterwares.com/shwph/index.html</p>
                         </div>
                         <div class="fx">
-                            <div id="xp-minimize-2" class="xp-icon xp-margin minimize cur-sel" onclick="xpWindow(2, 1)"></div>
+                            <div id="xp-minimize-2" class="xp-icon xp-margin minimize cur-sel" onclick="xpWindow(2, 0)"></div>
                             <div class="xp-icon xp-margin maximize cur-sel"></div>
-                            <div id="xp-close-2" class="xp-icon xp-margin close cur-sel" onclick="xpWindow(2, 2)"></div>
+                            <div id="xp-close-2" class="xp-icon xp-margin close cur-sel" onclick="xpWindow(2, 1)"></div>
                         </div>
                     </div>
                 </div>
@@ -365,9 +359,9 @@ <h1 id="headermission" class="mg-none t-ss-heading op-0">The mission<span class=
                             <p id="xp-item-title-3" class="xp-item-title xp-margin mg-none">Internet Explorer - www.shatterwares.com/shwph/index.html</p>
                         </div>
                         <div class="fx">
-                            <div id="xp-minimize-3" class="xp-icon xp-margin minimize cur-sel" onclick="xpWindow(3, 1)"></div>
+                            <div id="xp-minimize-3" class="xp-icon xp-margin minimize cur-sel" onclick="xpWindow(3, 0)"></div>
                             <div class="xp-icon xp-margin maximize cur-sel"></div>
-                            <div id="xp-close-3" class="xp-icon xp-margin close cur-sel" onclick="xpWindow(3, 2)"></div>
+                            <div id="xp-close-3" class="xp-icon xp-margin close cur-sel" onclick="xpWindow(3, 1)"></div>
                         </div>
                     </div>
                 </div>