Merge pull request #189 from NickLewanowicz/master

Updated ember-frost-core@^1.0.0

addon/templates/components/nav-category.hbs

@@ -1,8 +1,8 @@
 <div class='nav-category-icon'>
   {{#if icon}}
     {{frost-icon
-      icon=icon
       pack=pack
+      icon=icon
     }}
   {{/if}}
 </div>

blueprints/ember-frost-navigation/index.js

@@ -13,7 +13,7 @@ module.exports = {
       packages: [
         {
           name: 'ember-frost-core',
-          target: '>=0.24.0 <=1.0.0'
+          target: '^1.0.0'
         }
       ]
     })

bower.json

@@ -5,12 +5,12 @@
     "ember-cli-shims": "0.1.0",
     "ember-inflector": "1.3.1",
     "ember-mocha": "~0.8.11",
+    "ember-mocha-adapter": "~0.3.1",
     "Faker": "3.0.1",
-    "perfect-scrollbar": ">=0.6.7 <2.0.0",
+    "lodash": "^4.15.0",
     "pretender": "~0.12.0",
     "sinonjs": "1.17.1",
-    "font-awesome": "^4.6.3",
-    "lodash": "^4.15.0"
+    "font-awesome": "^4.6.3"
   },
   "resolutions": {
     "ember": "~2.8.0"

package.json

@@ -27,31 +27,30 @@
     "ember-blog-engine": "git://github.com/srowhani/ember-blog-engine.git#caf6e66089b9639cbb076b5eeaa656161f91a5b9",
     "ember-browserify": "~1.1.0",
     "ember-cli": "~2.8.0",
-    "ember-cli-app-version": "^1.0.0",
+    "ember-cli-chai": "^0.2.0",
     "ember-cli-code-coverage": "0.3.5",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-deploy": "~0.6.4",
     "ember-cli-deploy-frost-pack": "git://github.com/ciena-frost/ember-cli-deploy-frost-pack.git#e98e53709a42604815348f10bc8823c3c425b68e",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-mocha": "^0.10.1",
+    "ember-cli-mocha": "~0.13.0",
     "ember-cli-notifications": "^4.0.9",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-cli-visual-acceptance": "2.2.0",
-    "ember-code-snippet": "1.4.0",
+    "ember-code-snippet": "1.8.0",
     "ember-computed-decorators": "~0.2.0",
     "ember-concurrency": "~0.7.0",
     "ember-disable-proxy-controllers": "^1.0.1",
-    "ember-elsewhere": "0.3.0",
+    "ember-elsewhere": "~0.4.0",
     "ember-engines": "~0.3.4",
     "ember-export-application-global": "^1.0.5",
-    "ember-frost-core": "0.29.0",
+    "ember-frost-core": "^1.0.0",
     "ember-hook": "^1.3.1",
     "ember-load-initializers": "^0.5.1",
-    "ember-one-way-controls": "0.9.2",
     "ember-prop-types": "^3.0.0",
-    "ember-redux": "1.5.3",
+    "ember-redux": "^1.0.0",
     "ember-resolver": "^2.0.3",
     "ember-sinon": "~0.5.0",
     "ember-truth-helpers": "1.2.0",
@@ -65,7 +64,7 @@
     "remark-cli": "^2.0.0",
     "remark-lint": "^5.1.0",
     "sass-lint": "^1.0.0",
-    "svg4everybody": "2.1.0"
+    "svg4everybody": "^2.1.0"
   },
   "keywords": [
     "ember-addon",
@@ -75,7 +74,7 @@
     "ember-cli-babel": "^5.1.5",
     "ember-computed-decorators": "^0.2.2",
     "ember-cli-htmlbars": "^1.0.1",
-    "ember-cli-sass": "5.4.0",
+    "ember-cli-sass": "5.6.0",
     "liquid-fire": "0.26.1"
   },
   "ember-addon": {
@@ -84,4 +83,4 @@
   "ember-frost-icon-pack": {
     "name": "frost-nav"
   }
-}
+}

tests/dummy/app/pods/demo/template.hbs

@@ -12,7 +12,7 @@
     model=(hash
       logo=(component 'frost-icon'
         icon='user'
-        pack='nav'
+        pack='frost-nav'
       )
       label='Username'
     )

tests/dummy/app/router.js

@@ -11,30 +11,30 @@ Router.map(function () {
     path: '/'
   }, function () {
     this.category('Category 1', {
-      pack: 'nav',
+      pack: 'frost-nav',
       icon: 'application'
     }, function () {
       this.column('Column 1', {
         color: '#009eef'
       }, function () {
         this.action('Action Example', {
           action: 'myAction',
-          pack: 'nav',
+          pack: 'frost-nav',
           icon: 'application',
           description: 'This is an action',
           inline: true
         })
         this.app('Route Example', {
           route: 'go',
           description: 'This is a route',
-          pack: 'nav',
+          pack: 'frost-nav',
           icon: 'application'
         })
         this.engine('Blog Engine', {
           route: 'blog',
           description: 'This is an engine example',
           package: 'ember-blog-engine',
-          pack: 'nav',
+          pack: 'frost-nav',
           icon: 'application'
         })
         this.section('More Content', {
@@ -43,14 +43,14 @@ Router.map(function () {
           this.link('Google', {
             url: 'http://google.ca',
             description: 'Go to Google',
-            pack: 'nav',
+            pack: 'frost-nav',
             icon: 'application',
             tabbed: true
           })
           this.link('http://google.ca')
           this.action('Action 1', {
             action: 'myAction',
-            pack: 'nav',
+            pack: 'frost-nav',
             icon: 'application'
           })
         })