Skip to content

Commit e525007

Browse files
committed
Merge pull request #371 from eddiemonge/issue_196
fix(app): include bootstrap images for css/scss
2 parents 1da2800 + e88dba4 commit e525007

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

app/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,19 @@ Generator.prototype.readIndex = function readIndex() {
153153
Generator.prototype.bootstrapFiles = function bootstrapFiles() {
154154
var sass = this.compassBootstrap;
155155
var files = [];
156-
var source = 'styles/' + ( sass ? 'scss/' : 'css/' );
156+
var source = 'styles/' + ( sass ? 's' : '' ) + 'css/';
157157

158-
if (sass) {
159-
files.push('main.scss');
160-
this.copy('images/glyphicons-halflings.png', 'app/images/glyphicons-halflings.png');
161-
this.copy('images/glyphicons-halflings-white.png', 'app/images/glyphicons-halflings-white.png');
162-
} else {
163-
if (this.bootstrap) {
158+
if (this.bootstrap) {
159+
if (!sass) {
164160
files.push('bootstrap.css');
165161
}
166-
files.push('main.css');
162+
163+
this.copy('images/glyphicons-halflings.png', 'app/images/glyphicons-halflings.png');
164+
this.copy('images/glyphicons-halflings-white.png', 'app/images/glyphicons-halflings-white.png');
167165
}
168166

167+
files.push('main.' + (sass ? 's' : '') + 'css');
168+
169169
files.forEach(function (file) {
170170
this.copy(source + file, 'app/styles/' + file);
171171
}.bind(this));

0 commit comments

Comments
 (0)