refactor(dependencies): update dependencies for bootstrap 3 upgrade @lefnire

This commit is contained in:
Matteo Pagliazzi 2014-01-29 16:44:12 +01:00
parent f03d7d7dde
commit f0ebd597b3
3 changed files with 11 additions and 21 deletions

View file

@ -14,20 +14,22 @@
"tests"
],
"dependencies": {
"jquery": "~2.0.3",
"jquery": "~2.1.0",
"jquery.cookie": "~1.4.0",
"jquery-ui": "~1.10.3",
"angular": "~1.2.1",
"angular-sanitize": "~1.2.1",
"angular-resource": "~1.2.1",
"angular-ui": "~0.4.0",
"angular-bootstrap": "~0.5.0",
"angular-ui-utils": "~0.1.0",
"angular-ui-select2": "https://github.com/angular-ui/ui-select2.git#4469fd7a32eba2e28d5e3dd319b49e1ad090b167",
"angular-bootstrap": "~0.10.0",
"angular-ui-router": "ca3b4777a603df8f86cfd653c8f6c38b2ae05d89",
"angular-loading-bar": "~0.0.5",
"angular-loading-bar": "~0.3.0",
"angular-bindonce": "~0.2.1",
"bootstrap": "v2.3.2",
"bootstrap-datepicker": "~1.2.0",
"bootstrap": "~3.0.3",
"bootstrap-datepicker": "1.3.0",
"bootstrap-growl": "~1.1.0",
"bootstrap-tour": "~0.8.1",
"habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#develop",
"BrowserQuest": "https://github.com/mozilla/BrowserQuest.git",
"github-buttons": "git://github.com/mdo/github-buttons.git",
@ -37,11 +39,8 @@
"js-emoji": "git://github.com/snicker/js-emoji#master",
"gemoji": "git://github.com/github/gemoji",
"sticky": "*",
"bootstrap-tour": "~0.8.0",
"angular-ui-utils": "~0.1.0",
"swagger-ui": "https://github.com/wordnik/swagger-ui.git#105c516f5f055b140e935e9cfe0c36f841921dff",
"ngInfiniteScroll": "~1.0.0",
"angular-ui-select2": "https://github.com/angular-ui/ui-select2.git#4469fd7a32eba2e28d5e3dd319b49e1ad090b167"
"ngInfiniteScroll": "~1.0.0"
},
"devDependencies": {
"angular-mocks": "~1.2.1"

View file

@ -4,8 +4,6 @@
// Vendor Includes - include first so we can override
// Import only styles that do not have urls to images! Include them directly in the page!
@import "../bower_components/bootstrap-datepicker/css/datepicker.css"
@import "../bower_components/angular-ui/build/angular-ui.min.css"
@import "../bower_components/bootstrap/docs/assets/css/bootstrap-responsive.css"
@import "../bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css"
@import "../bower_components/angular-loading-bar/build/loading-bar.css"
@import "../bower_components/js-emoji/emoji.css"

View file

@ -10,7 +10,6 @@
"bower_components/marked/lib/marked.js",
"bower_components/angular-ui-router/release/angular-ui-router.js",
"bower_components/angular-resource/angular-resource.min.js",
"bower_components/angular-ui/build/angular-ui.js",
"bower_components/angular-ui-utils/ui-utils.min.js",
"bower_components/angular-loading-bar/build/loading-bar.js",
"bower_components/Angular-At-Directive/src/at.js",
@ -22,7 +21,6 @@
"bower_components/select2/select2.js",
"bower_components/angular-ui-select2/src/select2.js",
"bower_components/bootstrap/docs/assets/js/bootstrap.js",
"bower_components/angular-bootstrap/ui-bootstrap.js",
"bower_components/angular-bootstrap/ui-bootstrap-tpls.js",
@ -63,7 +61,7 @@
"js/controllers/hallCtrl.js"
],
"css": [
"bower_components/bootstrap/docs/assets/css/bootstrap.css",
"bower_components/bootstrap/dist/css/bootstrap.css",
"app.css",
"bower_components/habitrpg-shared/dist/habitrpg-shared.css"
]
@ -74,9 +72,6 @@
"bower_components/habitrpg-shared/dist/habitrpg-shared.js",
"bower_components/angular/angular.js",
"bower_components/bootstrap/docs/assets/js/bootstrap.js",
"bower_components/angular-ui/build/angular-ui.js",
"bower_components/angular-bootstrap/ui-bootstrap.js",
"bower_components/angular-bootstrap/ui-bootstrap-tpls.js",
@ -87,9 +82,7 @@
"js/controllers/authCtrl.js"
],
"css": [
"bower_components/bootstrap/docs/assets/css/bootstrap.css",
"bower_components/bootstrap/docs/assets/css/bootstrap-responsive.css",
"bower_components/bootstrap/docs/assets/css/docs.css",
"bower_components/bootstrap/dist/css/bootstrap.css",
"static.css"
]