From b3bdc52bbde9b9fd73adf3ad1ab87367cf31de96 Mon Sep 17 00:00:00 2001
From: talksik <patel.arjun50@gmail.com>
Date: Thu, 19 May 2016 22:56:43 -0700
Subject: [PATCH] Update script.js

---
 history website/script.js | 74 ++++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/history website/script.js b/history website/script.js
index 92110cc..e5189c1 100644
--- a/history website/script.js	
+++ b/history website/script.js	
@@ -2,7 +2,7 @@
 
 
 $(window).load(function(){
-    $(".loader").fadeOut(4000);
+    $(".loader").fadeOut(100);
 
 });
 
@@ -17,22 +17,56 @@ $(window).scroll(
     function () {
     var currentTop = $(window).scrollTop();
     if (currentTop < 900) {
-        $(".sidebar em").text("Up"); /* optional for demo */
-      $(".header").show("fast");
+      $(".header").fadeIn("medium");
     }
     else if (currentTop < this.previousTop) {
-          $(".sidebar em").text("Up"); /* optional for demo */
-        $(".header").show("fast");
+        $(".header").fadeIn("medium");
       }
     else  {
-        $(".sidebar em").text("Down");
-        $(".header").hide("fast");
+        $(".header").fadeOut("medium");
     }
       this.previousTop = currentTop;
 });
 
 
 
+/*-------------Parallax--------------*/
+
+$(window).scroll(function(){
+
+    var wScroll = $(this).scrollTop();
+
+    $('.cover').css({
+      'transform' : 'translate(0px, '+ wScroll /16 +'%)'
+    });
+
+    $('.cover1').css({
+      'transform' : 'translate(0px, -'+ wScroll /15 +'%)'
+    });
+
+    $('.music1').css({
+      'transform' : 'translate(0px, '+ wScroll /3 +'%)'
+    });
+
+
+
+    $('.mushroom').css({
+      'transform' : 'translate(0px, -'+ wScroll /20 +'%)'
+    });
+
+    $('.mario').css({
+      'transform' : 'translate('+ wScroll /10 +'%, '+ wScroll /30 +'%)'
+    });
+
+    $('.joystick').css({
+      'transform' : 'translate(0px, '+ wScroll /20 +'%)'
+    });
+
+
+
+});
+
+
 /*-----------Smooth Scroll from clicking on link in navbar-----*/
 
 $(function(){
@@ -49,31 +83,7 @@ $(function(){
 
 
           }, 'slow');
-
-    });
-
-});
-
-
-
-/*-------------Parallax--------------*/
-
-
-
-$(window).scroll(function(){
-
-    var wScroll = $(this).scrollTop();
-
-    $('.cover').css({
-      'transform' : 'translate(0px, '+ wScroll /16 +'%)'
-    });
-
-    $('.cover1').css({
-      'transform' : 'translate(0px, -'+ wScroll /15 +'%)'
-    });
-
-    $('.music1').css({
-      'transform' : 'translate(0px, '+ wScroll /4 +'%)'
+          return false;
     });
 
 });