Merge branch 'beta'

cid-harvard · Jun 23, 2016 · 6f73d23 · 6f73d23
2 parents 3b3c106 + 2758453
commit 6f73d23
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 37 deletions.
diff --git a/app/controllers/application.js b/app/controllers/application.js
@@ -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}');`);
   })
 });
diff --git a/app/locales/en-col/translations.js b/app/locales/en-col/translations.js