aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfat <[email protected]>2013-12-29 19:25:24 -0800
committerfat <[email protected]>2013-12-29 19:25:24 -0800
commit1fea9656b604cd23e42be928e398969320b3b5ff (patch)
tree03e564f9206556efb4a95df1973d883ed8275bdf
parent2a0b99104c596952bdac6a40053843dfba98534f (diff)
parent3d3e2f2553e7ecdece141df99278404660e42e0e (diff)
downloadbootstrap-1fea9656b604cd23e42be928e398969320b3b5ff.tar.xz
bootstrap-1fea9656b604cd23e42be928e398969320b3b5ff.zip
Merge branch 'master' of github.com:twbs/bootstrap
-rw-r--r--Gruntfile.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 6107ecafd..46d5184b0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,7 +9,10 @@ module.exports = function (grunt) {
RegExp.quote = function (string) {
return string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&')
}
+
+ var fs = require('fs')
var btoa = require('btoa')
+
// Project configuration.
grunt.initConfig({
@@ -320,8 +323,6 @@ module.exports = function (grunt) {
grunt.registerTask('change-version-number', ['sed']);
grunt.registerTask('build-glyphicons-data', function () {
- var fs = require('fs')
-
// Pass encoding, utf8, so `readFileSync` will return a string instead of a
// buffer
var glyphiconsFile = fs.readFileSync('less/glyphicons.less', 'utf8')
@@ -347,8 +348,6 @@ module.exports = function (grunt) {
// task for building customizer
grunt.registerTask('build-customizer', 'Add scripts/less files to customizer.', function () {
- var fs = require('fs')
-
function getFiles(type) {
var files = {}
fs.readdirSync(type)