Mercurial Mercurial > ammico / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX and update the client dev environment - update bootstrap - ignore index.js files and every file from bootstrap beside the css
authorrougeronj
Fri, 27 Mar 2015 16:33:30 +0100
changeset 44 5eab9718182b
parent 43 14dbcea2b543
child 45 19f3f0a7fbd7
FIX and update the client dev environment - update bootstrap - ignore index.js files and every file from bootstrap beside the css
client/bower.json file | annotate | diff | comparison | revisions
client/gulpfile.js file | annotate | diff | comparison | revisions 
--- a/client/bower.json	Fri Mar 27 16:31:42 2015 +0100
+++ b/client/bower.json	Fri Mar 27 16:33:30 2015 +0100
@@ -19,6 +19,6 @@
     "angular-route": "~1.3",
     "angular-resource": "~1.3",
     "angular-bootstrap": "~0.11.0",
-    "bootstrap": "~3.1.1"
+    "bootstrap": "~ 3.3.4"
   }
 }
--- a/client/gulpfile.js	Fri Mar 27 16:31:42 2015 +0100
+++ b/client/gulpfile.js	Fri Mar 27 16:33:30 2015 +0100
@@ -54,12 +54,15 @@
 
 var vendorJSsrc = [
   '!./bower_components/**/*.min.js',
-  '!./bower_components/bootstrap/Gruntfile.js',
-  '!./bower_components/bootstrap/grunt/*',
-  '!./bower_components/bootstrap/js/*',
+  '!./bower_components/bootstrap/**/*',
   '!./bower_components/jquery/src/**/*',
-  '!./bower_components/angular-bootstrap/ui-bootstrap.js',
+  '!./bower_components/**/index.js',
+  './bower_components/bootstrap/dist/css/*',
   './bower_components/jquery/dist/jquery.js',
+  './bower_components/angular/angular.js',
+  './bower_components/angular-route/angular-route.js',
+  './bower_components/angular-resource/angular-resource.js',
+  './bower_components/angular-bootstrap/ui-bootstrap.js',
   './bower_components/**/*.js'
 ];
ammico