diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /grunt | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to 'grunt')
| -rw-r--r-- | grunt/.jshintrc | 7 | ||||
| -rw-r--r-- | grunt/bs-commonjs-generator.js | 2 | ||||
| -rw-r--r-- | grunt/configBridge.json | 13 |
3 files changed, 2 insertions, 20 deletions
diff --git a/grunt/.jshintrc b/grunt/.jshintrc deleted file mode 100644 index 0ea0495e9..000000000 --- a/grunt/.jshintrc +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends" : "../js/.jshintrc", - "asi" : false, - "browser" : false, - "es3" : false, - "node" : true -} diff --git a/grunt/bs-commonjs-generator.js b/grunt/bs-commonjs-generator.js index 402a7b742..af85f4772 100644 --- a/grunt/bs-commonjs-generator.js +++ b/grunt/bs-commonjs-generator.js @@ -16,7 +16,7 @@ module.exports = function generateCommonJSModule(grunt, srcFiles, destFilepath) var destDir = path.dirname(destFilepath); function srcPathToDestRequire(srcFilepath) { - return 'require(\'' + srcFilepath + '\')'; + return 'require(\'' + srcFilepath.replace(/\\/g, '/') + '\')'; } var moduleOutputJs = COMMONJS_BANNER + srcFiles.map(srcPathToDestRequire).join('\n'); diff --git a/grunt/configBridge.json b/grunt/configBridge.json index 4b511136b..82e3ce06c 100644 --- a/grunt/configBridge.json +++ b/grunt/configBridge.json @@ -2,24 +2,13 @@ "paths": { "docsJs": [ "../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/vendor/anchor.min.js", "../assets/js/vendor/tether.min.js", "../assets/js/src/application.js" ] }, "config": { - "autoprefixerBrowsers": [ - "Android 2.3", - "Android >= 4", - "Chrome >= 20", - "Firefox >= 24", - "Explorer >= 8", - "iOS >= 6", - "Opera >= 12", - "Safari >= 6" - ], "jqueryCheck": [ "if (typeof jQuery === 'undefined') {", " throw new Error('Bootstrap\\'s JavaScript requires jQuery')", |