aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-02-04 15:33:58 -0800
committerChris Rebert <[email protected]>2014-02-04 15:33:58 -0800
commitcc9242aa86cba3fe3c6cd33a0d6d256e67ad478d (patch)
treeec42a6ec9708fc95c342c0bda50b3b9c74e6eeed
parentcd8a896ce6b1ebd210916932c3776b1f25f83e55 (diff)
parent46f9d27142ed81cfbcc0dc7806829756357a7505 (diff)
downloadbootstrap-cc9242aa86cba3fe3c6cd33a0d6d256e67ad478d.tar.xz
bootstrap-cc9242aa86cba3fe3c6cd33a0d6d256e67ad478d.zip
Merge pull request #12583 from twbs/grunt-directory
reorganize all grunt tasks into one directory
-rw-r--r--Gruntfile.js8
-rw-r--r--grunt/bs-glyphicons-data-generator.js (renamed from docs/grunt/bs-glyphicons-data-generator.js)0
-rw-r--r--grunt/bs-lessdoc-parser.js (renamed from docs/grunt/bs-lessdoc-parser.js)0
-rw-r--r--grunt/bs-raw-files-generator.js (renamed from docs/grunt/bs-raw-files-generator.js)0
-rw-r--r--grunt/shrinkwrap.js (renamed from test-infra/shrinkwrap.js)0
5 files changed, 4 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 55c4e46de..acef4100a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,10 +17,10 @@ module.exports = function (grunt) {
var fs = require('fs');
var path = require('path');
- var generateGlyphiconsData = require('./docs/grunt/bs-glyphicons-data-generator.js');
- var BsLessdocParser = require('./docs/grunt/bs-lessdoc-parser.js');
- var generateRawFilesJs = require('./docs/grunt/bs-raw-files-generator.js');
- var updateShrinkwrap = require('./test-infra/shrinkwrap.js');
+ var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js');
+ var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js');
+ var generateRawFilesJs = require('./grunt/bs-raw-files-generator.js');
+ var updateShrinkwrap = require('./grunt/shrinkwrap.js');
// Project configuration.
grunt.initConfig({
diff --git a/docs/grunt/bs-glyphicons-data-generator.js b/grunt/bs-glyphicons-data-generator.js
index 3e32698a1..3e32698a1 100644
--- a/docs/grunt/bs-glyphicons-data-generator.js
+++ b/grunt/bs-glyphicons-data-generator.js
diff --git a/docs/grunt/bs-lessdoc-parser.js b/grunt/bs-lessdoc-parser.js
index 9d0b2ffaf..9d0b2ffaf 100644
--- a/docs/grunt/bs-lessdoc-parser.js
+++ b/grunt/bs-lessdoc-parser.js
diff --git a/docs/grunt/bs-raw-files-generator.js b/grunt/bs-raw-files-generator.js
index 255508b7f..255508b7f 100644
--- a/docs/grunt/bs-raw-files-generator.js
+++ b/grunt/bs-raw-files-generator.js
diff --git a/test-infra/shrinkwrap.js b/grunt/shrinkwrap.js
index 7a0328d41..7a0328d41 100644
--- a/test-infra/shrinkwrap.js
+++ b/grunt/shrinkwrap.js