diff --git a/src/app.test.js b/src/app.test.js index e2941e9f..24d1ef19 100644 --- a/src/app.test.js +++ b/src/app.test.js @@ -79,7 +79,6 @@ describe('Application', () => { '/account/contact-details': defaultAuthPath, '/account/change-password': defaultAuthPath, '/account/payout-preferences': defaultAuthPath, - '/account/security': defaultAuthPath, '/verify-email': loginPath, }; forEach(urlRedirects, (redirectPath, url) => { diff --git a/src/components/Footer/Footer.css b/src/components/Footer/Footer.css index 363d06f4..5c4b9c1a 100644 --- a/src/components/Footer/Footer.css +++ b/src/components/Footer/Footer.css @@ -82,7 +82,7 @@ } .organizationInfo { - margin-left: 35px; + margin-left: 36px; width: 179px; } diff --git a/src/components/LayoutWrapperTopbar/LayoutWrapperTopbar.css b/src/components/LayoutWrapperTopbar/LayoutWrapperTopbar.css index 58c12a68..e150fece 100644 --- a/src/components/LayoutWrapperTopbar/LayoutWrapperTopbar.css +++ b/src/components/LayoutWrapperTopbar/LayoutWrapperTopbar.css @@ -1,4 +1,7 @@ +@import '../../marketplace.css'; + .root { width: 100%; position: relative; + z-index: var(--zIndexTopbar); } diff --git a/src/components/SaleDetailsPanel/SaleDetailsPanel.css b/src/components/SaleDetailsPanel/SaleDetailsPanel.css index ba3d03a5..9cc3f68a 100644 --- a/src/components/SaleDetailsPanel/SaleDetailsPanel.css +++ b/src/components/SaleDetailsPanel/SaleDetailsPanel.css @@ -186,6 +186,8 @@ } .actionButtons { + /* Position action button row above the footer */ + z-index: 9; position: fixed; bottom: 0; width: 100%; @@ -201,6 +203,7 @@ background-color: white; @media (--viewportLarge) { + z-index: unset; position: static; box-shadow: none; width: auto; diff --git a/src/containers/AuthenticationPage/AuthenticationPage.css b/src/containers/AuthenticationPage/AuthenticationPage.css index 5f535fbe..39e40c40 100644 --- a/src/containers/AuthenticationPage/AuthenticationPage.css +++ b/src/containers/AuthenticationPage/AuthenticationPage.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/AuthenticationPage/AuthenticationPage.js b/src/containers/AuthenticationPage/AuthenticationPage.js index 0ea25b87..cd97b4ee 100644 --- a/src/containers/AuthenticationPage/AuthenticationPage.js +++ b/src/containers/AuthenticationPage/AuthenticationPage.js @@ -20,6 +20,11 @@ import { IconEmailSent, InlineTextButton, IconClose, + LayoutSingleColumn, + LayoutWrapperTopbar, + LayoutWrapperMain, + LayoutWrapperFooter, + Footer, } from '../../components'; import { LoginForm, SignupForm, TopbarContainer } from '../../containers'; import { login, authenticationInProgress, signup } from '../../ducks/Auth.duck'; @@ -216,10 +221,19 @@ export const AuthenticationPageComponent = props => { name: schemaTitle, }} > - -
- {showEmailVerification ? emailVerificationContent : formContent} -
+ + + + + +
+ {showEmailVerification ? emailVerificationContent : formContent} +
+
+ +