Permalink
Browse files

Merge branch 'gh-pages' of github.com:stolksdorf/Parallaxjs

Conflicts:
	demo/index.css
	demo/index.js
	parallax.js
	parallax.min.js
  • Loading branch information...
2 parents 229da59 + 8529159 commit 23d577a0d68fa846b95d38146a90e4b4d04dc244 Scott Tolksdorf committed Sep 4, 2012
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -0,0 +1,67 @@
+
+
+var rightCode = "parallax.speed = 2000;\n\nparallax.boo.right();";
+var topCode = "parallax.scaling = 'linear';\n\nparallax.boo.top();"
+var leftCode ="parallax.scaling = 0.9;\n\nparallax.boo.left();";
+var bottomCode ="parallax.boo.onload = function(){\n\talert('Awesome alert buddy. Truly spectacular.');\n});\n\nparallax.boo.bottom();";
+var lastCode="parallax.last.bottom();"
+var currentCode="parallax.current.ackbar(); ////What is it? "
+
+$(document).ready(function () {
+
+ $("#boo").click(function(){
+ //clear away all the modifers
+ parallax.speed = 800;
+ parallax.easing = 'swing';
+ parallax.scaling = 0.15;
+ parallax.boo.onload = function(){};
+ //Randomly picks a direction to head back too
+ var rand =Math.floor(Math.random()*4)
+ if(rand == 0) parallax.sandbox.top();
+ else if(rand == 1) parallax.sandbox.left();
+ else if(rand == 2) parallax.sandbox.right();
+ else parallax.sandbox.bottom();
+ });
+
+ $("#fromLast").click(function(){
+ parallax.last.bottom();
+ }).hover(function(){
+ $("#codebox").html(lastCode);
+ });
+
+ $("#fromCurrent").click(function(){
+ parallax.current.ackbar();
+ }).hover(function(){
+ $("#codebox").html(currentCode);
+ });
+
+ $("#fromRight").click(function(){
+ parallax.speed = 2000;
+ parallax.boo.right();
+ }).hover(function(){
+ $("#codebox").html(rightCode);
+ });
+
+ $("#fromTop").click(function(){
+ parallax.scaling = 'linear';
+ parallax.boo.top();
+ }).hover(function(){
+ $("#codebox").html(topCode);
+ });
+
+ $("#fromLeft").click(function(){
+ parallax.scaling = 0.9;
+ parallax.boo.left();
+ }).hover(function(){
+ $("#codebox").html(leftCode);
+ });
+
+ $("#fromBottom").click(function(){
+ parallax.boo.onload = function(){
+ alert("Awesome alert buddy. Truly spectacular.");
+ };
+ parallax.boo.bottom();
+ }).hover(function(){
+ $("#codebox").html(bottomCode);
+ });
+});
View
@@ -1,94 +1,93 @@
-body{
- overflow:hidden;
-}
-
-.background{
- background-image: url(dark_geometric.png);
-}
-
-.noanchor:link, .noanchor:visited, .noanchor:active {
- text-decoration: none;
- color:white;
-}
-
-.page{
- width:100%;
- height:100%;
-}
-
-#logo{
- left:10px;
- top:0px;
-}
-
-#content{
- height:100%;
- overflow-y: scroll;
- overflow-x: hidden;
- background-image: url(brushed_alu.png);
-
-}
-
-.jscode{
- background-color:white;
- font-family:"Courier New",Courier,monospace;
- width:600px;
- margin-left:40px;
- padding:10 15 10 15;
- -moz-box-shadow: 5px 5px 5px #888;-webkit-box-shadow: 5px 5px 5px #888;box-shadow: 5px 5x 5px #888;
-}
-
-p{
- margin-left:10px;
- font-family:Calibri;
- font-size:15px;
- margin-bottom:15px;
-}
-
-#titlebox{
- position:absolute;
- left:40%;
- top:100px;
- width:650px;
- height:500px;
-
-}
-
-#codebox{
- margin-top:20px;
- background-color:white;
- font-family:"Courier New",Courier,monospace;
- width:500px;
- height:100px;
- margin-left:40px;
- padding:10 15 10 15;
- -moz-box-shadow: 5px 5px 5px #888;-webkit-box-shadow: 5px 5px 5px #888;box-shadow: 5px 5x 5px #888;
-}
-
-.arrow{
- opacity:0.2;
-}
-
-.dirText{
- color:white;
- font-size:40px;
- margin-top:45px;
- opacity:0.0;
-}
-
-.control{
- position:fixed;
- width:170px;
- cursor:pointer;
-}
-
-#rightControl{
- right:0px;
- top:40%;
-}
-
-#leftControl{
- left:0px;
- top:40%;
-}
-
+body{
+ overflow:hidden;
+}
+
+.background{
+ background-image: url(assets/dark_geometric2.png);
+}
+
+.noanchor:link, .noanchor:visited, .noanchor:active {
+ text-decoration: none;
+ color:white;
+}
+
+.page{
+ width:100%;
+ height:100%;
+}
+
+#logo{
+ left:10px;
+ top:0px;
+}
+
+#content{
+ height:100%;
+ overflow-y: scroll;
+ overflow-x: hidden;
+ background-image: url(assets/brushed_alu.png);
+
+}
+
+.jscode{
+ background-color:white;
+ font-family:"Courier New",Courier,monospace;
+ width:600px;
+ margin-left:40px;
+ padding:10 15 10 15;
+ -moz-box-shadow: 5px 5px 5px #888;-webkit-box-shadow: 5px 5px 5px #888;box-shadow: 5px 5x 5px #888;
+}
+
+p{
+ margin-left:10px;
+ font-family:Calibri;
+ font-size:15px;
+ margin-bottom:15px;
+}
+
+#titlebox{
+ position:absolute;
+ left:40%;
+ top:100px;
+ width:650px;
+ height:500px;
+
+}
+
+#codebox{
+ margin-top:20px;
+ background-color:white;
+ font-family:"Courier New",Courier,monospace;
+ width:500px;
+ height:100px;
+ margin-left:40px;
+ padding:10 15 10 15;
+ -moz-box-shadow: 5px 5px 5px #888;-webkit-box-shadow: 5px 5px 5px #888;box-shadow: 5px 5x 5px #888;
+}
+
+.arrow{
+ opacity:0.2;
+}
+
+.dirText{
+ color:white;
+ font-size:40px;
+ margin-top:45px;
+ opacity:0.0;
+}
+
+.control{
+ position:fixed;
+ width:170px;
+ cursor:pointer;
+}
+
+#rightControl{
+ right:0px;
+ top:40%;
+}
+
+#leftControl{
+ left:0px;
+ top:40%;
+}
Oops, something went wrong.

0 comments on commit 23d577a

Please sign in to comment.