@@ -170,13 +170,12 @@ Generator.prototype.bootstrapFiles = function bootstrapFiles() {
170
170
var files = [ ] ;
171
171
var source = 'styles/' + ( sass ? 's' : '' ) + 'css/' ;
172
172
173
- if ( this . bootstrap ) {
174
- if ( ! sass ) {
175
- files . push ( 'bootstrap.css' ) ;
176
- }
177
-
178
- this . copy ( 'images/glyphicons-halflings.png' , 'app/images/glyphicons-halflings.png' ) ;
179
- this . copy ( 'images/glyphicons-halflings-white.png' , 'app/images/glyphicons-halflings-white.png' ) ;
173
+ if ( this . bootstrap && ! sass ) {
174
+ files . push ( 'bootstrap.css' ) ;
175
+ this . copy ( 'fonts/glyphicons-halflings-regular.eot' , 'app/fonts/glyphicons-halflings-regular.eot' ) ;
176
+ this . copy ( 'fonts/glyphicons-halflings-regular.ttf' , 'app/fonts/glyphicons-halflings-regular.ttf' ) ;
177
+ this . copy ( 'fonts/glyphicons-halflings-regular.svg' , 'app/fonts/glyphicons-halflings-regular.svg' ) ;
178
+ this . copy ( 'fonts/glyphicons-halflings-regular.woff' , 'app/fonts/glyphicons-halflings-regular.woff' ) ;
180
179
}
181
180
182
181
files . push ( 'main.' + ( sass ? 's' : '' ) + 'css' ) ;
@@ -203,19 +202,18 @@ Generator.prototype.bootstrapJS = function bootstrapJS() {
203
202
204
203
// Wire Twitter Bootstrap plugins
205
204
this . indexFile = this . appendScripts ( this . indexFile , 'scripts/plugins.js' , [
206
- 'bower_components/bootstrap-sass/js/bootstrap-affix.js' ,
207
- 'bower_components/bootstrap-sass/js/bootstrap-alert.js' ,
208
- 'bower_components/bootstrap-sass/js/bootstrap-dropdown.js' ,
209
- 'bower_components/bootstrap-sass/js/bootstrap-tooltip.js' ,
210
- 'bower_components/bootstrap-sass/js/bootstrap-modal.js' ,
211
- 'bower_components/bootstrap-sass/js/bootstrap-transition.js' ,
212
- 'bower_components/bootstrap-sass/js/bootstrap-button.js' ,
213
- 'bower_components/bootstrap-sass/js/bootstrap-popover.js' ,
214
- 'bower_components/bootstrap-sass/js/bootstrap-typeahead.js' ,
215
- 'bower_components/bootstrap-sass/js/bootstrap-carousel.js' ,
216
- 'bower_components/bootstrap-sass/js/bootstrap-scrollspy.js' ,
217
- 'bower_components/bootstrap-sass/js/bootstrap-collapse.js' ,
218
- 'bower_components/bootstrap-sass/js/bootstrap-tab.js'
205
+ 'bower_components/sass-bootstrap/js/affix.js' ,
206
+ 'bower_components/sass-bootstrap/js/alert.js' ,
207
+ 'bower_components/sass-bootstrap/js/button.js' ,
208
+ 'bower_components/sass-bootstrap/js/carousel.js' ,
209
+ 'bower_components/sass-bootstrap/js/collapse.js' ,
210
+ 'bower_components/sass-bootstrap/js/dropdown.js' ,
211
+ 'bower_components/sass-bootstrap/js/modal.js' ,
212
+ 'bower_components/sass-bootstrap/js/popover.js' ,
213
+ 'bower_components/sass-bootstrap/js/scrollspy.js' ,
214
+ 'bower_components/sass-bootstrap/js/tab.js' ,
215
+ 'bower_components/sass-bootstrap/js/tooltip.js' ,
216
+ 'bower_components/sass-bootstrap/js/transition.js' ,
219
217
] ) ;
220
218
} ;
221
219
0 commit comments