diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js
index 5f80b30c..73608ae2 100644
--- a/js/components/whitelabel/prize/prize_routes.js
+++ b/js/components/whitelabel/prize/prize_routes.js
@@ -31,74 +31,116 @@ import { AuthPrizeRoleRedirect } from './portfolioreview/components/pr_routes/pr
const ROUTES = {
sluice: (
-
+
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLoginContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPSignupContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}
+ hideFooter />
+ headerTitle='+ NEW WORK'
+ hideFooter />
-
-
-
-
+ headerTitle='COLLECTION'
+ hideFooter />
+
+
+
+
),
portfolioreview: (
-
+
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PRRegisterPiece)}
+ hideFooter />
+ headerTitle='SUBMISSIONS'
+ hideFooter />
+ )(SPLoginContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+ hideFooter />
+ )(SPSignupContainer)}
+ hideFooter />
+ )(PasswordResetContainer)}
+ hideFooter />
-
-
-
-
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}
+ hideFooter />
+
+
+
+
)
};
diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js
index c7afaa01..10ebd2b3 100644
--- a/js/components/whitelabel/wallet/wallet_app.js
+++ b/js/components/whitelabel/wallet/wallet_app.js
@@ -28,8 +28,9 @@ let WalletApp = React.createClass({
let header = null;
// if the path of the current activeRoute is not defined, then this is the IndexRoute
- if ((!path || history.isActive('/login') || history.isActive('/signup') || history.isActive('/contract_notifications'))
- && (['cyland', 'ikonotv', 'lumenus', '23vivi']).indexOf(subdomain) > -1) {
+ if ((!path || history.isActive('/login') || history.isActive('/signup') ||
+ history.isActive('/contract_notifications')) &&
+ (['cyland', 'ikonotv', 'lumenus', '23vivi']).includes(subdomain)) {
header = (
);
} else {
header = ();
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index f1613ee5..bf2008c3 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -48,193 +48,302 @@ import WalletApp from './wallet_app';
let ROUTES = {
'cyland': (
-
+
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+ hideFooter />
+ aclName='acl_wallet_submit'
+ hideFooter />
-
-
-
-
+ disableOn='noPieces'
+ hideFooter />
+
+
+
+
),
'cc': (
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+ hideFooter />
+ headerTitle='+ NEW WORK'
+ hideFooter />
-
-
-
-
+ disableOn='noPieces'
+ hideFooter />
+
+
+
+
),
'ikonotv': (
-
+
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+ hideFooter />
+ aclName='acl_create_contractagreement'
+ hideFooter />
+ aclName='acl_wallet_submit'
+ hideFooter />
+ disableOn='noPieces'
+ hideFooter />
-
-
-
-
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvContractNotifications)}
+ hideFooter />
+
+
+
+
),
'lumenus': (
-
+
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+ hideFooter />
+ aclName='acl_wallet_submit'
+ hideFooter />
-
-
-
-
+ disableOn='noPieces'
+ hideFooter />
+
+
+
+
),
'23vivi': (
-
+
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+ hideFooter />
+ component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+ hideFooter />
+ aclName='acl_wallet_submit'
+ hideFooter />
-
-
-
-
+ disableOn='noPieces'
+ hideFooter />
+
+
+
+
)
};
diff --git a/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss b/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss
index b0027bff..385f4ed7 100644
--- a/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss
+++ b/sass/whitelabel/prize/portfolioreview/portfolioreview_custom_style.scss
@@ -2,7 +2,6 @@ $pr--nav-fg-prim-color: black;
$pr--button-color: $pr--nav-fg-prim-color;
.client--portfolioreview {
-
.btn-wide,
.btn-default {
background-color: $pr--button-color;
diff --git a/sass/whitelabel/prize/simple_prize/simple_prize_custom_style.scss b/sass/whitelabel/prize/simple_prize/simple_prize_custom_style.scss
index 8c46d366..e022f34e 100644
--- a/sass/whitelabel/prize/simple_prize/simple_prize_custom_style.scss
+++ b/sass/whitelabel/prize/simple_prize/simple_prize_custom_style.scss
@@ -68,5 +68,3 @@
padding: 0.7em;
}
-
-
diff --git a/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss b/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss
index 3e6e20cf..f09d9b13 100644
--- a/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss
+++ b/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss
@@ -13,6 +13,7 @@ $vivi23--highlight-color: #de2600;
/** Landing page **/
.route--landing {
display: table;
+ min-height: 100vh;
> .container {
display: table-cell;
@@ -252,10 +253,6 @@ $vivi23--highlight-color: #de2600;
display: none;
}
- .ascribe-footer {
- display: none;
- }
-
.ascribe-accordion-list-table-toggle:hover {
color: $vivi23--fg-color;
}
diff --git a/sass/whitelabel/wallet/cc/cc_custom_style.scss b/sass/whitelabel/wallet/cc/cc_custom_style.scss
index 774f5b27..348fca1f 100644
--- a/sass/whitelabel/wallet/cc/cc_custom_style.scss
+++ b/sass/whitelabel/wallet/cc/cc_custom_style.scss
@@ -55,16 +55,11 @@ $cc--button-color: $cc--nav-fg-prim-color;
}
}
-.client--cc .ascribe-footer {
- display: none;
-}
-
-
-.client--cc .icon-ascribe-search{
+.client--cc .icon-ascribe-search {
color: $cc--button-color;
}
-.client--cc .ascribe-piece-list-toolbar .btn-ascribe-add{
+.client--cc .ascribe-piece-list-toolbar .btn-ascribe-add {
display: none;
}
@@ -223,4 +218,4 @@ $cc--button-color: $cc--nav-fg-prim-color;
.client--cc .upload-button-wrapper > span {
color: $cc--button-color;
-}
\ No newline at end of file
+}
diff --git a/sass/whitelabel/wallet/cyland/cyland_custom_style.scss b/sass/whitelabel/wallet/cyland/cyland_custom_style.scss
index 549b2004..0a7226ac 100644
--- a/sass/whitelabel/wallet/cyland/cyland_custom_style.scss
+++ b/sass/whitelabel/wallet/cyland/cyland_custom_style.scss
@@ -56,10 +56,6 @@ $cyland--button-sec-color: #515151;
}
}
-.client--cyland .ascribe-footer {
- display: none;
-}
-
.client--cyland .icon-ascribe-search {
color: $cyland--button-color;
}
@@ -171,6 +167,7 @@ $cyland--button-sec-color: #515151;
.client--cyland {
.route--landing {
display: table;
+ min-height: 100vh;
> .container {
display: table-cell;
diff --git a/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss b/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss
index 8f330911..1d7a4461 100644
--- a/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss
+++ b/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss
@@ -108,24 +108,36 @@ $ikono--font: 'Helvetica Neue', 'Helvetica', sans-serif !important;
}
+.client--ikonotv {
+ .route--landing,
+ .route--login,
+ .route--signup {
+ background-color: $ikono--landing-bg-color;
+ min-height: 100vh;
+ }
+
+ .route--login,
+ .route--signup {
+ .ascribe-form-bordered {
+ border: none;
+ }
+ }
+}
+
.client--ikonotv .route--landing {
- background-color: $ikono--landing-bg-color;
animation: color-loop 20s;
-o-animation: color-loop 20s infinite;
-ms-animation: color-loop 20s infinite;
-moz-animation: color-loop 20s infinite;
-webkit-animation: color-loop 20s infinite;
-
+
margin: 0;
width: 100%;
padding: 5em 1em;
}
-
.client--ikonotv .route--login,
.client--ikonotv .route--signup {
- background-color: $ikono--landing-bg-color;
-
.btn-wide {
display: block;
margin: 50px auto 0;
@@ -209,27 +221,11 @@ $ikono--font: 'Helvetica Neue', 'Helvetica', sans-serif !important;
}
-.client--ikonotv {
- .route--login,
- .route--signup {
- .ascribe-form-bordered {
- border: none;
- }
- }
-}
-
-.client--ikonotv .ascribe-login-wrapper {
-}
-
-.client--ikonotv .ascribe-footer {
- display: none;
-}
-
-.client--ikonotv .icon-ascribe-search{
+.client--ikonotv .icon-ascribe-search {
color: $ikono--button-color;
}
-.client--ikonotv .ascribe-piece-list-toolbar .btn-ascribe-add{
+.client--ikonotv .ascribe-piece-list-toolbar .btn-ascribe-add {
display: none;
}
@@ -560,4 +556,4 @@ $ikono--font: 'Helvetica Neue', 'Helvetica', sans-serif !important;
.client--ikonotv .upload-button-wrapper > span {
color: $ikono--button-color;
-}
\ No newline at end of file
+}
diff --git a/sass/whitelabel/wallet/index.scss b/sass/whitelabel/wallet/index.scss
index 647bb16c..f480ac8d 100644
--- a/sass/whitelabel/wallet/index.scss
+++ b/sass/whitelabel/wallet/index.scss
@@ -5,7 +5,6 @@
.ascribe-wallet-app {
border-radius: 0;
- min-height: 100vh;
padding-top: 70px;
padding-bottom: 10px;
}