From 5b60352cd0e2017000ba9c8076dd8ba853fcc540 Mon Sep 17 00:00:00 2001 From: Severyn Kozak Date: Mon, 9 Jun 2014 20:56:34 -0400 Subject: [PATCH] Add some documentation, clean up before merge. Add: static/js/about.js, static/sass/(index, about).sass -Minor cleanup before merge into `develop`: remove a superfluous style rule, update header comments. --- static/js/about.js | 10 +++++----- static/sass/about.sass | 7 +++++-- static/sass/index.sass | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/static/js/about.js b/static/js/about.js index 900deb8..78c9ccf 100644 --- a/static/js/about.js +++ b/static/js/about.js @@ -1,6 +1,10 @@ +/* + * @file Implements a parallax effect on the about page. + */ + var lastVertPos = $(window).scrollTop(); -function parallax(){ +$(window).scroll(function(e){ var currVertPos = $(window).scrollTop(); var delta = currVertPos - lastVertPos; $(".bg").each(function(){ @@ -8,8 +12,4 @@ function parallax(){ delta * $(this).attr("speed") + "px"); }); lastVertPos = currVertPos; -} - -$(window).scroll(function(e){ - parallax(); }); diff --git a/static/sass/about.sass b/static/sass/about.sass index e5ff22a..3303a6d 100644 --- a/static/sass/about.sass +++ b/static/sass/about.sass @@ -1,7 +1,11 @@ +/* + Stylesheet for `templates/about.html` + */ + @import mixins @import variables -.bg +div.bg $img-height: 650px position: fixed @@ -17,7 +21,6 @@ &#img-2 background: url(../img/about/bg2.png) no-repeat - width: 100% height: $img-height + 530 top: 550px diff --git a/static/sass/index.sass b/static/sass/index.sass index 2a90900..596a58d 100644 --- a/static/sass/index.sass +++ b/static/sass/index.sass @@ -1,5 +1,5 @@ /* - Stylesheet for `index.html`. + Stylesheet for `templates/index.html`. */ @import mixins