From 97fc8158d92ece1e018b8786bf19d248fa356f38 Mon Sep 17 00:00:00 2001
From: Dave Rapin <dave@rapin.com>
Date: Wed, 9 Oct 2013 09:20:00 -0400
Subject: [PATCH] Switched to bootstrap-assets bower component so we have css
 and js files instead of less. When this project moves to BS3, change this
 back to the main bootstrap repo and use the dist directory.

---
 app/views/includes/foot.jade |  4 ++--
 app/views/includes/head.jade |  4 ++--
 bower.json                   | 14 ++------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade
index fc890c4c..0ed95b26 100755
--- a/app/views/includes/foot.jade
+++ b/app/views/includes/foot.jade
@@ -1,7 +1,7 @@
 script(type='text/javascript', src='/lib/jquery/jquery.js')
 
 //Bootstrap
-script(type='text/javascript', src='/lib/bootstrap/js/bootstrap.js')
+script(type='text/javascript', src='/lib/bootstrap-assets/js/bootstrap.js')
 
 //AngularJS
 script(type='text/javascript', src='/lib/angular/angular.js')
@@ -10,7 +10,7 @@ script(type='text/javascript', src='/lib/angular-resource/angular-resource.js')
 
 //Angular UI
 script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.js')
-script(type='text/javascript', src='/lib/angular-ui-utils/modules/route.js')
+script(type='text/javascript', src='/lib/angular-ui-utils/modules/route/route.js')
 
 //Application Init
 script(type='text/javascript', src='/js/app.js')
diff --git a/app/views/includes/head.jade b/app/views/includes/head.jade
index 8bd0f416..07d1d486 100755
--- a/app/views/includes/head.jade
+++ b/app/views/includes/head.jade
@@ -19,8 +19,8 @@ head
   meta(property='og:site_name', content='MEAN - A Modern Stack')
   meta(property='fb:admins', content='APP_ADMIN')
 
-  link(rel='stylesheet', href='/lib/bootstrap/css/bootstrap.css')
-  link(rel='stylesheet', href='/lib/bootstrap/css/bootstrap-responsive.css')
+  link(rel='stylesheet', href='/lib/bootstrap-assets/css/bootstrap.css')
+  link(rel='stylesheet', href='/lib/bootstrap-assets/css/bootstrap-responsive.css')
   link(rel='stylesheet', href='/css/common.css')
 
   link(rel='stylesheet', href='/css/views/articles.css')
diff --git a/bower.json b/bower.json
index 10648432..e00fcd87 100644
--- a/bower.json
+++ b/bower.json
@@ -2,7 +2,7 @@
     "name": "mean",
     "version": "1.0.0",
     "dependencies": {
-        "bootstrap": "2.3.2",
+        "bootstrap-assets": "2.3.2",
         "angular": "~1.0.6",
         "angular-resource": "~1.0.6",
         "angular-cookies": "~1.0.6",
@@ -10,15 +10,5 @@
         "angular-ui-utils": "0.0.4",
         "json3": "~3.2.4",
         "jquery": "~1.9.1"
-    },
-    "exportsOverride": {
-    	"bootstrap": {
-    		"css": "docs/assets/css/bootstrap*.css",
-    		"js": "docs/assets/js/bootstrap.js",
-    		"img": "docs/assets/img/glyphicons-halflings*.png"
-    	},
-        "angular-ui-utils": {
-            "modules": "modules/route/route.js"
-        }
     }
-}
\ No newline at end of file
+}