diff options
| author | Mark Otto <[email protected]> | 2015-06-19 16:26:33 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-06-19 16:26:33 -0700 |
| commit | bc29c016b7afefa2a9a42e94efaee58695049285 (patch) | |
| tree | ac294f7fbc18d4ba8c6b4179b7d1cbeb6481d70b /grunt | |
| parent | 8410afe0e104459a613f6232ad46334aa8b99fda (diff) | |
| parent | 3df2d085ed219a16848b96e90a72fcd5575a5270 (diff) | |
| download | bootstrap-bc29c016b7afefa2a9a42e94efaee58695049285.tar.xz bootstrap-bc29c016b7afefa2a9a42e94efaee58695049285.zip | |
Merge branch 'v4' into v4_builds
Diffstat (limited to 'grunt')
| -rw-r--r-- | grunt/bs-commonjs-generator.js | 10 | ||||
| -rw-r--r-- | grunt/configBridge.json | 9 | ||||
| -rw-r--r-- | grunt/sauce_browsers.yml | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/grunt/bs-commonjs-generator.js b/grunt/bs-commonjs-generator.js index 700b839ce..402a7b742 100644 --- a/grunt/bs-commonjs-generator.js +++ b/grunt/bs-commonjs-generator.js @@ -1,3 +1,10 @@ +/*! + * Bootstrap Grunt task for the CommonJS module generation + * http://getbootstrap.com + * Copyright 2014-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + 'use strict'; var fs = require('fs'); @@ -15,8 +22,7 @@ module.exports = function generateCommonJSModule(grunt, srcFiles, destFilepath) var moduleOutputJs = COMMONJS_BANNER + srcFiles.map(srcPathToDestRequire).join('\n'); try { fs.writeFileSync(destFilepath, moduleOutputJs); - } - catch (err) { + } catch (err) { grunt.fail.warn(err); } grunt.log.writeln('File ' + destFilepath.cyan + ' created.'); diff --git a/grunt/configBridge.json b/grunt/configBridge.json index 786a7e1f6..2c245244a 100644 --- a/grunt/configBridge.json +++ b/grunt/configBridge.json @@ -1,12 +1,11 @@ { "paths": { "docsJs": [ - - "assets/js/vendor/holder.js", + "../assets/js/vendor/holder.min.js", "assets/js/vendor/jekyll-search.js", - "assets/js/vendor/ZeroClipboard.min.js", - "assets/js/vendor/anchor.js", - "assets/js/src/application.js" + "../assets/js/vendor/ZeroClipboard.min.js", + "../assets/js/vendor/anchor.js", + "../assets/js/src/application.js" ] }, "config": { diff --git a/grunt/sauce_browsers.yml b/grunt/sauce_browsers.yml index 5a52dce25..069e11de5 100644 --- a/grunt/sauce_browsers.yml +++ b/grunt/sauce_browsers.yml @@ -46,7 +46,7 @@ { browserName: "iphone", platform: "OS X 10.10", - version: "8.1" + version: "8.2" }, # iOS Chrome not currently supported by Sauce Labs |