瀏覽代碼

Merge pull request #1005 from herby/different-source-of-232

Different source of bootstrap 2.3.2. Fixes issue pointed by @siemenbaade...
Nicolas Petton 10 年之前
父節點
當前提交
ec49278b64
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 1
      bower.json
  2. 1 0
      support/helios/all.js

+ 1 - 1
bower.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "jquery": "~1.10.2",
     "jquery-ui": "~1.10.3",
-    "bootstrap": "http://getbootstrap.com/2.3.2/assets/bootstrap.zip",
+    "bootstrap": "bootstrap2.3.2#~2.3.2",
     "jquery-tabby": "git://github.com/alanhogan/Tabby",
     "es5-shim": "~2.1.0",
     "codemirror": "~3.20.0",

+ 1 - 0
support/helios/all.js

@@ -1,5 +1,6 @@
 require.config({
 	paths: {
+        'amber_lib/bootstrap': require.toUrl('amber_lib') + '/bootstrap/bootstrap',
 		'jquery-ui': require.toUrl('amber_lib/jquery-ui/ui/minified/jquery-ui.min')
 	},
 	shim: {