Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/js/components/Navigation/Footer.jsx
Original file line number Diff line number Diff line change
@@ -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!

Expand Down Expand Up @@ -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);
6 changes: 3 additions & 3 deletions src/js/components/Navigation/FooterMain.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ class FooterMain extends Component {

return (
<OuterWrapper>
<InnerWrapper>
<FooterMainInnerWrapper>
{inPrivateLabelMode ? (
<FooterMainPrivateLabeled />
) : (
<FooterMainWeVote />
)}
</InnerWrapper>
</FooterMainInnerWrapper>
</OuterWrapper>
);
}
Expand All @@ -67,7 +67,7 @@ FooterMain.propTypes = {
const styles = () => ({
});

const InnerWrapper = styled('div')`
const FooterMainInnerWrapper = styled('div')`
align-items: center;
display: flex;
flex-flow: column;
Expand Down
17 changes: 2 additions & 15 deletions src/js/components/Ready/ReadyFinePrint.jsx
Original file line number Diff line number Diff line change
@@ -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 }) {
Expand Down
6 changes: 3 additions & 3 deletions src/js/components/SupporterLanding/DecideLaterFooter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import DesignTokenColors from '../../common/components/Style/DesignTokenColors';
// label vary per step.
export default function DecideLaterFooter ({ prompt, linkText, onGoToNextStep }) {
return (
<FooterWrapper>
<DecideLaterFooterWrapper>
{prompt}
{' - '}
<GoLink type="button" onClick={onGoToNextStep}>{linkText}</GoLink>
</FooterWrapper>
</DecideLaterFooterWrapper>
);
}
DecideLaterFooter.propTypes = {
Expand All @@ -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;
Expand Down
Loading