Skip to content

Commit

Permalink
Merge pull request #13 from cvrebert/master
Browse files Browse the repository at this point in the history
"Twitter Bootstrap" is now simply Bootstrap
  • Loading branch information
abiee committed Mar 12, 2014
2 parents a6257d5 + b3d7a64 commit ebbd147
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ AppGenerator.prototype.askFor = function() {
var prompts = [{
type: 'list',
name: 'bootstrapFlavor',
message: 'Would you like to include Twitter Bootstrap?',
message: 'Would you like to include Bootstrap?',
choices: [
{'name':'yes, for Sass', value:'sass'},
{'name':'yes, for Less', value:'less'},
{'name':'no, without Twitter Bootstrap', value:'none'}
{'name':'no, without Bootstrap', value:'none'}
],
default: 'sass'
},
Expand Down Expand Up @@ -167,7 +167,7 @@ AppGenerator.prototype.writeIndex = function writeIndex() {
});
}

// wire Twitter Bootstrap plugins
// wire Bootstrap plugins
if (this.bootstrapFlavor !== 'none') {
var dirName = this.bootstrapFlavor == 'sass' ? 'sass-bootstrap' : 'bootstrap'
this.indexFile = this.appendScripts(this.indexFile, 'scripts/plugins.js', [
Expand Down

0 comments on commit ebbd147

Please sign in to comment.