Merge pull request #961 from AshleyGrant/fix_jquery_3_and_bootstrap

fix bootstrap 3.3.7 and add jquery 3.1.0 overrides
This commit is contained in:
Guy Bedford
2016-08-25 15:06:53 +02:00
committed by GitHub
2 changed files with 22 additions and 11 deletions
@@ -1,12 +1,20 @@
{ {
"main": "dist/js/bootstrap.js", "main": "js/bootstrap.js",
"shim": { "shim": {
"dist/js/bootstrap": { "js/bootstrap": {
"deps": ["jquery"], "deps": [
"exports": "$" "jquery"
} ],
}, "exports": "$"
"dependencies": { }
"jquery": "*" },
} "dependencies": {
} "jquery": "jspm:jquery@*"
},
"files": [
"dist",
"fonts",
"js",
"css"
]
}
+3
View File
@@ -0,0 +1,3 @@
{
"format": "amd"
}