From c64a8cfc72c2c6ef1b766aeb019b22dc75f6d6bd Mon Sep 17 00:00:00 2001 From: fat Date: Mon, 19 Aug 2013 12:19:00 -0700 Subject: [PATCH 1/2] add glyphicons to customizer --- Gruntfile.js | 6 +++--- assets/js/customizer.js | 18 ++++++++++++++++-- customize.html | 6 ++++-- validation-status.json | 1 + 4 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 validation-status.json diff --git a/Gruntfile.js b/Gruntfile.js index 79f5715d87..5aebcd8b7a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -202,7 +202,7 @@ module.exports = function(grunt) { var files = {} fs.readdirSync(type) .filter(function (path) { - return new RegExp('\\.' + type + '$').test(path) + return type == 'fonts' ? true : new RegExp('\\.' + type + '$').test(path) }) .forEach(function (path) { return files[path] = fs.readFileSync(type + '/' + path, 'utf8') @@ -211,7 +211,7 @@ module.exports = function(grunt) { } var customize = fs.readFileSync('customize.html', 'utf-8') - var files = '\n - + \ No newline at end of file diff --git a/validation-status.json b/validation-status.json new file mode 100644 index 0000000000..88c41e9dc4 --- /dev/null +++ b/validation-status.json @@ -0,0 +1 @@ +{"_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} \ No newline at end of file From c2d5861232628a3918ff1eaf773cd040ceb8e5a9 Mon Sep 17 00:00:00 2001 From: fat Date: Mon, 19 Aug 2013 12:22:42 -0700 Subject: [PATCH 2/2] update gruntfile not to run validation + remove validation status --- Gruntfile.js | 2 +- validation-status.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 validation-status.json diff --git a/Gruntfile.js b/Gruntfile.js index 5aebcd8b7a..5fa37a0c76 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -169,7 +169,7 @@ module.exports = function(grunt) { grunt.registerTask('validate-html', ['jekyll', 'validation']); // Test task. - var testSubtasks = ['dist-css', 'jshint', 'qunit', 'validate-html']; + var testSubtasks = ['dist-css', 'jshint', 'qunit']; // 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 diff --git a/validation-status.json b/validation-status.json deleted file mode 100644 index 88c41e9dc4..0000000000 --- a/validation-status.json +++ /dev/null @@ -1 +0,0 @@ -{"_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} \ No newline at end of file