diff options
| author | Chris Rebert <[email protected]> | 2014-12-17 22:36:25 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-12-17 22:36:25 -0800 |
| commit | 7d2b64cbc593c660c5d73b71b3c4364f73c8b533 (patch) | |
| tree | e4801bf6eae80f8e590509bce89f24ad6ec2c226 /grunt | |
| parent | 90f4767d06641a44a2563f53e779fb572ba9ea60 (diff) | |
| parent | 1afc0eec3095514eeeee491d7a036ab576b5a6d9 (diff) | |
| download | bootstrap-7d2b64cbc593c660c5d73b71b3c4364f73c8b533.tar.xz bootstrap-7d2b64cbc593c660c5d73b71b3c4364f73c8b533.zip | |
Merge pull request #36 from twbs/trim-config-bridge
Move stuff out of configBridge.json now that the Customizer is kaput
Diffstat (limited to 'grunt')
| -rw-r--r-- | grunt/configBridge.json | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/grunt/configBridge.json b/grunt/configBridge.json index 54fa7cef4..a0f3d8c4d 100644 --- a/grunt/configBridge.json +++ b/grunt/configBridge.json @@ -5,30 +5,5 @@ "../assets/js/vendor/ZeroClipboard.min.js", "../assets/js/src/application.js" ] - }, - "config": { - "autoprefixerBrowsers": [ - "Android 2.3", - "Android >= 4", - "Chrome >= 20", - "Firefox >= 31", - "Explorer >= 9", - "iOS >= 6", - "Opera >= 12", - "Safari >= 6" - ], - "jqueryCheck": [ - "if (typeof jQuery === 'undefined') {", - " throw new Error('Bootstrap\\'s JavaScript requires jQuery')", - "}\n" - ], - "jqueryVersionCheck": [ - "+function ($) {", - " var version = $.fn.jquery.split(' ')[0].split('.')", - " if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {", - " throw new Error('Bootstrap\\'s JavaScript requires jQuery version 1.9.1 or higher')", - " }", - "}(jQuery);\n\n" - ] } } |