diff --git a/src/js/components/Navigation/Footer.jsx b/src/js/components/Navigation/Footer.jsx index 74d91aa37..ed60a344b 100644 --- a/src/js/components/Navigation/Footer.jsx +++ b/src/js/components/Navigation/Footer.jsx @@ -1,10 +1,10 @@ import withStyles from '@mui/styles/withStyles'; import React, { Component, Suspense } from 'react'; import styled from 'styled-components'; +import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore'; import { normalizedHref } from '../../common/utils/hrefUtils'; -import { isWebApp } from '../../common/utils/isCordovaOrWebApp'; +import { isAndroid, isWebApp } from '../../common/utils/isCordovaOrWebApp'; import { handleResize } from '../../common/utils/isMobileScreenSize'; -import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore'; import { getApplicationViewBooleans } from '../../utils/applicationUtils'; // importRemoveCordovaListenersToken2 -- Do not remove this line! @@ -159,7 +159,7 @@ const FooterMainWrapper = styled('div')` `; const FooterWrapper = styled('div')` - // In Cordova, display=none, can be set in prepareForCordovaKeyboard() + ${isAndroid() && 'margin-top: -200px'} // Remove gap when displaying CordovaGovernmentOuterWrapper `; export default withStyles(styles)(Footer); diff --git a/src/js/components/Navigation/FooterMain.jsx b/src/js/components/Navigation/FooterMain.jsx index 830f50dbf..a33dff2c9 100644 --- a/src/js/components/Navigation/FooterMain.jsx +++ b/src/js/components/Navigation/FooterMain.jsx @@ -49,13 +49,13 @@ class FooterMain extends Component { return ( - + {inPrivateLabelMode ? ( ) : ( )} - + ); } @@ -67,7 +67,7 @@ FooterMain.propTypes = { const styles = () => ({ }); -const InnerWrapper = styled('div')` +const FooterMainInnerWrapper = styled('div')` align-items: center; display: flex; flex-flow: column; diff --git a/src/js/components/Ready/ReadyFinePrint.jsx b/src/js/components/Ready/ReadyFinePrint.jsx index 1c7780660..4d182e296 100644 --- a/src/js/components/Ready/ReadyFinePrint.jsx +++ b/src/js/components/Ready/ReadyFinePrint.jsx @@ -1,22 +1,9 @@ import PropTypes from 'prop-types'; import React, { useRef, useState } from 'react'; import { Link } from 'react-router-dom'; +import { isAndroid } from '../../common/utils/isCordovaOrWebApp'; import { renderLog } from '../../common/utils/logging'; -import { - Dot, - InnerWrapper, - IntroHeader, - ListMaxWidth, - ListRow, - ListTitleRow, - ListWrapper, - OuterWrapper, - ShowMoreWrapper, - StepNumber, - StepNumberPlaceholder, - StepText, - StepTitle, -} from '../Style/ReadyIntroductionStyles'; +import { Dot, InnerWrapper, IntroHeader, ListMaxWidth, ListRow, ListTitleRow, ListWrapper, OuterWrapper, ShowMoreWrapper, StepNumber, StepNumberPlaceholder, StepText, StepTitle, } from '../Style/ReadyIntroductionStyles'; import ShowMoreButtons from '../Widgets/ShowMoreButtons'; function ReadyFinePrint ({ contentUnfurledOnLoad, showStep3WhenCompressed, titleCentered, titleLarge }) { diff --git a/src/js/components/SupporterLanding/DecideLaterFooter.jsx b/src/js/components/SupporterLanding/DecideLaterFooter.jsx index 6250bce98..259c88cf7 100644 --- a/src/js/components/SupporterLanding/DecideLaterFooter.jsx +++ b/src/js/components/SupporterLanding/DecideLaterFooter.jsx @@ -7,11 +7,11 @@ import DesignTokenColors from '../../common/components/Style/DesignTokenColors'; // label vary per step. export default function DecideLaterFooter ({ prompt, linkText, onGoToNextStep }) { return ( - + {prompt} {' - '} {linkText} - + ); } DecideLaterFooter.propTypes = { @@ -24,7 +24,7 @@ DecideLaterFooter.defaultProps = { linkText: 'Go to Step 2', }; -const FooterWrapper = styled.div` +const DecideLaterFooterWrapper = styled.div` color: ${DesignTokenColors.neutral800}; font-size: 18px; padding: 8px 0;