Skip to content

Commit

Permalink
Merge pull request #15 from EWhite613/master
Browse files Browse the repository at this point in the history
Up date to use frost-core instead of ember-frost-button
  • Loading branch information
sglanzer committed Mar 25, 2016
2 parents 1b19c62 + 5cefda0 commit 0b4c02f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion addon/pods/components/frost-tabs/template.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="tab-nav">
{{#each tabs as |tab|}}
{{#frost-button class=(concat 'tab' (if (eq tab.id selection) ' active')) design='tab' disabled=tab.disabled on-click=(action on-change tab.id)}}
{{#frost-button class=(concat 'tab' (if (eq tab.id selection) ' active')) design='tab' disabled=tab.disabled onClick=(action on-change tab.id)}}
<div class="text">
{{tab.alias}}
</div>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"ember-data": "^2.3.3",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.5",
"ember-frost-button": "^2.0.0",
"ember-frost-core": "0.0.10",
"ember-frost-css-core": "^1.1.2",
"ember-frost-theme": "^1.3.0",
"ember-load-initializers": "^0.5.1",
Expand All @@ -66,4 +66,4 @@
"ember-addon": {
"configPath": "tests/dummy/config"
}
}
}

0 comments on commit 0b4c02f

Please sign in to comment.