fix(app): copy glyphicons for sass

passy · passy · commit 2c4580096572 · 2013-07-19T20:20:58.000+02:00
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 #269
diff --git a/app/index.js b/app/index.js
@@ -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');
   }
 
diff --git a/app/templates/styles/scss/main.scss b/app/templates/styles/scss/main.scss
@@ -1,3 +1,6 @@
+$iconSpritePath: "../images/glyphicons-halflings.png";
+$iconWhiteSpritePath: "../images/glyphicons-halflings-white.png";
+
 @import "bootstrap-sass/lib/bootstrap";
 
 /* Put your CSS here */

Original file line number	Diff line number	Diff line change
`@@ -138,11 +138,12 @@ Generator.prototype.bootstrapFiles = function bootstrapFiles() {`
`138`	`138`
`139`	`139`	`if (sass) {`
`140`	`140`	`files.push('main.scss');`
	`141`	`+ this.copy('images/glyphicons-halflings.png', 'app/images/glyphicons-halflings.png');`
	`142`	`+ this.copy('images/glyphicons-halflings-white.png', 'app/images/glyphicons-halflings-white.png');`
`141`	`143`	`} else {`
`142`	`144`	`if (this.bootstrap) {`
`143`	`145`	`files.push('bootstrap.css');`
`144`	`146`	`}`
`145`		`-`
`146`	`147`	`files.push('main.css');`
`147`	`148`	`}`
`148`	`149`