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.

This commit is contained in:
Dave Rapin
2013-10-09 09:20:00 -04:00
parent 5908768241
commit 97fc8158d9
3 changed files with 6 additions and 16 deletions

View File

@@ -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')

View File

@@ -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')

View File

@@ -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"
}
}
}
}