Merge pull request #33 from gbhasha/master

Made changes to work with latest node(v0.12.4) and latest angular (v1.4)

Author: Yago

_footer.html

@@ -14,7 +14,8 @@
   </script>
   <script src="theme-build/js/main.js"></script>
   <script type="text/javascript">
-    function TypeaheadCtrl($scope) {
+
+    angular.module("cortana").controller("TypeaheadCtrl", function($scope) {
       $scope.selected = undefined;
       $scope.searchData = 
       <%= "[" %>
@@ -35,7 +36,8 @@
       $scope.onSelect = function ($item, $model, $label) {
         window.location.replace($item.path);
       };
-    }
+    });
+
   </script>
   <script type="text/ng-template" id="customTemplate.html">
     <a href="{{match.model.path}}">

assets/js/app.js

@@ -9,7 +9,7 @@
  ========================================================== */
 
 (function(){
-  var app = angular.module('cortana', ['mgcrea.ngStrap', 'ui.bootstrap']);
+  var app = angular.module('cortana', ['ui.bootstrap']);
 
   app.controller('MainController', function($scope) {
   });

assets/js/slidenav.js

@@ -16,7 +16,7 @@
     // });
     $('#open-left').on('click', function(event) {
       event.preventDefault();
-      cortanaSlidebars.toggle('left');
+      cortanaSlidebars.slidebars.toggle('left');
     });
 
   });

assets/sass/search.scss

@@ -51,6 +51,8 @@
   border: 1px solid $silver !important;
   border-radius: 3px !important;
   box-shadow: 0 5px 10px rgba(0,0,0,.2) !important;
+  position: absolute;
+  list-style: none;
 }
 
 .cortana-search-wrapper li {

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"
   }
 }

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'
     ])

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"
     }
 }

theme-build/css/cortana.css

@@ -9,7 +9,7 @@
  ========================================================== */
 
 (function(){
-  var app = angular.module('cortana', ['mgcrea.ngStrap', 'ui.bootstrap']);
+  var app = angular.module('cortana', ['ui.bootstrap']);
 
   app.controller('MainController', function($scope) {
   });
@@ -33,7 +33,7 @@
     // });
     $('#open-left').on('click', function(event) {
       event.preventDefault();
-      cortanaSlidebars.toggle('left');
+      cortanaSlidebars.slidebars.toggle('left');
     });
 
   });