Rebase remerge

2024-12-22 09:23:13 +01:00 · 2016-02-04 13:32:00 +01:00 · 2016-02-04 13:32:00 +01:00 · 6f2424d103
commit 6f2424d103
parent e616576fa5
10 changed files with 269 additions and 136 deletions
--- 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: (
        <Route path='/' component={SPApp}>
-            <IndexRoute component={SPLanding} />
+            <IndexRoute
+                component={SPLanding}
+                hideFooter />
            <Route
                path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLoginContainer)}
+                hideFooter />
            <Route
                path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+                hideFooter />
            <Route
                path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPSignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPSignupContainer)}
+                hideFooter />
            <Route
                path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+                hideFooter />
            <Route
                path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}
+                hideFooter />
            <Route
                path='register_piece'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPRegisterPiece)}
-                headerTitle='+ NEW WORK'/>
+                headerTitle='+ NEW WORK'
+                hideFooter />
            <Route
                path='collection'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPPieceList)}
-                headerTitle='COLLECTION'/>
-            <Route path='pieces/:pieceId' component={SluicePieceContainer} />
-            <Route path='editions/:editionId' component={EditionContainer} />
-            <Route path='verify' component={CoaVerifyContainer} />
-            <Route path='*' component={ErrorNotFoundPage} />
+                headerTitle='COLLECTION'
+                hideFooter />
+            <Route
+                path='pieces/:pieceId'
+                component={SluicePieceContainer}
+                hideFooter />
+            <Route
+                path='editions/:editionId'
+                component={EditionContainer}
+                hideFooter />
+            <Route
+                path='verify'
+                component={CoaVerifyContainer}
+                hideFooter />
+            <Route
+                path='*'
+                component={ErrorNotFoundPage}
+                hideFooter />
        </Route>
    ),
    portfolioreview: (
        <Route path='/' component={PRApp}>
-        <IndexRoute component={ProxyHandler(AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }))(PRLanding)} />
+            <IndexRoute
+                component={ProxyHandler(AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }))(PRLanding)}
+                hideFooter />
            <Route
                path='register_piece'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PRRegisterPiece)}/>
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PRRegisterPiece)}
+                hideFooter />
            <Route
                path='collection'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPPieceList)}
-                headerTitle='SUBMISSIONS'/>
+                headerTitle='SUBMISSIONS'
+                hideFooter />
            <Route
                path='login'
                component={ProxyHandler(
                    AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
                    AuthRedirect({to: '/register_piece', when: 'loggedIn'})
-                )(SPLoginContainer)} />
+                )(SPLoginContainer)}
+                hideFooter />
            <Route
                path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+                hideFooter />
            <Route
                path='signup'
                component={ProxyHandler(
                    AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
                    AuthRedirect({to: '/register_piece', when: 'loggedIn'})
-                )(SPSignupContainer)} />
+                )(SPSignupContainer)}
+                hideFooter />
            <Route
                path='password_reset'
                component={ProxyHandler(
                    AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
                    AuthRedirect({to: '/register_piece', when: 'loggedIn'})
-                )(PasswordResetContainer)} />
+                )(PasswordResetContainer)}
+                hideFooter />
            <Route
                path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}/>
-            <Route path='pieces/:pieceId' component={SPPieceContainer} />
-            <Route path='editions/:editionId' component={EditionContainer} />
-            <Route path='verify' component={CoaVerifyContainer} />
-            <Route path='*' component={ErrorNotFoundPage} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}
+                hideFooter />
+            <Route
+                path='pieces/:pieceId'
+                component={SPPieceContainer}
+                hideFooter />
+            <Route
+                path='editions/:editionId'
+                component={EditionContainer}
+                hideFooter />
+            <Route
+                path='verify'
+                component={CoaVerifyContainer}
+                hideFooter />
+            <Route
+                path='*'
+                component={ErrorNotFoundPage}
+                hideFooter />
        </Route>
    )
 };
