Skip to content

Commit

Permalink
exclude 'vendor' folder from bootstrap assets path
Browse files Browse the repository at this point in the history
  • Loading branch information
neilhem committed Jul 17, 2014
1 parent 5adf3ce commit dbbdbed
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions app/templates/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ module.exports = function (grunt) {
app: {
ignorePath: /^<%= config.app %>\/|\.\.\//,
src: ['<%%= config.app %>/index.html']<% if (includeBootstrap) { %>,<% if (includeSass) { %>
exclude: ['bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap.js']<% } else { %>
exclude: ['bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js']<% } else { %>
exclude: ['bower_components/bootstrap/dist/js/bootstrap.js']<% } } %>
}<% if (includeSass) { %>,
sass: {
Expand Down Expand Up @@ -375,7 +375,7 @@ module.exports = function (grunt) {
%>bower_components/bootstrap/dist<%
} %>',
src: '<% if (includeSass) {
%>bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/*<%
%>bower_components/bootstrap-sass-official/assets/fonts/bootstrap/*<%
} else {
%>fonts/*<%
} %>',
Expand Down
4 changes: 2 additions & 2 deletions app/templates/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% if (includeBootstrap) { %>$icon-font-path: "../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";
<% if (includeBootstrap) { %>$icon-font-path: "../bower_components/bootstrap-sass-official/assets/fonts/bootstrap/";
// bower:scss
@import "bootstrap-sass-official/vendor/assets/stylesheets/bootstrap.scss";
@import "bootstrap-sass-official/assets/stylesheets/bootstrap.scss";
// endbower

.browsehappy {
Expand Down

0 comments on commit dbbdbed

Please sign in to comment.