Merge branch 'master' of github.com:jquery/web-base-template

Author: darcyclarke

index.html

@@ -394,7 +394,6 @@ <h3><span>Books</span></h3>
 <script src="resources/js/plugins/jquery.infieldlabel.min.js"></script>
 <script src="resources/js/plugins/app.base.js"></script>
 <script src="resources/js/plugins.js"></script>
-
 <script src="resources/js/scripts.js"></script>
 
 <!-- /scripts -->

resources/css/style.css

@@ -1,4 +1,4 @@
-@import "syntax.css";
+@import url("syntax.css");
 
 /* ------------------------------------------------------------------------------
    ================================================== */

resources/js/plugins/syntaxhighlighter.min.js

@@ -1,8 +1,6 @@
-// The plugin included by SyntaxHighlighter breaks Number
-// parsing in the jQuery Animate function. You must use
-// strings instead of numbers so it still works.
-jQuery.InFieldLabels.defaultOptions.defaultOpacity = "1.0";
-jQuery.InFieldLabels.defaultOptions.fadeOpacity    = "0.5";
+
+jQuery.InFieldLabels.defaultOptions.defaultOpacity = 1;
+jQuery.InFieldLabels.defaultOptions.fadeOpacity    = 0.5;
 
 
 //