Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ciena-frost/ember-frost-tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
sandersky committed Mar 10, 2016
2 parents d15f030 + fccc93d commit 1baf729
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 8 deletions.
1 change: 0 additions & 1 deletion addon/styles/addon.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import 'node_modules/ember-frost-css-core/scss/frost-core';
@import 'node_modules/ember-frost-theme/scss/frost-theme';

.frost-tabs {
Expand Down
19 changes: 19 additions & 0 deletions blueprints/ember-frost-tabs/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module.exports = {
description: '',
normalizeEntityName: function () {},

/**
Installs specified packages at the root level of the application.
Triggered by 'ember install <addon name>'.
@returns {Promise} package names and versions
*/
afterInstall: function () {
return this.addAddonsToProject({
packages: [
{name: 'ember-frost-theme', target: '^1.3.0'},
{name: 'ember-frost-button', target: '^1.4.0'}
]
})
}
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "ember-frost-tabs",
"version": "0.2.3",
"version": "0.3.0",
"description": "The default blueprint for ember-cli addons.",
"frostGuideDirectory": "ui-components/content-views/tabs",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"lint": "eslint *.js addon app config tests",
"lint": "eslint *.js addon app blueprints config tests",
"start": "ember server",
"build": "ember build",
"test": "npm run-script lint && ember test"
Expand Down Expand Up @@ -42,6 +42,9 @@
"ember-data": "^2.3.3",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.5",
"ember-frost-button": "^1.4.0",
"ember-frost-css-core": "^1.1.2",
"ember-frost-theme": "^1.3.0",
"ember-load-initializers": "^0.5.1",
"ember-lodash": "^0.0.6",
"ember-resolver": "^2.0.3",
Expand All @@ -58,12 +61,9 @@
"dependencies": {
"ember-cli-babel": "^5.1.5",
"ember-cli-htmlbars": "^1.0.1",
"ember-cli-sass": "^5.1.0",
"ember-frost-button": "^1.0.0",
"ember-frost-css-core": "^1.0.0",
"ember-frost-theme": "^1.0.0"
"ember-cli-sass": "^5.1.0"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
}
}

0 comments on commit 1baf729

Please sign in to comment.