Skip to content
This repository has been archived by the owner on Mar 26, 2018. It is now read-only.

Commit

Permalink
fix(build): don't override generated css files
Browse files Browse the repository at this point in the history
Fixed #231
CSS was previously generated through compass and moved into a `main.css` file,
but later overwritten by `concat` task generated by `usemin`. This removes the
usemin block around the CSS link and adopts the same schema used in
`generator-webapp`.
  • Loading branch information
passy committed Jun 20, 2013
1 parent 01cee4b commit dd6a0cb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 1 addition & 3 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,14 @@ Generator.prototype.askForModules = function askForModules() {
// Waiting a more flexible solution for #138
Generator.prototype.bootstrapFiles = function bootstrapFiles() {
if (this.compassBootstrap) {
this.copy('styles/bootstrap.scss', path.join(this.appPath, 'styles/style.scss'));
this.indexFile = this.appendStyles(this.indexFile, 'styles/main.css', ['styles/style.css']);
this.copy('styles/bootstrap.scss', path.join(this.appPath, 'styles/main.scss'));
} else if (this.bootstrap) {
this.log.writeln('Writing compiled Bootstrap');
var cssFiles = ['styles/bootstrap.css', 'styles/main.css'];

cssFiles.forEach(function (css) {
this.copy(css, path.join(this.appPath, css));
}.bind(this));
this.indexFile = this.appendStyles(this.indexFile, 'styles/main.css', cssFiles);
}
};

Expand Down
1 change: 1 addition & 0 deletions templates/common/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<link rel="stylesheet" href="styles/main.css">
</head>
<body ng-app="<%= _.camelize(appname) %>App">
<!--[if lt IE 7]>
Expand Down

0 comments on commit dd6a0cb

Please sign in to comment.