Update to bootstrap 2.3.0

rcbops · Feb 20, 2013 · 6d97710 · 6d97710
1 parent 4b5aeef
commit 6d97710
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ devbuild:
 	@echo ${HR}
 	@echo "Building Bootstrap"
 	@echo ${HR}
-	cd components/bootstrap; $(MAKE) bootstrap
+	cd components/bootstrap; npm install; $(MAKE) bootstrap
 	@echo ${HR}
 	@echo "Building jQuery"
 	@echo ${HR}

diff --git a/component.json b/component.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "main": "./ntrapy.js",
   "dependencies": {
-    "bootstrap": "2.2.2",
+    "bootstrap": "2.3.0",
     "jquery": "1.9.1",
     "jquery-ui": "1.10.0",
     "jquery.validation": "1.11.0",

diff --git a/source/css/bootstrap-responsive.min.css b/source/css/bootstrap-responsive.min.css
diff --git a/source/css/bootstrap.min.css b/source/css/bootstrap.min.css
diff --git a/source/img/glyphicons-halflings-white.png b/source/img/glyphicons-halflings-white.png
diff --git a/source/img/glyphicons-halflings.png b/source/img/glyphicons-halflings.png
diff --git a/source/js/bootstrap.min.js b/source/js/bootstrap.min.js