From 9ff093b061a48c5e9b73b9b1165b829ae03fe759 Mon Sep 17 00:00:00 2001 From: Felix Date: Fri, 25 Apr 2014 09:57:43 +0200 Subject: [PATCH 1/2] fix(app): fix duplicate styles in main.css Closes #662 Closes #667 --- templates/common/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/common/index.html b/templates/common/index.html index ee5dca6c8..85ac590bf 100644 --- a/templates/common/index.html +++ b/templates/common/index.html @@ -10,7 +10,7 @@ - + From 4d8856c9811b73048670fb36242bebf7fd622c44 Mon Sep 17 00:00:00 2001 From: Felix Date: Fri, 25 Apr 2014 10:00:32 +0200 Subject: [PATCH 2/2] fix(app): Remove sourcePaths for scripts --- app/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/index.js b/app/index.js index d210c8486..cb87665d9 100644 --- a/app/index.js +++ b/app/index.js @@ -241,8 +241,7 @@ Generator.prototype.appJs = function appJs() { html: this.indexFile, fileType: 'js', optimizedPath: 'scripts/scripts.js', - sourceFileList: ['scripts/app.js', 'scripts/controllers/main.js'], - searchPath: ['.tmp', 'app'] + sourceFileList: ['scripts/app.js', 'scripts/controllers/main.js'] }); };