From 3ed82544c2113902ef6af19d6c80e58312ac153e Mon Sep 17 00:00:00 2001 From: gbhasha Date: Tue, 9 Jun 2015 21:33:08 +0530 Subject: [PATCH 1/8] Galeel | Updated npm modules to latest version to work with latest node (v0.12.4) --- package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index dc0cd66..8e99be2 100644 --- a/package.json +++ b/package.json @@ -3,18 +3,18 @@ "version": "0.1.0", "description": "A nice Hologram theme", "devDependencies": { - "gulp-minify-css": "~0.3.0", - "gulp-ruby-sass": "~0.3.1", - "gulp-autoprefixer": "0.0.6", - "gulp-notify": "~1.0.0-beta", - "gulp-util": "~2.2.14", - "gulp": "~3.6.0", - "gulp-jshint": "~1.4.2", - "browser-sync": "~0.7.3", - "gulp-rename": "~1.1.0", - "gulp-uglify": "~0.2.1", - "gulp-concat": "~2.1.7", - "jshint-stylish": "~0.1.5", - "gulp-shell": "~0.2.4" + "gulp-minify-css": "~1.1.6", + "gulp-ruby-sass": "~1.0.5", + "gulp-autoprefixer": "2.3.1", + "gulp-notify": "~2.2.0", + "gulp-util": "~3.0.5", + "gulp": "~3.9.0", + "gulp-jshint": "~1.11.0", + "browser-sync": "~2.7.7", + "gulp-rename": "~1.2.2", + "gulp-uglify": "~1.2.0", + "gulp-concat": "~2.5.2", + "jshint-stylish": "~2.0.0", + "gulp-shell": "~0.4.2" } } \ No newline at end of file From 2586bb23844c1c266540c12c0ad826dbfe5ea2aa Mon Sep 17 00:00:00 2001 From: gbhasha Date: Tue, 9 Jun 2015 21:36:13 +0530 Subject: [PATCH 2/8] Galeel | Updated bower components to latest version to work with latest node (v0.12.4). Removed angular-strap dependency as its not used. --- bower.json | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/bower.json b/bower.json index 369fbdf..42e38ab 100644 --- a/bower.json +++ b/bower.json @@ -5,16 +5,13 @@ "**/.*", "gulpfile.js", "assets", - "package.json" + "package.json", + "vendors" ], "devDependencies": { - "jquery": "1.10.*", - "Slidebars": "~0.9.4", - "angular": "1.2.*", - "angular-strap": "2.0.*", - "angular-bootstrap": "0.11.*" - }, - "resolutions": { - "angular": "1.3.0" + "Slidebars": "~0.10.3", + "angular": "~1.4.0", + "angular-bootstrap": "~0.13.0", + "jquery": "~2.1.4" } } From 043e5d8f9bdfdee38a7102e55b1107de7c84a117 Mon Sep 17 00:00:00 2001 From: gbhasha Date: Tue, 9 Jun 2015 21:37:02 +0530 Subject: [PATCH 3/8] Galeel | Updated gulp to build only latest and necessary files to build the vendor version. --- gulpfile.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 5f4dd96..9144dbc 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -14,8 +14,7 @@ var gulp = require('gulp'), // SASS compile, autoprefix and minify task gulp.task('styles', function() { - return gulp.src('assets/sass/cortana.scss') - .pipe(sass()) + return sass('assets/sass/cortana.scss') .on('error', gutil.beep) .on('error', notify.onError("Error: <%= error.message %>")) .pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1')) @@ -26,8 +25,8 @@ gulp.task('styles', function() { // CSS vendors concat and minify gulp.task('css_vendors', function() { gulp.src([ - 'vendors/Slidebars/distribution/0.9.4/slidebars.css', - 'vendors/angular-motion/dist/angular-motion.css' + 'vendors/Slidebars/dist/slidebars.css', + 'vendors/angular-bootstrap/ui-bootstrap-csp.css' ]) .pipe(concat('vendors.css')) .pipe(minifycss()) @@ -49,12 +48,9 @@ gulp.task('scripts', function() { // JS vendors concat and minify gulp.task('js_vendors', function() { gulp.src([ - 'vendors/jquery/jquery.js', - 'vendors/Slidebars/distribution/0.9.4/slidebars.min.js', + 'vendors/jquery/dist/jquery.js', + 'vendors/Slidebars/dist/slidebars.js', 'vendors/angular/angular.js', - 'vendors/angular-animate/angular-animate.js', - 'vendors/angular-strap/dist/angular-strap.min.js', - 'vendors/angular-strap/dist/angular-strap.tpl.min.js', 'vendors/angular-bootstrap/ui-bootstrap.js', 'vendors/angular-bootstrap/ui-bootstrap-tpls.js' ]) From fd1abb5487fe1006f1ae06043bd8b987373606ba Mon Sep 17 00:00:00 2001 From: gbhasha Date: Tue, 9 Jun 2015 21:38:09 +0530 Subject: [PATCH 4/8] Galeel | Updated the "TypeaheadCtrl" controller definition for Angular 1.4 --- _footer.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/_footer.html b/_footer.html index 3a9b108..9707083 100755 --- a/_footer.html +++ b/_footer.html @@ -14,7 +14,8 @@