From bc0ad883a692932840a8bed5c3a27b85e463b2f7 Mon Sep 17 00:00:00 2001 From: Fabrizio Fortunato Date: Mon, 13 Oct 2014 23:23:35 +0200 Subject: [PATCH 1/4] Change main.sass to main.scss --- app/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index.js b/app/index.js index dea3c85..b0ba9cc 100644 --- a/app/index.js +++ b/app/index.js @@ -137,7 +137,7 @@ IonicGenerator.prototype.createIndexHtml = function createIndexHtml() { IonicGenerator.prototype.copyStyles = function copyStyles() { var sass = this.compass; - var mainFile = 'main.' + (sass ? 'sass' : 'css'); + var mainFile = 'main.' + (sass ? 'scss' : 'css'); // Only create a main style file if the starter template didn't // have any styles. In the case it does, the starter should From 772e21203d61dfc4bb0ab1504ed4fe41e6063806 Mon Sep 17 00:00:00 2001 From: Fabrizio Fortunato Date: Mon, 13 Oct 2014 23:24:04 +0200 Subject: [PATCH 2/4] Add overrides for ionic ( scss file ) --- templates/common/_bower.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/templates/common/_bower.json b/templates/common/_bower.json index cd724f8..7849047 100644 --- a/templates/common/_bower.json +++ b/templates/common/_bower.json @@ -7,6 +7,16 @@ "devDependencies": { "angular-mocks": "~1.2.17", "angular-scenario": "~1.2.17" - } + }, + "overrides": { + "ionic": { + "main": [ + "scss/ionic.scss", + "release/fonts/*", + "release/js/ionic.js", + "release/js/ionic-angular.js" + ] + } + } } From 6ffec498afcdfdf65ccccc5b699f308ce4e1b5fb Mon Sep 17 00:00:00 2001 From: Fabrizio Fortunato Date: Mon, 13 Oct 2014 23:24:22 +0200 Subject: [PATCH 3/4] Swap sass to scss --- templates/styles/main.sass | 7 ------- templates/styles/main.scss | 11 +++++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 templates/styles/main.sass create mode 100644 templates/styles/main.scss diff --git a/templates/styles/main.sass b/templates/styles/main.sass deleted file mode 100644 index cbccc8a..0000000 --- a/templates/styles/main.sass +++ /dev/null @@ -1,7 +0,0 @@ -/* Your app's SASS, go crazy, make it your own */ - -.ionic-logo - display: block - margin: 15px auto - width: 96px - height: 96px \ No newline at end of file diff --git a/templates/styles/main.scss b/templates/styles/main.scss new file mode 100644 index 0000000..9572495 --- /dev/null +++ b/templates/styles/main.scss @@ -0,0 +1,11 @@ +/* Your app's SASS, go crazy, make it your own */ + +//bower:scss +//endbower + +.ionic-logo { + display: block; + margin: 15px auto; + width: 96px; + height: 96px; +} From a750f5fbbbf8d30267ca9dfadf8aaf42dc05884c Mon Sep 17 00:00:00 2001 From: Fabrizio Fortunato Date: Mon, 13 Oct 2014 23:30:48 +0200 Subject: [PATCH 4/4] Fix wiredep path ( no need to cwd ) --- templates/common/Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/common/Gruntfile.js b/templates/common/Gruntfile.js index fd22962..63bda79 100644 --- a/templates/common/Gruntfile.js +++ b/templates/common/Gruntfile.js @@ -174,7 +174,7 @@ module.exports = function (grunt) { // Automatically inject Bower components into the app wiredep: { options: { - cwd: '<%%= yeoman.app %>' + // cwd: '<%%= yeoman.app %>' }, app: { src: ['<%%= yeoman.app %>/index.html'],