Merge pull request #1023 from herby/bootstrap2-legacy-name

Bootstrap2 legacy name

bower.json

@@ -13,9 +13,9 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "~1.10.2",
-    "jquery-ui": "~1.10.3",
-    "bootstrap": "bootstrap2.3.2#~2.3.2",
+    "jquery": ">=1.7.0",
+    "jquery-ui": ">=1.9.2",
+    "bootstrap2.3.2": "~2.3.2",
     "jquery-tabby": "git://github.com/alanhogan/Tabby",
     "es5-shim": "~3.3.0",
     "codemirror": "~3.24.0",

support/helios/all.js

@@ -1,14 +1,14 @@
 require.config({
 	paths: {
-        'amber_lib/bootstrap': require.toUrl('amber_lib') + '/bootstrap/bootstrap',
+		'bootstrap2.3.2': require.toUrl('amber_lib') + '/bootstrap2.3.2/bootstrap',
 		'jquery-ui': require.toUrl('amber_lib/jquery-ui/ui/minified/jquery-ui.min')
 	},
 	shim: {
 		'jquery-ui': {
 			deps: [ 'jquery' ]
 		},
-		'amber_lib/bootstrap/js/bootstrap': {
-			deps: [ 'jquery', 'css!amber_lib/bootstrap/css/bootstrap' ]
+		'bootstrap2.3.2/js/bootstrap': {
+			deps: [ 'jquery', 'css!bootstrap2.3.2/css/bootstrap' ]
 		},
 		'amber_lib/jquery-tabby/jquery.textarea': {
 			deps: [ 'jquery' ]

support/helios/resources/all-inner.js

@@ -4,7 +4,7 @@
 
 define([
 	'amber/devel-inner',
-	'amber_lib/bootstrap/js/bootstrap',
+	'bootstrap2.3.2/js/bootstrap',
 	'amber_lib/showdown/compressed/showdown',
 	'helios/Helios-Core',
 	'helios/Helios-Exceptions',