Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
makmanalp committed Jun 23, 2016
2 parents 3b3c106 + 2758453 commit 6f73d23
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 37 deletions.
4 changes: 4 additions & 0 deletions app/controllers/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,9 @@ export default Ember.Controller.extend({
isSearchRoute: computed.equal('currentRouteName','search'),
showStreamer: computed('isHomePageRoute', function(){
return !this.get('isHomePageRoute');
}),
heroImageStyle: computed(function(){
let url = this.get('featureToggle.hero_image');
return Ember.String.htmlSafe(`background-image: url('${url}');`);
})
});
4 changes: 2 additions & 2 deletions app/locales/en-col/translations.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6f73d23

Please sign in to comment.