Merge branch 'master' into gh-pages

Gruntfile.js

@@ -169,7 +169,7 @@ module.exports = function(grunt) {
   grunt.registerTask('validate-html', ['jekyll', 'validation']);
 
   // Test task.
-  var testSubtasks = ['dist-css', 'jshint', 'qunit'];
+  var testSubtasks = ['dist-css', 'jshint', 'qunit', 'validate-html'];
   // Only run BrowserStack tests under Travis
   if (process.env.TRAVIS) {
     // Only run BrowserStack tests if this is a mainline commit in twbs/bootstrap, or you have your own BrowserStack key
@@ -211,7 +211,7 @@ module.exports = function(grunt) {
     }
 
     var customize = fs.readFileSync('customize.html', 'utf-8')
-    var files = '{% raw %}<!-- generated -->\n<script id="files">\n' + getFiles('js') + getFiles('less') + getFiles('fonts') + '<\/script>\n<!-- /generated -->{% endraw %}'
-    fs.writeFileSync('customize.html', customize.replace(/<!-- generated -->(.|[\n\r])*<!-- \/generated -->/, '') + files)
+    var files = getFiles('js') + getFiles('less') + getFiles('fonts')
+    fs.writeFileSync('assets/js/raw-files.js', files)
   });
-};
+};
\ No newline at end of file

_includes/footer.html

@@ -14,6 +14,7 @@
 <script src="{{ page.base_url }}assets/js/jszip.js"></script>
 <script src="{{ page.base_url }}assets/js/uglify.js"></script>
 <script src="{{ page.base_url }}assets/js/filesaver.js"></script>
+<script src="{{ page.base_url }}assets/js/raw-files.js"></script>
 <script src="{{ page.base_url }}assets/js/customizer.js"></script>
 {% endif %}
 

validation-report.json

+[{"filename":"_gh_pages/components/index.html","error":false},{"filename":"_gh_pages/css/index.html","error":false},{"filename":"_gh_pages/customize/index.html","error":false},{"filename":"_gh_pages/examples/carousel/index.html","error":false},{"filename":"_gh_pages/examples/grid/index.html","error":false},{"filename":"_gh_pages/examples/jumbotron-narrow/index.html","error":false},{"filename":"_gh_pages/examples/jumbotron/index.html","error":false},{"filename":"_gh_pages/examples/justified-nav/index.html","error":false},{"filename":"_gh_pages/examples/navbar-fixed-top/index.html","error":false},{"filename":"_gh_pages/examples/navbar-static-top/index.html","error":false},{"filename":"_gh_pages/examples/navbar/index.html","error":false},{"filename":"_gh_pages/examples/non-responsive/index.html","error":false},{"filename":"_gh_pages/examples/offcanvas/index.html","error":false},{"filename":"_gh_pages/examples/signin/index.html","error":false},{"filename":"_gh_pages/examples/starter-template/index.html","error":false},{"filename":"_gh_pages/examples/sticky-footer-navbar/index.html","error":false},{"filename":"_gh_pages/examples/sticky-footer/index.html","error":false},{"filename":"_gh_pages/examples/theme/index.html","error":false},{"filename":"_gh_pages/getting-started/index.html","error":false},{"filename":"_gh_pages/index.html","error":false},{"filename":"_gh_pages/javascript/index.html","error":false},{"filename":"_gh_pages/js/tests/index.html","error":false}]
\ No newline at end of file

validation-status.json

+{"_gh_pages/components/index.html":true,"_gh_pages/css/index.html":true,"_gh_pages/customize/index.html":true,"_gh_pages/examples/carousel/index.html":true,"_gh_pages/examples/grid/index.html":true,"_gh_pages/examples/jumbotron-narrow/index.html":true,"_gh_pages/examples/jumbotron/index.html":true,"_gh_pages/examples/justified-nav/index.html":true,"_gh_pages/examples/navbar-fixed-top/index.html":true,"_gh_pages/examples/navbar-static-top/index.html":true,"_gh_pages/examples/navbar/index.html":true,"_gh_pages/examples/non-responsive/index.html":true,"_gh_pages/examples/offcanvas/index.html":true,"_gh_pages/examples/signin/index.html":true,"_gh_pages/examples/starter-template/index.html":true,"_gh_pages/examples/sticky-footer-navbar/index.html":true,"_gh_pages/examples/sticky-footer/index.html":true,"_gh_pages/examples/theme/index.html":true,"_gh_pages/getting-started/index.html":true,"_gh_pages/index.html":true,"_gh_pages/javascript/index.html":true,"_gh_pages/js/tests/index.html":true}
\ No newline at end of file