diff --git a/ember-cli-build.js b/ember-cli-build.js index d3dc3ae..35c2579 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -4,6 +4,11 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function(defaults) { var app = new EmberAddon(defaults, { // Add options here + sassOptions: { + includePaths: [ + 'node_modules/bootstrap/scss' + ] + } }); /* @@ -13,7 +18,5 @@ module.exports = function(defaults) { behave. You most likely want to be modifying `./index.js` or app's build file */ - app.import('node_modules/bootswatch/lumen/bootstrap.min.css'); - return app.toTree(); }; diff --git a/package.json b/package.json index 92a7e2e..e04104e 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ "test": "ember try:each", "test:dev": "ember test --filter ESLint -i", "tdd": "npm run test:dev -- -s", - "lint": "ember test --filter ESLint" + "lint": "ember test --filter ESLint", + "postinstall": "npm rebuild node-sass" }, "dependencies": { "ember-changeset-validations": "^1.2.7", @@ -33,7 +34,7 @@ "ember-truth-helpers": "^1.3.0" }, "devDependencies": { - "bootswatch": "^3.3.7", + "bootstrap": "4.0.0-alpha.6", "broccoli-asset-rev": "^2.4.5", "ember-ajax": "^3.0.0", "ember-cli": "2.13.2", @@ -47,6 +48,7 @@ "ember-cli-mocha": "^0.14.4", "ember-cli-page-object": "^1.10.0", "ember-cli-release": "^1.0.0-beta.2", + "ember-cli-sass": "^6.2.0", "ember-cli-shims": "^1.1.0", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", diff --git a/tests/dummy/app/styles/app.css b/tests/dummy/app/styles/app.css deleted file mode 100644 index e69de29..0000000 diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss new file mode 100644 index 0000000..4561d73 --- /dev/null +++ b/tests/dummy/app/styles/app.scss @@ -0,0 +1,9 @@ +@import "bootstrap"; + +.page-container { + margin: 2em auto; +} + +.person-band-list-group { + margin-top: 2em; +} diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs new file mode 100644 index 0000000..57a60ca --- /dev/null +++ b/tests/dummy/app/templates/application.hbs @@ -0,0 +1,5 @@ + + +{{outlet}} diff --git a/tests/dummy/app/templates/components/my-form.hbs b/tests/dummy/app/templates/components/my-form.hbs index bd068b1..8a1b3f8 100644 --- a/tests/dummy/app/templates/components/my-form.hbs +++ b/tests/dummy/app/templates/components/my-form.hbs @@ -6,8 +6,8 @@ }} {{#form.field property="firstName" as |field|}} -
Favorite Band: {{person.favoriteBand}}