Permalink
Browse files

modified application.scss

  • Loading branch information...
1 parent 89b72ea commit 29c6c1c75122fe7c9f24af2d7bb004a1f7895812 Phillip Lackey committed Mar 27, 2013
Showing with 6 additions and 4 deletions.
  1. +3 −1 app/assets/javascripts/application.js
  2. +3 −3 app/views/layouts/application.html.erb
@@ -12,6 +12,8 @@
//
//= require jquery
//= require jquery_ujs
+//= require html5shim
//= require bootstrap
//= require jquery.quicksand
-//= require jquery.flexslider-min
+//= require jquery.flexslider-min
+//= require script
@@ -468,10 +468,10 @@
<script src="assets/bootstrap-carousel.js"></script>
<script src="assets/bootstrap-typeahead.js"></script> -->
<!--Non-Bootstrap JS-->
-<script src="assets/jquery.quicksand.js"></script>
-<script src="assets/jquery.flexslider-min.js"></script>
+<!-- <script src="assets/jquery.quicksand.js"></script>
+<script src="assets/jquery.flexslider-min.js"></script> -->
<!--Custom scripts mainly used to trigger libraries -->
-<script src="assets/script.js"></script>
+<!-- <script src="assets/script.js"></script> -->
</body>
</html>

0 comments on commit 29c6c1c

Please sign in to comment.