From 3d2d7f726a20dd22ebf624cc5e88c42e8c6fcfa7 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Fri, 20 Oct 2017 18:18:18 +0300 Subject: [PATCH] Footer to EmailVerificationPage --- .../EmailVerificationPage.css | 8 +++ .../EmailVerificationPage.js | 50 ++++++++++++------- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/src/containers/EmailVerificationPage/EmailVerificationPage.css b/src/containers/EmailVerificationPage/EmailVerificationPage.css index abcbe29f..7d01fad0 100644 --- a/src/containers/EmailVerificationPage/EmailVerificationPage.css +++ b/src/containers/EmailVerificationPage/EmailVerificationPage.css @@ -1,5 +1,13 @@ @import '../../marketplace.css'; +.layoutWrapperMain { + min-height: calc(100vh - var(--topbarHeight)); + + @media (--viewportMedium) { + min-height: calc(100vh - var(--topbarHeightDesktop)); + } +} + .root { @apply --marketplaceModalRootStyles; } diff --git a/src/containers/EmailVerificationPage/EmailVerificationPage.js b/src/containers/EmailVerificationPage/EmailVerificationPage.js index 0f8fec4a..411f97bb 100644 --- a/src/containers/EmailVerificationPage/EmailVerificationPage.js +++ b/src/containers/EmailVerificationPage/EmailVerificationPage.js @@ -8,7 +8,14 @@ import * as propTypes from '../../util/propTypes'; import { verify } from '../../ducks/EmailVerification.duck'; import { isScrollingDisabled } from '../../ducks/UI.duck'; import { parse } from '../../util/urlHelpers'; -import { Page } from '../../components'; +import { + Page, + LayoutSingleColumn, + LayoutWrapperTopbar, + LayoutWrapperMain, + LayoutWrapperFooter, + Footer, +} from '../../components'; import { EmailVerificationForm, TopbarContainer } from '../../containers'; import css from './EmailVerificationPage.css'; @@ -60,22 +67,31 @@ export const EmailVerificationPageComponent = props => { logoutError={logoutError} scrollingDisabled={scrollingDisabled} > - -
-
- {currentUser ? ( - - ) : ( - - )} -
-
+ + + + + +
+
+ {currentUser ? ( + + ) : ( + + )} +
+
+
+ +