--- 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 = (<div className="hero" />);
        } else {
            header = (<Header routes={routes} />);
--- 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': (
        <Route path='/' component={WalletApp}>
-            <IndexRoute component={CylandLanding} />
+            <IndexRoute
+                component={CylandLanding}
+                hideFooter />
            <Route
                path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+                hideFooter />
            <Route
                path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+                hideFooter />
            <Route
                path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+                hideFooter />
            <Route
                path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+                hideFooter />
            <Route
                path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+                hideFooter />
            <Route
                path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+                hideFooter />
            <Route
                path='register_piece'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CylandRegisterPiece)}
                headerTitle='+ NEW WORK'
-                aclName='acl_wallet_submit' />
+                aclName='acl_wallet_submit'
+                hideFooter />
            <Route
                path='collection'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CylandPieceList)}
                headerTitle='COLLECTION'
-                disableOn='noPieces' />
-            <Route path='editions/:editionId' component={EditionContainer} />
-            <Route path='coa_verify' component={CoaVerifyContainer} />
-            <Route path='pieces/:pieceId' component={CylandPieceContainer} />
-            <Route path='*' component={ErrorNotFoundPage} />
+                disableOn='noPieces'
+                hideFooter />
+            <Route
+                path='editions/:editionId'
+                component={EditionContainer}
+                hideFooter />
+            <Route
+                path='coa_verify'
+                component={CoaVerifyContainer}
+                hideFooter />
+            <Route
+                path='pieces/:pieceId'
+                component={CylandPieceContainer}
+                hideFooter />
+            <Route
+                path='*'
+                component={ErrorNotFoundPage}
+                hideFooter />
        </Route>
    ),
    'cc': (
        <Route path='/' component={WalletApp}>
            <Route
                path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+                hideFooter />
            <Route
                path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+                hideFooter />
            <Route
                path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+                hideFooter />
            <Route
                path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+                hideFooter />
            <Route
                path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+                hideFooter />
            <Route
                path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+                hideFooter />
            <Route
                path='register_piece'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CCRegisterPiece)}
-                headerTitle='+ NEW WORK' />
+                headerTitle='+ NEW WORK'
+                hideFooter />
            <Route
                path='collection'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PieceList)}
                headerTitle='COLLECTION'
-                disableOn='noPieces' />
-            <Route path='pieces/:pieceId' component={PieceContainer} />
-            <Route path='editions/:editionId' component={EditionContainer} />
-            <Route path='coa_verify' component={CoaVerifyContainer} />
-            <Route path='*' component={ErrorNotFoundPage} />
+                disableOn='noPieces'
+                hideFooter />
+            <Route
+                path='pieces/:pieceId'
+                component={PieceContainer}
+                hideFooter />
+            <Route
+                path='editions/:editionId'
+                component={EditionContainer}
+                hideFooter />
+            <Route
+                path='coa_verify'
+                component={CoaVerifyContainer}
+                hideFooter />
+            <Route
+                path='*'
+                component={ErrorNotFoundPage}
+                hideFooter />
        </Route>
    ),
    'ikonotv': (
        <Route path='/' component={WalletApp}>
-            <IndexRoute component={IkonotvLanding} />
+            <IndexRoute
+                component={IkonotvLanding}
+                hideFooter />
            <Route
                path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+                hideFooter />
            <Route
                path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+                hideFooter />
            <Route
                path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+                hideFooter />
            <Route
                path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+                hideFooter />
            <Route
                path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+                hideFooter />
            <Route
                path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+                hideFooter />
            <Route
                path='request_loan'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SendContractAgreementForm)}
                headerTitle='SEND NEW CONTRACT'
-                aclName='acl_create_contractagreement' />
+                aclName='acl_create_contractagreement'
+                hideFooter />
            <Route
                path='register_piece'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvRegisterPiece)}
                headerTitle='+ NEW WORK'
-                aclName='acl_wallet_submit' />
+                aclName='acl_wallet_submit'
+                hideFooter />
            <Route
                path='collection'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvPieceList)}
                headerTitle='COLLECTION'
-                disableOn='noPieces' />
+                disableOn='noPieces'
+                hideFooter />
            <Route
                path='contract_notifications'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvContractNotifications)} />
