Skip to content

Commit 11cb994

Browse files
committed
feat(gen): additional work for compass support
Let Bower handle the install of Bootstrap
1 parent 7fac119 commit 11cb994

File tree

5 files changed

+6
-7106
lines changed

5 files changed

+6
-7106
lines changed

Diff for: app/index.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,8 @@ Generator.prototype.readIndex = function readIndex() {
232232
this.indexFile = this.engine(this.read('../../templates/common/index.html'), this);
233233
};
234234

235-
// Waiting a more flexible solution for #138
236235
Generator.prototype.bootstrapFiles = function bootstrapFiles() {
237236
var sass = this.compass;
238-
var source = 'styles/' + ( sass ? 's' : '' ) + 'css/';
239-
var dest = 'app/styles/';
240237
var mainFile = 'main.' + (sass ? 's' : '') + 'css';
241238

242239
if (this.bootstrap && !sass) {
@@ -246,7 +243,7 @@ Generator.prototype.bootstrapFiles = function bootstrapFiles() {
246243
this.copy('fonts/glyphicons-halflings-regular.woff', 'app/fonts/glyphicons-halflings-regular.woff');
247244
}
248245

249-
this.copy(source + mainFile, dest + mainFile);
246+
this.copy('styles/' + mainFile, 'app/styles/' + mainFile);
250247
};
251248

252249
Generator.prototype.appJs = function appJs() {
@@ -274,7 +271,7 @@ Generator.prototype.packageFiles = function () {
274271
Generator.prototype.imageFiles = function () {
275272
this.sourceRoot(path.join(__dirname, 'templates'));
276273
this.directory('images', 'app/images', true);
277-
}
274+
};
278275

279276
Generator.prototype._injectDependencies = function _injectDependencies() {
280277
var howToInstall =
@@ -294,4 +291,4 @@ Generator.prototype._injectDependencies = function _injectDependencies() {
294291
cssPattern: '<link rel="stylesheet" href="{{filePath}}">'
295292
});
296293
}
297-
}
294+
};

0 commit comments

Comments
 (0)