Merge pull request barryclark#45 from njaremko/improvements

Inlined and minified grayscale.js, also optimized
tonymaibox · Nov 8, 2015 · 00c5c83 · 00c5c83
2 parents b0a8b93 + 9b53e09
commit 00c5c83
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 32 deletions.
diff --git a/_includes/js.html b/_includes/js.html
@@ -11,7 +11,10 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.3/jquery.easing.min.js"></script>
 
 <!-- Custom Theme JavaScript -->
-<script src="{{site.baseurl}}/js/grayscale.js"></script>
+<!--* Start Bootstrap - Grayscale Bootstrap Theme (http://startbootstrap.com)
+* Code licensed under the Apache License v2.0.
+* For details, see http://www.apache.org/licenses/LICENSE-2.0.-->
+<script>$(window).scroll(function(){50<$(".navbar").offset().top?$(".navbar-fixed-top").addClass("top-nav-collapse"):$(".navbar-fixed-top").removeClass("top-nav-collapse")});$(function(){$("a.page-scroll").bind("click",function(b){var a=$(this);$("html, body").stop().animate({scrollTop:$(a.attr("href")).offset().top},1500,"easeInOutExpo",function(){a.blur()});b.preventDefault()})});$(".navbar-collapse ul li a").click(function(){$(".navbar-toggle:visible").click()});</script>
 
 {% if site.google-tracking-id %}
 

diff --git a/img/career/baracktocat.jpg b/img/career/baracktocat.jpg
diff --git a/img/career/default.png b/img/career/default.png
diff --git a/img/career/spidertocat.png b/img/career/spidertocat.png
diff --git a/img/intro-bg.jpg b/img/intro-bg.jpg
diff --git a/img/jetpacktocat.png b/img/jetpacktocat.png
diff --git a/img/labtocat.png b/img/labtocat.png
diff --git a/js/grayscale.js b/js/grayscale.js