-            <Route path='pieces/:pieceId' component={IkonotvPieceContainer} />
-            <Route path='editions/:editionId' component={EditionContainer} />
-            <Route path='coa_verify' component={CoaVerifyContainer} />
-            <Route path='*' component={ErrorNotFoundPage} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvContractNotifications)}
+                hideFooter />
+            <Route
+                path='pieces/:pieceId'
+                component={IkonotvPieceContainer}
+                hideFooter />
+            <Route
+                path='editions/:editionId'
+                component={EditionContainer}
+                 hideFooter />
+            <Route
+                path='coa_verify'
+                component={CoaVerifyContainer}
+                hideFooter />
+            <Route
+                path='*'
+                component={ErrorNotFoundPage}
+                hideFooter />
        </Route>
    ),
    'lumenus': (
        <Route path='/' component={WalletApp}>
-            <IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LumenusLanding)} />
+            <IndexRoute
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LumenusLanding)}
+                hideFooter />
            <Route
                path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+                hideFooter />
            <Route
                path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+                hideFooter />
            <Route
                path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+                hideFooter />
            <Route
                path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+                hideFooter />
            <Route
                path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+                hideFooter />
            <Route
                path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+                hideFooter />
            <Route
                path='register_piece'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketRegisterPiece)}
                headerTitle='+ NEW WORK'
-                aclName='acl_wallet_submit' />
+                aclName='acl_wallet_submit'
+                hideFooter />
            <Route
                path='collection'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketPieceList)}
                headerTitle='COLLECTION'
-                disableOn='noPieces' />
-            <Route path='pieces/:pieceId' component={MarketPieceContainer} />
-            <Route path='editions/:editionId' component={MarketEditionContainer} />
-            <Route path='coa_verify' component={CoaVerifyContainer} />
-            <Route path='*' component={ErrorNotFoundPage} />
+                disableOn='noPieces'
+                hideFooter />
+            <Route
+                path='pieces/:pieceId'
+                component={MarketPieceContainer}
+                hideFooter />
+            <Route
+                path='editions/:editionId'
+                component={MarketEditionContainer}
+                hideFooter />
+            <Route
+                path='coa_verify'
+                component={CoaVerifyContainer}
+                hideFooter />
+            <Route
+                path='*'
+                component={ErrorNotFoundPage}
+                hideFooter />
        </Route>
    ),
    '23vivi': (
        <Route path='/' component={WalletApp}>
-            <IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(Vivi23Landing)} />
+            <IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(Vivi23Landing)}
+                hideFooter />
            <Route
                path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+                hideFooter />
            <Route
                path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+                hideFooter />
            <Route
                path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+                hideFooter />
            <Route
                path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+                hideFooter />
            <Route
                path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+                hideFooter />
            <Route
                path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+                hideFooter />
            <Route
                path='register_piece'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketRegisterPiece)}
                headerTitle='+ NEW WORK'
-                aclName='acl_wallet_submit' />
+                aclName='acl_wallet_submit'
+                hideFooter />
            <Route
                path='collection'
                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(Vivi23PieceList)}
                headerTitle='COLLECTION'
-                disableOn='noPieces' />
-            <Route path='pieces/:pieceId' component={MarketPieceContainer} />
-            <Route path='editions/:editionId' component={MarketEditionContainer} />
-            <Route path='coa_verify' component={CoaVerifyContainer} />
-            <Route path='*' component={ErrorNotFoundPage} />
+                disableOn='noPieces'
+                hideFooter />
+            <Route
+                path='pieces/:pieceId'
+                component={MarketPieceContainer}
+                hideFooter />
+            <Route
+                path='editions/:editionId'
+                component={MarketEditionContainer}
+                hideFooter />
+            <Route
+                path='coa_verify'
+                component={CoaVerifyContainer}
+                hideFooter />
+            <Route
+                path='*'
+                component={ErrorNotFoundPage}
+                hideFooter />
        </Route>
    )
 };
--- 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;
--- 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;

 }
-
-
--- 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;
    }
--- 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;
 }

--- 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;
--- a/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss
+++ b/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss
@ -108,8 +108,23 @@ $ikono--font: 'Helvetica Neue', 'Helvetica', sans-serif !important;
 }


-.client--ikonotv .route--landing {
+.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 {
    animation: color-loop 20s;
    -o-animation: color-loop 20s infinite;
    -ms-animation: color-loop 20s infinite;
@ -121,11 +136,8 @@ $ikono--font: 'Helvetica Neue', 'Helvetica', sans-serif !important;
    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;
 }

--- 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;
 }