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 @@ -136,19 +136,19 @@ Generator.prototype.readIndex = function readIndex() {
136136Generator . 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 ) ) ;
You can’t perform that action at this time.
0 commit comments