Browse Source

bootstrap 2 as 'bootstrap2.3.2' in bower dependencies

This is the name it is distributed in bower,
and will not clash with 'bootstrap' if someone needs bootstrap 3.
Herbert Vojčík 10 năm trước cách đây
mục cha
commit
99f216c2c5
2 tập tin đã thay đổi với 2 bổ sung2 xóa
  1. 1 1
      bower.json
  2. 1 1
      support/helios/all.js

+ 1 - 1
bower.json

@@ -15,7 +15,7 @@
   "dependencies": {
     "jquery": "~1.10.2",
     "jquery-ui": "~1.10.3",
-    "bootstrap": "bootstrap2.3.2#~2.3.2",
+    "bootstrap2.3.2": "~2.3.2",
     "jquery-tabby": "git://github.com/alanhogan/Tabby",
     "es5-shim": "~3.3.0",
     "codemirror": "~3.24.0",

+ 1 - 1
support/helios/all.js

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