From fdc98ba24ca441af40a06080491bd82aab30e7e6 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 29 Nov 2013 16:44:27 +1100
Subject: [PATCH 1/2] Convert Karma config file to v0.10 compatible format

Conflicts:

	config/ng-test.conf.js
---
 config/ng-test.conf.js | 44 ++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/config/ng-test.conf.js b/config/ng-test.conf.js
index 8c48c93db7..cc03b1588c 100644
--- a/config/ng-test.conf.js
+++ b/config/ng-test.conf.js
@@ -1,25 +1,35 @@
-basePath = '../';
+module.exports = function(config) {
+  config.set({
+    basePath: '../',
 
-files = [
-  JASMINE,
-  JASMINE_ADAPTER,
-  'app/assets/javascripts/shared/jquery-1.8.0.js', // TODO: Can we link to Rails' jquery?
-  'app/assets/javascripts/shared/angular.js',
-  'app/assets/javascripts/shared/angular-*.js',
+    frameworks: ['jasmine'],
 
-  'app/assets/javascripts/admin/order_cycle.js.erb.coffee',
-  'app/assets/javascripts/admin/bulk_product_update.js',
+    files: [
+      'app/assets/javascripts/shared/jquery-1.8.0.js', // TODO: Can we link to Rails' jquery?
+      'app/assets/javascripts/shared/angular.js',
+      'app/assets/javascripts/shared/angular-*.js',
 
-  'spec/javascripts/unit/**/*.js*'
-];
+      'app/assets/javascripts/admin/order_cycle.js.erb.coffee',
+      'app/assets/javascripts/admin/bulk_product_update.js',
 
-exclude = ['**/.#*']
+      'spec/javascripts/unit/**/*.js*'
+    ],
 
-autoWatch = true;
+    exclude: ['**/.#*'],
 
-browsers = ['Chrome'];
+    coffeePreprocessor: {
+      options: {
+        sourceMap: true
+      }
+    },
 
-junitReporter = {
-  outputFile: 'log/testacular-unit.xml',
-  suite: 'unit'
+    autoWatch: true,
+
+    browsers: ['Chrome'],
+
+    junitReporter: {
+      outputFile: 'log/testacular-unit.xml',
+      suite: 'unit'
+    }
+  });
 };

From e70513b06c92a44a30c75fa82530cd9c2c807d6b Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 6 Dec 2013 11:47:07 +1100
Subject: [PATCH 2/2] Remove off-canvas class for landing page, allowing it to
 scroll

---
 app/views/home/temp_landing_page.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/home/temp_landing_page.html.haml b/app/views/home/temp_landing_page.html.haml
index a0f6b4a854..d8cc87dc11 100644
--- a/app/views/home/temp_landing_page.html.haml
+++ b/app/views/home/temp_landing_page.html.haml
@@ -12,7 +12,7 @@
     = render "layouts/bugherd_script"
 
     = csrf_meta_tags
-  %body.off-canvas
+  %body
     %nav.top-bar
       %section.top-bar-section
         %ul.left