Merge pull request #622 from eleven-labs/fix-plain-css

Add overrides pprt in bower.json for plain CSS
Swiip · Jun 22, 2015 · 6162048 · 6162048
2 parents 85d356a + c8aa8ed
commit 6162048
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/app/templates/_bower.json b/app/templates/_bower.json
@@ -56,6 +56,16 @@
  "devDependencies": {
  "angular-mocks": "<%- props.angularVersion %>"
  },
+<% if (props.cssPreprocessor.key === 'none' && props.ui.key === 'bootstrap') { -%>
+ "overrides": {
+ "bootstrap": {
+ "main": [
+ "dist/css/bootstrap.css",
+ "dist/js/bootstrap.js"
+ ]
+ }
+ },
+<% } -%>
  "resolutions": {
 <% if (props.jQuery.key === 'jquery1') { -%>
  "jquery": "~1.11.3",

diff --git a/test/template/test-bower.js b/test/template/test-bower.js
@@ -177,4 +177,12 @@ describe('gulp-angular bower template', function () {
  result.should.match(/traceur-runtime/);
  });
 
+ it('should add overrides pprt for css bootstrap', function() {
+ model.props.ui.key = 'bootstrap';
+ model.props.cssPreprocessor.key = 'none';
+
+ var result = bower(model);
+ result.should.match(/overrides/);
+ result.should.match(/dist\/css\/bootstrap.css/);
+ });
 });