Skip to content

Commit

Permalink
fix(app): copy glyphicons for sass
Browse files Browse the repository at this point in the history
If Sass is enabled, copy over glyphicons as in generator-webapp. Thanks
@jamierytlewski for kicking this off. With plain CSS this doesn't work, because
the `img` path is hard-coded.

Fixes yeoman#269
  • Loading branch information
passy committed Jul 19, 2013
1 parent 9d248a2 commit 2c45800
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,12 @@ Generator.prototype.bootstrapFiles = function bootstrapFiles() {

if (sass) {
files.push('main.scss');
this.copy('images/glyphicons-halflings.png', 'app/images/glyphicons-halflings.png');
this.copy('images/glyphicons-halflings-white.png', 'app/images/glyphicons-halflings-white.png');
} else {
if (this.bootstrap) {
files.push('bootstrap.css');
}

files.push('main.css');
}

Expand Down
3 changes: 3 additions & 0 deletions app/templates/styles/scss/main.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
$iconSpritePath: "../images/glyphicons-halflings.png";
$iconWhiteSpritePath: "../images/glyphicons-halflings-white.png";

@import "bootstrap-sass/lib/bootstrap";

/* Put your CSS here */
Expand Down

0 comments on commit 2c45800

Please sign in to comment.