Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

Commit

Permalink
Switched to bootstrap-assets bower component so we have css and js fi…
Browse files Browse the repository at this point in the history
…les instead of less. When this project moves to BS3, change this back to the main bootstrap repo and use the dist directory.
  • Loading branch information
rapind committed Oct 9, 2013
1 parent 5908768 commit 97fc815
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
4 changes: 2 additions & 2 deletions app/views/includes/foot.jade
Original file line number Diff line number Diff line change
@@ -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')
Expand All @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions app/views/includes/head.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
14 changes: 2 additions & 12 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,13 @@
"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",
"angular-bootstrap": "~0.4.0",
"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"
}
}
}
}

0 comments on commit 97fc815

Please sign in to comment.