Skip to content

Commit 9df7265

Browse files
committed
refactor(client): ~ in css-loader requires will find node_modules for you
1 parent 86a8fa3 commit 9df7265

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<% if(filters.bootstrap) { %>@import '../../node_modules/bootstrap/less/bootstrap.less';
2-
<% if(filters.oauth) { %>@import '../../node_modules/bootstrap-social/bootstrap-social.less';
3-
<% }} %>@import '../../node_modules/font-awesome/less/font-awesome.less';
1+
<% if(filters.bootstrap) { %>@import '~bootstrap/less/bootstrap.less';
2+
<% if(filters.oauth) { %>@import '~bootstrap-social/bootstrap-social.less';
3+
<% }} %>@import '~font-awesome/less/font-awesome.less';
44

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

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<%_ if (filters.bootstrap) { _%>
22
$icon-font-path: '/assets/fonts/bootstrap/';
3-
@import '../../node_modules/bootstrap-sass/vendor/assets/stylesheets/bootstrap';
3+
@import '~bootstrap-sass/vendor/assets/stylesheets/bootstrap';
44
<%_ if(filters.oauth) { _%>
5-
@import '../../node_modules/bootstrap-social/bootstrap-social.scss';
5+
@import '~bootstrap-social/bootstrap-social.scss';
66
<% }} _%>
77
$fa-font-path: '/assets/fonts/font-awesome/';
8-
@import '../../node_modules/font-awesome/scss/font-awesome';
8+
@import '~font-awesome/scss/font-awesome';
99

1010
// @import url(http://fonts.googleapis.com/css?family=Open+Sans:300,400,600,900|Roboto:300,500,700,900);
1111

0 commit comments

Comments
 (0)