diff --git a/website/source/Gruntfile.js b/website/source/Gruntfile.js
index 41f6d6660..1d0f20f72 100644
--- a/website/source/Gruntfile.js
+++ b/website/source/Gruntfile.js
@@ -28,7 +28,7 @@ module.exports = function(grunt) {
},
uglify: {
- app: {
+ app: {
files: {
'javascripts/app/deploy/site.min.js': ['javascripts/app/deploy/site.js']
}
@@ -58,11 +58,11 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-recess');
- // JS distribution task.
- grunt.registerTask('dist-js', ['concat', 'uglify']);
+ // JS distribution task.
+ grunt.registerTask('dist-js', ['concat', 'uglify']);
- // Full distribution task.
- grunt.registerTask('dist', ['dist-js']);
+ // Full distribution task.
+ grunt.registerTask('dist', ['dist-js']);
grunt.registerTask('default', ['watch']);
diff --git a/website/source/javascripts/app/deploy/site.js b/website/source/javascripts/app/deploy/site.js
index 50f04f090..098863ffd 100644
--- a/website/source/javascripts/app/deploy/site.js
+++ b/website/source/javascripts/app/deploy/site.js
@@ -67,7 +67,7 @@ var APP = APP || {};
this.ui = {
$doc: $(window),
$hero: $('#jumbotron'),
- $pagination: null
+ $collapse: $('.navbar-collapse')
}
this.addEventListeners();
@@ -81,13 +81,17 @@ var APP = APP || {};
return;
_this.ui.$doc.scroll(function() {
+
+ //if collapseable menu is open dont do parrallax. It looks wonky. Bootstrap conflict
+ if( _this.ui.$collapse.hasClass('in'))
+ return;
+
var top = _this.ui.$doc.scrollTop(),
speedAdj = (top*0.8),
speedAdjOffset = speedAdj - top;
_this.ui.$hero.css('webkitTransform', 'translate(0, '+ speedAdj +'px)');
_this.ui.$hero.find('.container').css('webkitTransform', 'translate(0, '+ speedAdjOffset +'px)');
- //_this.ui.$pagination.css('webkitTransform', 'translate(0, '+ speedAdjOffset +'px)');
})
}
}
diff --git a/website/source/javascripts/app/deploy/site.min.js b/website/source/javascripts/app/deploy/site.min.js
index 96bf618e6..ea3bd58f6 100644
--- a/website/source/javascripts/app/deploy/site.min.js
+++ b/website/source/javascripts/app/deploy/site.min.js
@@ -1 +1 @@
-var APP=function(){function a(){APP.Utils.runIfClassNamePresent("page-home",b)}function b(){APP.Homepage.init()}return{initialize:a}}(),APP=APP||{};APP.Utils=function(){return{isMobile:function(){return navigator.userAgent.match(/Android/i)||navigator.userAgent.match(/webOS/i)||navigator.userAgent.match(/iPhone/i)||navigator.userAgent.match(/iPod/i)||navigator.userAgent.match(/BlackBerry/i)||navigator.userAgent.match(/Windows Phone/i)?!0:!1}(),runIfClassNamePresent:function(a,b){var c=document.getElementsByClassName(a);c.length>0&&b()}}}();var APP=APP||{};!function(){APP.Homepage=function(){return{ui:null,init:function(){this.ui={$doc:$(window),$hero:$("#jumbotron"),$pagination:null},this.addEventListeners()},addEventListeners:function(){var a=this;APP.Utils.isMobile||a.ui.$doc.scroll(function(){var b=a.ui.$doc.scrollTop(),c=.8*b,d=c-b;a.ui.$hero.css("webkitTransform","translate(0, "+c+"px)"),a.ui.$hero.find(".container").css("webkitTransform","translate(0, "+d+"px)")})}}}()}(jQuery,this);
\ No newline at end of file
+var APP=function(){function a(){APP.Utils.runIfClassNamePresent("page-home",b)}function b(){APP.Homepage.init()}return{initialize:a}}(),APP=APP||{};APP.Utils=function(){return{isMobile:function(){return navigator.userAgent.match(/Android/i)||navigator.userAgent.match(/webOS/i)||navigator.userAgent.match(/iPhone/i)||navigator.userAgent.match(/iPod/i)||navigator.userAgent.match(/BlackBerry/i)||navigator.userAgent.match(/Windows Phone/i)?!0:!1}(),runIfClassNamePresent:function(a,b){var c=document.getElementsByClassName(a);c.length>0&&b()}}}();var APP=APP||{};!function(){APP.Homepage=function(){return{ui:null,init:function(){this.ui={$doc:$(window),$hero:$("#jumbotron"),$collapse:$(".navbar-collapse")},this.addEventListeners()},addEventListeners:function(){var a=this;APP.Utils.isMobile||a.ui.$doc.scroll(function(){if(!a.ui.$collapse.hasClass("in")){var b=a.ui.$doc.scrollTop(),c=.8*b,d=c-b;a.ui.$hero.css("webkitTransform","translate(0, "+c+"px)"),a.ui.$hero.find(".container").css("webkitTransform","translate(0, "+d+"px)")}})}}}()}(jQuery,this);
\ No newline at end of file
diff --git a/website/source/javascripts/app/homepage.js b/website/source/javascripts/app/homepage.js
index ff6683947..9af3e6d7c 100644
--- a/website/source/javascripts/app/homepage.js
+++ b/website/source/javascripts/app/homepage.js
@@ -15,7 +15,7 @@ var APP = APP || {};
this.ui = {
$doc: $(window),
$hero: $('#jumbotron'),
- $pagination: null
+ $collapse: $('.navbar-collapse')
}
this.addEventListeners();
@@ -29,13 +29,17 @@ var APP = APP || {};
return;
_this.ui.$doc.scroll(function() {
+
+ //if collapseable menu is open dont do parrallax. It looks wonky. Bootstrap conflict
+ if( _this.ui.$collapse.hasClass('in'))
+ return;
+
var top = _this.ui.$doc.scrollTop(),
speedAdj = (top*0.8),
speedAdjOffset = speedAdj - top;
_this.ui.$hero.css('webkitTransform', 'translate(0, '+ speedAdj +'px)');
_this.ui.$hero.find('.container').css('webkitTransform', 'translate(0, '+ speedAdjOffset +'px)');
- //_this.ui.$pagination.css('webkitTransform', 'translate(0, '+ speedAdjOffset +'px)');
})
}
}
diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb
index bb5c3e0ac..baba29eff 100644
--- a/website/source/layouts/_footer.erb
+++ b/website/source/layouts/_footer.erb
@@ -2,9 +2,9 @@
-
-
-
+
+
+
-">
+">
