File tree Expand file tree Collapse file tree 1 file changed +8
-8
lines changed
Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -153,19 +153,19 @@ Generator.prototype.readIndex = function readIndex() {
153153Generator . 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 ) ) ;
You can’t perform that action at this time.
0 commit comments