diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js index 361c49f1a..d562f6b3b 100644 --- a/app/templates/Gruntfile.js +++ b/app/templates/Gruntfile.js @@ -612,11 +612,6 @@ module.exports = function (grunt) { stylus: { server: { options: { - paths: [ - '<%%= yeoman.client %>/bower_components', - '<%%= yeoman.client %>/app', - '<%%= yeoman.client %>/components' - ], "include css": true }, files: { @@ -629,11 +624,6 @@ module.exports = function (grunt) { sass: { server: { options: { - loadPath: [ - '<%%= yeoman.client %>/bower_components', - '<%%= yeoman.client %>/app', - '<%%= yeoman.client %>/components' - ], compass: false }, files: { @@ -644,18 +634,11 @@ module.exports = function (grunt) { // Compiles Less to CSS less: { - options: { - paths: [ - '<%%= yeoman.client %>/bower_components', - '<%%= yeoman.client %>/app', - '<%%= yeoman.client %>/components' - ] - }, server: { files: { '.tmp/app/app.css' : '<%%= yeoman.client %>/app/app.less' } - }, + } },<% } %> injector: { @@ -689,7 +672,7 @@ module.exports = function (grunt) { options: { transform: function(filePath) { filePath = filePath.replace('/client/app/', ''); - filePath = filePath.replace('/client/components/', ''); + filePath = filePath.replace('/client/components/', '../components/'); return '@import \'' + filePath + '\';'; }, starttag: '// injector', @@ -708,7 +691,7 @@ module.exports = function (grunt) { options: { transform: function(filePath) { filePath = filePath.replace('/client/app/', ''); - filePath = filePath.replace('/client/components/', ''); + filePath = filePath.replace('/client/components/', '../components/'); return '@import \'' + filePath + '\';'; }, starttag: '// injector', @@ -727,7 +710,7 @@ module.exports = function (grunt) { options: { transform: function(filePath) { filePath = filePath.replace('/client/app/', ''); - filePath = filePath.replace('/client/components/', ''); + filePath = filePath.replace('/client/components/', '../components/'); return '@import \'' + filePath + '\';'; }, starttag: '// injector', diff --git a/app/templates/client/app/app(less).less b/app/templates/client/app/app(less).less index 460b56bdb..cbfffbe88 100644 --- a/app/templates/client/app/app(less).less +++ b/app/templates/client/app/app(less).less @@ -1,8 +1,8 @@ -<% if (filters.bootstrap) { %>@import 'bootstrap/less/bootstrap.less';<% } %> -@import 'font-awesome/less/font-awesome.less'; +<% if (filters.bootstrap) { %>@import '../bower_components/bootstrap/less/bootstrap.less';<% } %> +@import '../bower_components/font-awesome/less/font-awesome.less'; -<% if (filters.bootstrap) { %>@icon-font-path: '/bower_components/bootstrap/fonts/';<% } %> -@fa-font-path: '/bower_components/font-awesome/fonts'; +<% if (filters.bootstrap) { %>@icon-font-path: '../bower_components/bootstrap/fonts/';<% } %> +@fa-font-path: '../bower_components/font-awesome/fonts'; /** * App-wide Styles diff --git a/app/templates/client/app/app(sass).scss b/app/templates/client/app/app(sass).scss index 30befa636..889878aee 100644 --- a/app/templates/client/app/app(sass).scss +++ b/app/templates/client/app/app(sass).scss @@ -1,8 +1,8 @@ -<% if (filters.bootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";<% } %> -$fa-font-path: "/bower_components/font-awesome/fonts"; +<% if (filters.bootstrap) { %>$icon-font-path: "../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";<% } %> +$fa-font-path: "../bower_components/font-awesome/fonts"; <% if (filters.bootstrap) { %> -@import 'bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';<% } %> -@import 'font-awesome/scss/font-awesome'; +@import '../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';<% } %> +@import '../bower_components/font-awesome/scss/font-awesome'; /** * App-wide Styles diff --git a/app/templates/client/app/app(stylus).styl b/app/templates/client/app/app(stylus).styl index 9eab53889..d25cdfc59 100644 --- a/app/templates/client/app/app(stylus).styl +++ b/app/templates/client/app/app(stylus).styl @@ -1,5 +1,5 @@ -@import "font-awesome/css/font-awesome.css" -<% if (filters.bootstrap) { %>@import "bootstrap/dist/css/bootstrap.css" +@import "../bower_components/font-awesome/css/font-awesome.css" +<% if (filters.bootstrap) { %>@import "../bower_components/bootstrap/dist/css/bootstrap.css" // // Bootstrap Fonts