Skip to content

Commit

Permalink
Merge pull request #188 from dafortin/master
Browse files Browse the repository at this point in the history
Add icons
  • Loading branch information
quincyle committed Nov 26, 2016
2 parents 94efa5a + 144ced4 commit 833c24d
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 14 deletions.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,8 @@
},
"ember-addon": {
"configPath": "tests/dummy/config"
},
"ember-frost-icon-pack": {
"name": "frost-nav"
}
}
}
18 changes: 18 additions & 0 deletions svgs/application.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 74 additions & 0 deletions svgs/user.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tests/dummy/app/pods/demo/template.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
model=(hash
logo=(component 'frost-icon'
icon='user'
pack='dummy'
pack='nav'
)
label='Username'
)
Expand Down
24 changes: 12 additions & 12 deletions tests/dummy/app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,47 +11,47 @@ Router.map(function () {
path: '/'
}, function () {
this.category('Category 1', {
pack: 'dummy',
icon: 'sample'
pack: 'nav',
icon: 'application'
}, function () {
this.column('Column 1', {
color: '#009eef'
}, function () {
this.action('Action Example', {
action: 'myAction',
pack: 'dummy',
icon: 'sample',
pack: 'nav',
icon: 'application',
description: 'This is an action',
inline: true
})
this.app('Route Example', {
route: 'go',
description: 'This is a route',
pack: 'dummy',
icon: 'sample'
pack: 'nav',
icon: 'application'
})
this.engine('Blog Engine', {
route: 'blog',
description: 'This is an engine example',
package: 'ember-blog-engine',
pack: 'dummy',
icon: 'sample'
pack: 'nav',
icon: 'application'
})
this.section('More Content', {
color: '#a1e7ff'
}, function () {
this.link('Google', {
url: 'http://google.ca',
description: 'Go to Google',
pack: 'dummy',
icon: 'sample',
pack: 'nav',
icon: 'application',
tabbed: true
})
this.link('http://google.ca')
this.action('Action 1', {
action: 'myAction',
pack: 'dummy',
icon: 'sample'
pack: 'nav',
icon: 'application'
})
})
})
Expand Down

0 comments on commit 833c24d

Please sign in to comment.