Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
feat(app): upgrade to Bootstrap 3.0.1
  • Loading branch information
passy committed Oct 31, 2013
1 parent 526f424 commit 59f4b1b
Show file tree
Hide file tree
Showing 13 changed files with 4,921 additions and 4,471 deletions.
38 changes: 18 additions & 20 deletions app/index.js
Expand Up @@ -170,13 +170,12 @@ Generator.prototype.bootstrapFiles = function bootstrapFiles() {
var files = [];
var source = 'styles/' + ( sass ? 's' : '' ) + 'css/';

if (this.bootstrap) {
if (!sass) {
files.push('bootstrap.css');
}

this.copy('images/glyphicons-halflings.png', 'app/images/glyphicons-halflings.png');
this.copy('images/glyphicons-halflings-white.png', 'app/images/glyphicons-halflings-white.png');
if (this.bootstrap && !sass) {
files.push('bootstrap.css');
this.copy('fonts/glyphicons-halflings-regular.eot', 'app/fonts/glyphicons-halflings-regular.eot');
this.copy('fonts/glyphicons-halflings-regular.ttf', 'app/fonts/glyphicons-halflings-regular.ttf');
this.copy('fonts/glyphicons-halflings-regular.svg', 'app/fonts/glyphicons-halflings-regular.svg');
this.copy('fonts/glyphicons-halflings-regular.woff', 'app/fonts/glyphicons-halflings-regular.woff');
}

files.push('main.' + (sass ? 's' : '') + 'css');
Expand All @@ -203,19 +202,18 @@ Generator.prototype.bootstrapJS = function bootstrapJS() {

// Wire Twitter Bootstrap plugins
this.indexFile = this.appendScripts(this.indexFile, 'scripts/plugins.js', [
'bower_components/bootstrap-sass/js/bootstrap-affix.js',
'bower_components/bootstrap-sass/js/bootstrap-alert.js',
'bower_components/bootstrap-sass/js/bootstrap-dropdown.js',
'bower_components/bootstrap-sass/js/bootstrap-tooltip.js',
'bower_components/bootstrap-sass/js/bootstrap-modal.js',
'bower_components/bootstrap-sass/js/bootstrap-transition.js',
'bower_components/bootstrap-sass/js/bootstrap-button.js',
'bower_components/bootstrap-sass/js/bootstrap-popover.js',
'bower_components/bootstrap-sass/js/bootstrap-typeahead.js',
'bower_components/bootstrap-sass/js/bootstrap-carousel.js',
'bower_components/bootstrap-sass/js/bootstrap-scrollspy.js',
'bower_components/bootstrap-sass/js/bootstrap-collapse.js',
'bower_components/bootstrap-sass/js/bootstrap-tab.js'
'bower_components/sass-bootstrap/js/affix.js',
'bower_components/sass-bootstrap/js/alert.js',
'bower_components/sass-bootstrap/js/button.js',
'bower_components/sass-bootstrap/js/carousel.js',
'bower_components/sass-bootstrap/js/collapse.js',
'bower_components/sass-bootstrap/js/dropdown.js',
'bower_components/sass-bootstrap/js/modal.js',
'bower_components/sass-bootstrap/js/popover.js',
'bower_components/sass-bootstrap/js/scrollspy.js',
'bower_components/sass-bootstrap/js/tab.js',
'bower_components/sass-bootstrap/js/tooltip.js',
'bower_components/sass-bootstrap/js/transition.js',
]);
};

Expand Down
Binary file not shown.
228 changes: 228 additions & 0 deletions app/templates/fonts/glyphicons-halflings-regular.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file removed app/templates/images/glyphicons-halflings-white.png
Binary file not shown.
Binary file removed app/templates/images/glyphicons-halflings.png
Binary file not shown.

0 comments on commit 59f4b1b

Please sign in to comment.