Skip to content

Commit 76325bd

Browse files
Awk34kingcody
authored andcommitted
fix(gen:css): ensure scss/less/stylus files have proper relative paths
1 parent c81b8e6 commit 76325bd

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

Diff for: app/templates/Gruntfile.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ module.exports = function (grunt) {
689689
options: {
690690
transform: function(filePath) {
691691
filePath = filePath.replace('/client/app/', '');
692-
filePath = filePath.replace('/client/components/', '');
692+
filePath = filePath.replace('/client/components/', '../components/');
693693
return '@import \'' + filePath + '\';';
694694
},
695695
starttag: '// injector',
@@ -708,7 +708,7 @@ module.exports = function (grunt) {
708708
options: {
709709
transform: function(filePath) {
710710
filePath = filePath.replace('/client/app/', '');
711-
filePath = filePath.replace('/client/components/', '');
711+
filePath = filePath.replace('/client/components/', '../components/');
712712
return '@import \'' + filePath + '\';';
713713
},
714714
starttag: '// injector',
@@ -727,7 +727,7 @@ module.exports = function (grunt) {
727727
options: {
728728
transform: function(filePath) {
729729
filePath = filePath.replace('/client/app/', '');
730-
filePath = filePath.replace('/client/components/', '');
730+
filePath = filePath.replace('/client/components/', '../components/');
731731
return '@import \'' + filePath + '\';';
732732
},
733733
starttag: '// injector',

Diff for: app/templates/client/app/app(less).less

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<% if (filters.bootstrap) { %>@import 'bootstrap/less/bootstrap.less';<% } %>
2-
@import 'font-awesome/less/font-awesome.less';
1+
<% if (filters.bootstrap) { %>@import '../bower_components/bootstrap/less/bootstrap.less';<% } %>
2+
@import '../bower_components/font-awesome/less/font-awesome.less';
33

4-
<% if (filters.bootstrap) { %>@icon-font-path: '/bower_components/bootstrap/fonts/';<% } %>
5-
@fa-font-path: '/bower_components/font-awesome/fonts';
4+
<% if (filters.bootstrap) { %>@icon-font-path: '../bower_components/bootstrap/fonts/';<% } %>
5+
@fa-font-path: '../bower_components/font-awesome/fonts';
66

77
/**
88
* App-wide Styles

Diff for: app/templates/client/app/app(sass).scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<% if (filters.bootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";<% } %>
2-
$fa-font-path: "/bower_components/font-awesome/fonts";
1+
<% if (filters.bootstrap) { %>$icon-font-path: "../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";<% } %>
2+
$fa-font-path: "../bower_components/font-awesome/fonts";
33
<% if (filters.bootstrap) { %>
4-
@import 'bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';<% } %>
5-
@import 'font-awesome/scss/font-awesome';
4+
@import '../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';<% } %>
5+
@import '../bower_components/font-awesome/scss/font-awesome';
66

77
/**
88
* App-wide Styles

Diff for: app/templates/client/app/app(stylus).styl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import "font-awesome/css/font-awesome.css"
2-
<% if (filters.bootstrap) { %>@import "bootstrap/dist/css/bootstrap.css"
1+
@import "../bower_components/font-awesome/css/font-awesome.css"
2+
<% if (filters.bootstrap) { %>@import "../bower_components/bootstrap/dist/css/bootstrap.css"
33

44
//
55
// Bootstrap Fonts

0 commit comments

Comments
 (0)