From 3fbe60692e0c15b871c8ec653d14bac23d41a6d0 Mon Sep 17 00:00:00 2001 From: vrde Date: Mon, 13 Jul 2015 14:29:20 +0200 Subject: [PATCH] Working on landing --- index.html | 2 +- js/app.js | 3 ++- js/components/ascribe_app.js | 2 +- js/components/whitelabel/prize/app.js | 5 ++--- .../whitelabel/prize/components/landing.js | 22 ++++++++++++++----- js/constants/application_constants.js | 5 ++++- sass/ascribe_app.scss | 5 +++++ sass/main.scss | 14 ++++++++---- sass/whitelabel/index.scss | 1 + sass/whitelabel/prize/index.scss | 1 + sass/whitelabel/prize/landing.scss | 16 ++++++++++++++ 11 files changed, 59 insertions(+), 17 deletions(-) create mode 100644 sass/ascribe_app.scss create mode 100644 sass/whitelabel/index.scss create mode 100644 sass/whitelabel/prize/index.scss create mode 100644 sass/whitelabel/prize/landing.scss diff --git a/index.html b/index.html index af9deda9..d5fe491e 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,7 @@ -
+
diff --git a/js/app.js b/js/app.js index 7d627c82..15942bb4 100644 --- a/js/app.js +++ b/js/app.js @@ -8,6 +8,7 @@ import Router from 'react-router'; import fetch from 'isomorphic-fetch'; import ApiUrls from './constants/api_urls'; +import constants from './constants/application_constants'; import getRoutes from './routes'; import requests from './utils/requests'; @@ -40,7 +41,7 @@ class AppGateway { loadSubdomain(data) { let settings = data.whitelabel; - + constants.whitelabel = settings; this.load('prize'); } diff --git a/js/components/ascribe_app.js b/js/components/ascribe_app.js index c34e3462..b4a894a3 100644 --- a/js/components/ascribe_app.js +++ b/js/components/ascribe_app.js @@ -13,7 +13,7 @@ let RouteHandler = Router.RouteHandler; let AscribeApp = React.createClass({ render() { return ( -
+