upgrade bower version make component move to bower_component

buildbot · Aug 6, 2013 · 4a7896a · 4a7896a
1 parent 28dccf9
commit 4a7896a
Show file tree

Hide file tree

Showing 22 changed files with 18 additions and 72 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,4 +44,4 @@ www/package.json
 www/bower.json
 www/VERSION
 www/node_modules
-www/components
+www/bower_components
diff --git a/www/setup.py b/www/setup.py
@@ -103,6 +103,7 @@
     "font-awesome": "latest",
     "angular": "latest",
     "angular-resource": "latest",
+    "angular-bootstrap": "latest",
     "restangular": "latest",
     "lodash": "latest",
     "html5shiv": "~3.6.2",

diff --git a/www/src/font/FontAwesome.otf b/www/src/font/FontAwesome.otf
diff --git a/www/src/font/fontawesome-webfont.eot b/www/src/font/fontawesome-webfont.eot
@@ -1 +1 @@
-../../components/font-awesome/font/fontawesome-webfont.eot
+../../bower_components/font-awesome/font/fontawesome-webfont.eot
diff --git a/www/src/font/fontawesome-webfont.svg b/www/src/font/fontawesome-webfont.svg
@@ -1 +1 @@
-../../components/font-awesome/font/fontawesome-webfont.svg
+../../bower_components/font-awesome/font/fontawesome-webfont.svg
diff --git a/www/src/font/fontawesome-webfont.ttf b/www/src/font/fontawesome-webfont.ttf
@@ -1 +1 @@
-../../components/font-awesome/font/fontawesome-webfont.ttf
+../../bower_components/font-awesome/font/fontawesome-webfont.ttf
diff --git a/www/src/font/fontawesome-webfont.woff b/www/src/font/fontawesome-webfont.woff
@@ -1 +1 @@
-../../components/font-awesome/font/fontawesome-webfont.woff
+../../bower_components/font-awesome/font/fontawesome-webfont.woff
diff --git a/www/src/scripts/app.coffee b/www/src/scripts/app.coffee
@@ -1 +1 @@
-angular.module 'app', ['restangular']
+angular.module 'app', ['restangular', 'ui.bootstrap']
diff --git a/www/src/scripts/libs/angular-resource.js b/www/src/scripts/libs/angular-resource.js
diff --git a/www/src/scripts/libs/angular.js b/www/src/scripts/libs/angular.js
@@ -1 +1 @@
-../../../components/angular/angular.js
+../../../bower_components/angular/angular.js
diff --git a/www/src/scripts/libs/html5shiv-printshiv.js b/www/src/scripts/libs/html5shiv-printshiv.js
@@ -1 +1 @@
-../../../components/html5shiv/dist/html5shiv-printshiv.js
+../../../bower_components/html5shiv/dist/html5shiv-printshiv.js
diff --git a/www/src/scripts/libs/jquery.js b/www/src/scripts/libs/jquery.js
@@ -1 +1 @@
-../../../components/jquery/jquery.js
+../../../bower_components/jquery/jquery.js
diff --git a/www/src/scripts/libs/json2.js b/www/src/scripts/libs/json2.js
@@ -1 +1 @@
-../../../components/json2/json2.js
+../../../bower_components/json2/json2.js
diff --git a/www/src/scripts/libs/lodash.js b/www/src/scripts/libs/lodash.js
@@ -1 +1 @@
-../../../components/lodash/lodash.js
+../../../bower_components/lodash/lodash.js
diff --git a/www/src/scripts/libs/require.js b/www/src/scripts/libs/require.js
@@ -1 +1 @@
-../../../components/requirejs/require.js
+../../../bower_components/requirejs/require.js
diff --git a/www/src/scripts/libs/restangular.js b/www/src/scripts/libs/restangular.js
@@ -1 +1 @@
-../../../components/restangular/src/restangular.js
+../../../bower_components/restangular/src/restangular.js
diff --git a/www/src/scripts/libs/ui-bootstrap-tpls.js b/www/src/scripts/libs/ui-bootstrap-tpls.js
@@ -0,0 +1 @@
+../../../bower_components/angular-bootstrap/ui-bootstrap-tpls.js
diff --git a/www/src/styles/bootstrap b/www/src/styles/bootstrap
@@ -1 +1 @@
-../../components/bootstrap/less
+../../bower_components/bootstrap/less
diff --git a/www/src/styles/bootstrap.less b/www/src/styles/bootstrap.less
@@ -34,7 +34,6 @@
 @import "bootstrap/buttons.less";
 
 // Components: common
-@import "font-awesome.less";
 @import "bootstrap/component-animations.less";
 @import "bootstrap/dropdowns.less";
 @import "bootstrap/list-group.less";

diff --git a/www/src/styles/font-awesome b/www/src/styles/font-awesome
@@ -1 +1 @@
-../../components/font-awesome/build/assets/font-awesome/less
+../../bower_components/font-awesome/less
diff --git a/www/src/styles/font-awesome.less b/www/src/styles/font-awesome.less
diff --git a/www/test/scripts/libs/angular-mocks.js b/www/test/scripts/libs/angular-mocks.js
@@ -1 +1 @@
-../../../components/angular-mocks/angular-mocks.js
+../../../bower_components/angular-mocks/angular-mocks.js