Skip to content

Commit e88dba4

Browse files
committed
fix(app): include bootstrap images for css/scss
Include the bootstrap images any time the bootstrap image is selected at the prompt Fixes #196
1 parent c76c702 commit e88dba4

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
@@ -136,19 +136,19 @@ Generator.prototype.readIndex = function readIndex() {
136136
Generator.prototype.bootstrapFiles = function bootstrapFiles() {
137137
var sass = this.compassBootstrap;
138138
var files = [];
139-
var source = 'styles/' + ( sass ? 'scss/' : 'css/' );
139+
var source = 'styles/' + ( sass ? 's' : '' ) + 'css/';
140140

141-
if (sass) {
142-
files.push('main.scss');
143-
this.copy('images/glyphicons-halflings.png', 'app/images/glyphicons-halflings.png');
144-
this.copy('images/glyphicons-halflings-white.png', 'app/images/glyphicons-halflings-white.png');
145-
} else {
146-
if (this.bootstrap) {
141+
if (this.bootstrap) {
142+
if (!sass) {
147143
files.push('bootstrap.css');
148144
}
149-
files.push('main.css');
145+
146+
this.copy('images/glyphicons-halflings.png', 'app/images/glyphicons-halflings.png');
147+
this.copy('images/glyphicons-halflings-white.png', 'app/images/glyphicons-halflings-white.png');
150148
}
151149

150+
files.push('main.' + (sass ? 's' : '') + 'css');
151+
152152
files.forEach(function (file) {
153153
this.copy(source + file, 'app/styles/' + file);
154154
}.bind(this));

0 commit comments

Comments
 (0)